diff options
Diffstat (limited to 'desktop-widgets/tab-widgets')
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveEquipment.cpp | 17 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 13 |
2 files changed, 19 insertions, 11 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveEquipment.cpp b/desktop-widgets/tab-widgets/TabDiveEquipment.cpp index c0569a82b..22bdd2ca6 100644 --- a/desktop-widgets/tab-widgets/TabDiveEquipment.cpp +++ b/desktop-widgets/tab-widgets/TabDiveEquipment.cpp @@ -172,6 +172,10 @@ static QVector<dive *> getSelectedDivesCurrentLast() return res; } +// TODO: This is only a temporary function until undo of weightsystems is implemented. +// Therefore it is not worth putting it in a header. +extern bool weightsystems_equal(const dive *d1, const dive *d2); + void TabDiveEquipment::acceptChanges() { bool do_replot = false; @@ -232,17 +236,10 @@ void TabDiveEquipment::acceptChanges() if (weightModel->changed) { mark_divelist_changed(true); MODIFY_DIVES(selectedDives, - for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) { - if (mydive != cd && (same_string(mydive->weightsystem[i].description, cd->weightsystem[i].description))) { - mydive->weightsystem[i] = displayed_dive.weightsystem[i]; - mydive->weightsystem[i].description = copy_string(displayed_dive.weightsystem[i].description); - } - } + if (weightsystems_equal(mydive, cd)) + copy_weights(&displayed_dive.weightsystems, &mydive->weightsystems); ); - for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) { - cd->weightsystem[i] = displayed_dive.weightsystem[i]; - cd->weightsystem[i].description = copy_string(displayed_dive.weightsystem[i].description); - } + copy_weights(&displayed_dive.weightsystems, &cd->weightsystems); } if (do_replot) diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 862578ba0..2d31c4536 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -669,6 +669,17 @@ void MainTab::acceptChanges() editMode = NONE; } +bool weightsystems_equal(const dive *d1, const dive *d2) +{ + if (d1->weightsystems.nr != d2->weightsystems.nr) + return false; + for (int i = 0; i < d1->weightsystems.nr; ++i) { + if (!same_weightsystem(d1->weightsystems.weightsystems[0], d2->weightsystems.weightsystems[i])) + return false; + } + return true; +} + void MainTab::rejectChanges() { EditMode lastMode = editMode; @@ -676,7 +687,7 @@ void MainTab::rejectChanges() if (lastMode != NONE && current_dive && (modified || memcmp(¤t_dive->cylinder[0], &displayed_dive.cylinder[0], sizeof(cylinder_t) * MAX_CYLINDERS) || - memcmp(¤t_dive->weightsystem[0], &displayed_dive.weightsystem[0], sizeof(weightsystem_t) * MAX_WEIGHTSYSTEMS))) { + !weightsystems_equal(current_dive, &displayed_dive))) { if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the changes?"), tr("You are about to discard your changes.")), QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) { |