From d4a91a52fa54db951d09f9433b392d50183bf7ab Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 3 May 2019 12:10:19 +0200 Subject: Map: reload on selection change directly When changing the dive selection, we have to reload the map to show the correctly highlighted flags. Do this directly by hooking into the DiveListNotifier::divesChanged signal instead of indirectly via the MainTab. Moreover, on reload center on the highlighted dive sites. Signed-off-by: Berthold Stoeger --- desktop-widgets/tab-widgets/maintab.cpp | 6 ------ desktop-widgets/tab-widgets/maintab.h | 2 -- 2 files changed, 8 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 412ec899b..0638fbded 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -310,11 +310,6 @@ void MainTab::divesChanged(dive_trip *trip, const QVector &dives, DiveFi break; case DiveField::DIVESITE: updateDiveSite(current_dive); - // Since we only show dive sites with a dive, a new dive site may have appeared or an old one disappeared. - // Therefore reload the map widget. - // TODO: Call this only if a site *actually* went from usage count 0 to 1 or 1 to 0. - MapWidget::instance()->repopulateLabels(); - emit diveSiteChanged(); break; case DiveField::TAGS: ui.tagWidget->setText(get_taglist_string(current_dive->tag_list)); @@ -593,7 +588,6 @@ void MainTab::updateDiveInfo() if (verbose && current_dive && current_dive->dive_site) qDebug() << "Set the current dive site:" << current_dive->dive_site->uuid; - emit diveSiteChanged(); } void MainTab::reload() diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h index c65d7fe32..cdb761afd 100644 --- a/desktop-widgets/tab-widgets/maintab.h +++ b/desktop-widgets/tab-widgets/maintab.h @@ -44,8 +44,6 @@ public: void nextInputField(QKeyEvent *event); void stealFocus(); -signals: - void diveSiteChanged(); public slots: void divesChanged(dive_trip *trip, const QVector &dives, DiveField field); -- cgit v1.2.3-70-g09d2