mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

locationinformationwidget: abstract between GlobeGPS and MapWidget

Browse source 
Connect the same signals for the two classes based on the NO_MARBLE
macro.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-07-15 23:52:59 +03:00 • committed by Dirk Hohndel
parent df519be01e
commit 6e916b6764
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop-widgets/locationinformation.cpp
View file

@ -5,6 +5,7 @@
#include "desktop-widgets/divelistview.h" #include "desktop-widgets/divelistview.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "desktop-widgets/globe.h" #include "desktop-widgets/globe.h"
#include "desktop-widgets/mapwidget.h"
#include "qt-models/filtermodels.h" #include "qt-models/filtermodels.h"
#include "qt-models/divelocationmodel.h" #include "qt-models/divelocationmodel.h"
#include "core/divesitehelpers.h" #include "core/divesitehelpers.h"
@ -43,8 +44,8 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo
ui.diveSiteListView->setModel(filter_model); ui.diveSiteListView->setModel(filter_model);
ui.diveSiteListView->setModelColumn(LocationInformationModel::NAME); ui.diveSiteListView->setModelColumn(LocationInformationModel::NAME);
ui.diveSiteListView->installEventFilter(this); ui.diveSiteListView->installEventFilter(this);
// Map Management Code.
#ifndef NO_MARBLE #ifndef NO_MARBLE
// Globe Management Code.
connect(this, &LocationInformationWidget::requestCoordinates, connect(this, &LocationInformationWidget::requestCoordinates,
GlobeGPS::instance(), &GlobeGPS::prepareForGetDiveCoordinates); GlobeGPS::instance(), &GlobeGPS::prepareForGetDiveCoordinates);
connect(this, &LocationInformationWidget::endRequestCoordinates, connect(this, &LocationInformationWidget::endRequestCoordinates,
@ -53,6 +54,15 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo
this, &LocationInformationWidget::updateGpsCoordinates); this, &LocationInformationWidget::updateGpsCoordinates);
connect(this, &LocationInformationWidget::endEditDiveSite, connect(this, &LocationInformationWidget::endEditDiveSite,
GlobeGPS::instance(), &GlobeGPS::repopulateLabels); GlobeGPS::instance(), &GlobeGPS::repopulateLabels);
#else
connect(this, &LocationInformationWidget::requestCoordinates,
MapWidget::instance(), &MapWidget::prepareForGetDiveCoordinates);
connect(this, &LocationInformationWidget::endRequestCoordinates,
MapWidget::instance(), &MapWidget::endGetDiveCoordinates);
connect(MapWidget::instance(), &MapWidget::coordinatesChanged,
this, &LocationInformationWidget::updateGpsCoordinates);
connect(this, &LocationInformationWidget::endEditDiveSite,
MapWidget::instance(), &MapWidget::repopulateLabels);
#endif #endif
} }