mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

devices: add functions to add / remove / check for devices

Browse source 
To include the device code in the undo system, we need functions
to check for the existence of devices and to add or remove them.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-17 14:01:52 +02:00 • committed by Dirk Hohndel
parent a261466594
commit 53118be1f9
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/device.cpp
View file

@ -218,7 +218,7 @@ bool device::operator<(const device &a) const
return strcoll(model.c_str(), a.model.c_str()) < 0; return strcoll(model.c_str(), a.model.c_str()) < 0;
} }
const struct device *get_device_for_dc(const struct device_table *table, const struct divecomputer *dc) extern "C" const struct device *get_device_for_dc(const struct device_table *table, const struct divecomputer *dc)
{ {
const std::vector<device> &dcs = table->devices; const std::vector<device> &dcs = table->devices;
device dev { dc->model, dc->deviceid, {}, {}, {} }; device dev { dc->model, dc->deviceid, {}, {}, {} };
@ -226,6 +226,12 @@ const struct device *get_device_for_dc(const struct device_table *table, const s
return it != dcs.end() && same_device(*it, dev) ? &*it : NULL; return it != dcs.end() && same_device(*it, dev) ? &*it : NULL;
} }
extern "C" bool device_exists(const struct device_table *device_table, const struct device *dev)
{
auto it = std::lower_bound(device_table->devices.begin(), device_table->devices.end(), *dev);
return it != device_table->devices.end() && same_device(*it, *dev);
}
/* /*
* When setting the device ID, we also fill in the * When setting the device ID, we also fill in the
* serial number and firmware version data * serial number and firmware version data
@ -292,6 +298,20 @@ extern "C" void create_device_node(struct device_table *device_table, const char
addDC(device_table->devices, model ?: "", deviceid, nickname ?: "", serial ?: "", firmware ?: ""); addDC(device_table->devices, model ?: "", deviceid, nickname ?: "", serial ?: "", firmware ?: "");
} }
/* Does not check for duplicates! */
extern "C" void add_to_device_table(struct device_table *device_table, const struct device *dev)
{
auto it = std::lower_bound(device_table->devices.begin(), device_table->devices.end(), *dev);
device_table->devices.insert(it, *dev);
}
extern "C" void remove_device(struct device_table *device_table, const struct device *dev)
{
auto it = std::lower_bound(device_table->devices.begin(), device_table->devices.end(), *dev);
if (it != device_table->devices.end() && same_device(*it, *dev))
device_table->devices.erase(it);
}
extern "C" void clear_device_table(struct device_table *device_table) extern "C" void clear_device_table(struct device_table *device_table)
{ {
device_table->devices.clear(); device_table->devices.clear();

3
core/device.h
View file

@ -28,6 +28,9 @@ const char *get_dc_nickname(const struct divecomputer *dc);
extern bool device_used_by_selected_dive(const struct device *dev); extern bool device_used_by_selected_dive(const struct device *dev);
extern const struct device *get_device_for_dc(const struct device_table *table, const struct divecomputer *dc); extern const struct device *get_device_for_dc(const struct device_table *table, const struct divecomputer *dc);
extern bool device_exists(const struct device_table *table, const struct device *dev);
extern void add_to_device_table(struct device_table *table, const struct device *dev);
extern void remove_device(struct device_table *table, const struct device *dev);
// struct device accessors for C-code. The returned strings are not stable! // struct device accessors for C-code. The returned strings are not stable!
const char *device_get_model(const struct device *dev); const char *device_get_model(const struct device *dev);

3
mobile-widgets/qmlmanager.cpp
View file

@ -451,8 +451,9 @@ void QMLManager::mergeLocalRepo()
struct dive_table table = empty_dive_table; struct dive_table table = empty_dive_table;
struct trip_table trips = empty_trip_table; struct trip_table trips = empty_trip_table;
struct dive_site_table sites = empty_dive_site_table; struct dive_site_table sites = empty_dive_site_table;
struct device_table devices;
struct filter_preset_table filter_presets; struct filter_preset_table filter_presets;
parse_file(qPrintable(nocloud_localstorage()), &table, &trips, &sites, &device_table, &filter_presets); parse_file(qPrintable(nocloud_localstorage()), &table, &trips, &sites, &devices, &filter_presets);
add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS);
} }