diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-02-24 21:46:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | 91c33b475ce85eaf1a987a29938a198415c04799 (patch) | |
| tree | 298c05348cdffcc073d66b022bb6bb8d5b8f801f /desktop-widgets | |
| parent | c4ad477d079d31d24f68b14bda621e0a245fdf1c (diff) | |
| download | subsurface-91c33b475ce85eaf1a987a29938a198415c04799.tar.gz | |
Undo: move temperature update from MainTab to EditWaterTemp
The code in maintab is not called anymore (unless cylinders
or weightsystems are changed). Move the code to the command
that edits water temperature.
This should be audited as it is unclear weather this is
necessary.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/command_edit.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/desktop-widgets/command_edit.cpp b/desktop-widgets/command_edit.cpp index a1e4de358..7ff714e8f 100644 --- a/desktop-widgets/command_edit.cpp +++ b/desktop-widgets/command_edit.cpp @@ -230,6 +230,9 @@ DiveField EditAirTemp::fieldId() const void EditWaterTemp::set(struct dive *d, int value) const { d->watertemp.mkelvin = value > 0 ? (uint32_t)value : 0u; + + // re-populate the temperatures - easiest way to do this is by calling fixup_dive + fixup_dive(d); } int EditWaterTemp::data(struct dive *d) const diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 83fec7d92..605a9e5cb 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -735,8 +735,7 @@ static QVector<dive *> getSelectedDivesCurrentLast() void MainTab::acceptChanges() { - int i, addedId = -1; - struct dive *d; + int addedId = -1; bool do_replot = false; if (ui.location->hasFocus()) @@ -849,15 +848,6 @@ void MainTab::acceptChanges() cd->weightsystem[i].description = copy_string(displayed_dive.weightsystem[i].description); } } - - // each dive that was selected might have had the temperatures in its active divecomputer changed - // so re-populate the temperatures - easiest way to do this is by calling fixup_dive - for_each_dive (i, d) { - if (d->selected) { - fixup_dive(d); - invalidate_dive_cache(d); - } - } } if (lastMode == MANUALLY_ADDED_DIVE) { // we just added or edited the dive, let fixup_dive() make |