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

subsurfacewebservices: abstract between GlobeGPS and MapWidget

Browse source 
Call same methods from the two classes based on NO_MARBLE.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-07-15 23:43:19 +03:00 • committed by Dirk Hohndel
parent 8f52b129af
commit b89ecd5ab8
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
desktop-widgets/subsurfacewebservices.cpp
View file

@ -6,6 +6,7 @@
#include "desktop-widgets/usersurvey.h" #include "desktop-widgets/usersurvey.h"
#include "core/divelist.h" #include "core/divelist.h"
#include "desktop-widgets/globe.h" #include "desktop-widgets/globe.h"
#include "desktop-widgets/mapwidget.h"
#include "desktop-widgets/tab-widgets/maintab.h" #include "desktop-widgets/tab-widgets/maintab.h"
#include "core/display.h" #include "core/display.h"
#include "core/membuffer.h" #include "core/membuffer.h"
@ -478,14 +479,17 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button)
i--; // otherwise we skip one site i--; // otherwise we skip one site
} }
} }
#ifndef NO_MARBLE
// finally now that all the extra GPS fixes that weren't used have been deleted // finally now that all the extra GPS fixes that weren't used have been deleted
// we can update the globe // we can update the map
if (changed) { if (changed) {
#ifndef NO_MARBLE
GlobeGPS::instance()->repopulateLabels(); GlobeGPS::instance()->repopulateLabels();
GlobeGPS::instance()->centerOnDiveSite(get_dive_site_by_uuid(current_dive->dive_site_uuid)); GlobeGPS::instance()->centerOnDiveSite(get_dive_site_by_uuid(current_dive->dive_site_uuid));
} #else
MapWidget::instance()->repopulateLabels();
MapWidget::instance()->centerOnDiveSite(get_dive_site_by_uuid(current_dive->dive_site_uuid));
#endif #endif
}
} break; } break;
case QDialogButtonBox::RejectRole: case QDialogButtonBox::RejectRole: