From cddd5942f8accaa612d8e107b45c1bf3d47a5c95 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 11 Feb 2019 15:34:43 +0100 Subject: Undo: update dive list after edit command The dive list was not updated automatically when an edit command was executed. There was already a signal to do that, viz. divesChanged(). But that signal worked by-trip and didn't have a dive-field specifier. The edit-commands used the divesEdited() signal that isn't by-trip but has a dive-field specifier. Unify these two signals to be by-trip and with dive-field specifier. This needs common code to generate the by-trip list that is moved to a command_private.h header. Since there might now be multiple signals (one per trip) actually check in the main-tab whether the current trip is affected to avoid multiple update of fields. This has the positive(?) effect of not doing any update if the current dive isn't changed. Signed-off-by: Berthold Stoeger --- desktop-widgets/tab-widgets/maintab.cpp | 8 ++++---- desktop-widgets/tab-widgets/maintab.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index ab366cbb5..31fe4d130 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -82,7 +82,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui.weights->setModel(weightModel); closeMessage(); - connect(&diveListNotifier, &DiveListNotifier::divesEdited, this, &MainTab::divesEdited); + connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &MainTab::divesChanged); connect(ui.editDiveSiteButton, &QToolButton::clicked, MainWindow::instance(), &MainWindow::startDiveSiteEdit); connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex); connect(ui.location, &DiveLocationLineEdit::currentChanged, MapWidget::instance(), &MapWidget::centerOnIndex); @@ -340,10 +340,10 @@ static void profileFromDive(struct dive *d) // This function gets called if a field gets updated by an undo command. // Refresh the corresponding UI field. -void MainTab::divesEdited(const QVector &, DiveField field) +void MainTab::divesChanged(dive_trip *trip, const QVector &dives, DiveField field) { - // If there is no current dive, no point in updating anything - if (!current_dive) + // If the current dive is not in list of changed dives, do nothing + if (!current_dive || !dives.contains(current_dive)) return; switch(field) { diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h index b4598dadc..dacc10955 100644 --- a/desktop-widgets/tab-widgets/maintab.h +++ b/desktop-widgets/tab-widgets/maintab.h @@ -62,7 +62,7 @@ signals: void diveSiteChanged(); public slots: - void divesEdited(const QVector &dives, DiveField field); + void divesChanged(dive_trip *trip, const QVector &dives, DiveField field); void addCylinder_clicked(); void addWeight_clicked(); void updateDiveInfo(bool clear = false); -- cgit v1.2.3-70-g09d2