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

mobile: fix broken cylinder name tracking in dive edit

Browse source 
Prior to this change, we had two different cylinder lists as models for
drop down boxes - one that prepends the "no default cylinder" entry
(which we need for setting up no default cylinder to be used in the
app), and another one that only includes actual cylinders.

The problem occured if a dive is created before the first time we edit
an existing dive: in this case we are applying indices across the two
models, but the indices are of course off by one; this results in
actually picking the wrong cylinder. So each time we try to edit a dive,
we end up with the previous cylinder in the list.

This commit simplifies the code by having only one place where we create
list of cylinder names (which is then used as the model for the combo
box). It also uses more logical names for the two 'flavors' of this list
to make it clear which one is supposed to be used (the regular list when
editing or adding dives, the one with the "no default cylinder" entry
prependet for the Settings page).

Reported-by: Brian Fransen
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-09-01 14:35:48 -07:00
parent 33dc5478d8
commit f19e10209c
3 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mobile-widgets/qml/main.qml
View file

@ -168,11 +168,11 @@ Kirigami.ApplicationWindow {
detailsWindow.suitModel = manager.suitList
detailsWindow.suitIndex = -1
detailsWindow.suitText = ""
detailsWindow.cylinderModel0 = manager.cylinderInit
detailsWindow.cylinderModel1 = manager.cylinderInit
detailsWindow.cylinderModel2 = manager.cylinderInit
detailsWindow.cylinderModel3 = manager.cylinderInit
detailsWindow.cylinderModel4 = manager.cylinderInit
detailsWindow.cylinderModel0 = manager.cylinderListInit
detailsWindow.cylinderModel1 = manager.cylinderListInit
detailsWindow.cylinderModel2 = manager.cylinderListInit
detailsWindow.cylinderModel3 = manager.cylinderListInit
detailsWindow.cylinderModel4 = manager.cylinderListInit
detailsWindow.cylinderIndex0 = PrefEquipment.default_cylinder == "" ? -1 : detailsWindow.cylinderModel0.indexOf(PrefEquipment.default_cylinder)
detailsWindow.usedCyl = ["",]
detailsWindow.weight = ""
@ -482,7 +482,7 @@ if you have network connectivity and want to sync your data to cloud storage."),
text: qsTr("Settings")
onTriggered: {
globalDrawer.close()
settingsWindow.defaultCylinderModel = manager.cylinderInit
settingsWindow.defaultCylinderModel = manager.defaultCylinderListInit
PrefEquipment.default_cylinder === "" ? defaultCylinderIndex = "-1" : defaultCylinderIndex = settingsWindow.defaultCylinderModel.indexOf(PrefEquipment.default_cylinder)
showPage(settingsWindow)
detailsWindow.endEditMode()

28
mobile-widgets/qmlmanager.cpp
View file

@ -1867,27 +1867,17 @@ QStringList QMLManager::locationList() const
return locationModel.allSiteNames();
}
QStringList QMLManager::cylinderInit() const
// this is the cylinder list used when editing a dive
QStringList QMLManager::cylinderListInit() const
{
QStringList cylinders;
struct dive *d;
int i = 0;
for_each_dive (i, d) {
for (int j = 0; j < d->cylinders.nr; j++) {
if (!empty_string(get_cylinder(d, j)->type.description))
cylinders << get_cylinder(d, j)->type.description;
}
}
return formatFullCylinderList();
}
for (int ti = 0; ti < tank_info_table.nr; ti++) {
QString cyl = tank_info_table.infos[ti].name;
if (cyl == "")
continue;
cylinders << cyl;
}
cylinders.removeDuplicates();
cylinders.sort();
// this is the cylinder list used to pick your default cylinder
// it starts with the (translated) "no default cylinder" in order to special-case this
QStringList QMLManager::defaultCylinderListInit() const
{
QStringList cylinders = cylinderListInit();
// now add fist one that indicates that the user wants no default cylinder
cylinders.prepend(tr("no default cylinder"));
return cylinders;

6
mobile-widgets/qmlmanager.h
View file

@ -38,7 +38,8 @@ class QMLManager : public QObject {
Q_PROPERTY(QStringList buddyList READ buddyList NOTIFY buddyListChanged)
Q_PROPERTY(QStringList divemasterList READ divemasterList NOTIFY divemasterListChanged)
Q_PROPERTY(QStringList locationList READ locationList NOTIFY locationListChanged)
Q_PROPERTY(QStringList cylinderInit READ cylinderInit CONSTANT)
Q_PROPERTY(QStringList cylinderListInit READ cylinderListInit CONSTANT)
Q_PROPERTY(QStringList defaultCylinderListInit READ defaultCylinderListInit CONSTANT)
Q_PROPERTY(QStringList cloudCacheList READ cloudCacheList NOTIFY cloudCacheListChanged)
Q_PROPERTY(QString progressMessage MEMBER m_progressMessage WRITE setProgressMessage NOTIFY progressMessageChanged)
Q_PROPERTY(bool btEnabled MEMBER m_btEnabled WRITE setBtEnabled NOTIFY btEnabledChanged)
@ -162,7 +163,8 @@ public:
QStringList buddyList() const;
QStringList divemasterList() const;
QStringList locationList() const;
QStringList cylinderInit() const;
QStringList cylinderListInit() const;
QStringList defaultCylinderListInit() const;
QStringList cloudCacheList() const;
Q_INVOKABLE void setStatusbarColor(QColor color);
void btHostModeChange(QBluetoothLocalDevice::HostMode state);