mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-02 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change API signature to act on dive_site, not uuid

Browse source 
This way in the future we can pass in a pointer to a dive site that isn't
linked in our dive site list yet (i.e., while we are editing).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-16 12:41:04 -07:00
parent f98ace681a
commit 076f86202a
7 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/globe.cpp
View file

@ -242,10 +242,8 @@ void GlobeGPS::reload()
repopulateLabels(); repopulateLabels();
} }
void GlobeGPS::centerOnDiveSite(uint32_t uuid) void GlobeGPS::centerOnDiveSite(struct dive_site *ds)
{ {
struct dive_site *ds = get_dive_site_by_uuid(uuid);
if (!dive_site_has_gps_location(ds)) { if (!dive_site_has_gps_location(ds)) {
zoomOutForNoGPS(); zoomOutForNoGPS();
return; return;

2
qt-ui/globe.h
View file

@ -51,7 +51,7 @@ slots:
void zoomOutForNoGPS(); void zoomOutForNoGPS();
void prepareForGetDiveCoordinates(); void prepareForGetDiveCoordinates();
void endGetDiveCoordinates(); void endGetDiveCoordinates();
void centerOnDiveSite(uint32_t uuid); void centerOnDiveSite(struct dive_site *ds);
}; };
#else // NO_MARBLE #else // NO_MARBLE

4
qt-ui/maintab.cpp
View file

@ -759,7 +759,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.cylinders->view()->hideColumn(CylindersModel::USE); ui.cylinders->view()->hideColumn(CylindersModel::USE);
qDebug() << "Set the current dive site:" << displayed_dive.dive_site_uuid; qDebug() << "Set the current dive site:" << displayed_dive.dive_site_uuid;
emit diveSiteChanged(displayed_dive.dive_site_uuid); emit diveSiteChanged(get_dive_site_by_uuid(displayed_dive.dive_site_uuid));
} }
void MainTab::addCylinder_clicked() void MainTab::addCylinder_clicked()
@ -1195,7 +1195,7 @@ void MainTab::rejectChanges()
// the user could have edited the location and then canceled the edit // the user could have edited the location and then canceled the edit
// let's get the correct location back in view // let's get the correct location back in view
#ifndef NO_MARBLE #ifndef NO_MARBLE
MainWindow::instance()->globe()->centerOnDiveSite(displayed_dive.dive_site_uuid); MainWindow::instance()->globe()->centerOnDiveSite(get_dive_site_by_uuid(displayed_dive.dive_site_uuid));
MainWindow::instance()->globe()->reload(); MainWindow::instance()->globe()->reload();
#endif #endif
// show the profile and dive info // show the profile and dive info

2
qt-ui/maintab.h
View file

@ -58,7 +58,7 @@ public:
signals: signals:
void addDiveFinished(); void addDiveFinished();
void dateTimeChanged(); void dateTimeChanged();
void diveSiteChanged(uint32_t uuid); void diveSiteChanged(struct dive_site * ds);
public public
slots: slots:
void addCylinder_clicked(); void addCylinder_clicked();

2
qt-ui/mainwindow.cpp
View file

@ -138,7 +138,7 @@ MainWindow::MainWindow() : QMainWindow(),
connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled()));
connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan())); connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan()));
#ifndef NO_MARBLE #ifndef NO_MARBLE
connect(information(), SIGNAL(diveSiteChanged(uint32_t)), globeGps, SLOT(centerOnDiveSite(uint32_t))); connect(information(), SIGNAL(diveSiteChanged(struct dive_site *)), globeGps, SLOT(centerOnDiveSite(struct dive_site *)));
#endif #endif
wtu = new WindowTitleUpdate(); wtu = new WindowTitleUpdate();
connect(WindowTitleUpdate::instance(), SIGNAL(updateTitle()), this, SLOT(setAutomaticTitle())); connect(WindowTitleUpdate::instance(), SIGNAL(updateTitle()), this, SLOT(setAutomaticTitle()));

2
qt-ui/modeldelegates.cpp
View file

@ -533,7 +533,7 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
#ifndef NO_MARBLE #ifndef NO_MARBLE
if ((option.state & QStyle::State_HasFocus) && dive_site_has_gps_location(ds)) { if ((option.state & QStyle::State_HasFocus) && dive_site_has_gps_location(ds)) {
qDebug() << "center on" << ds->name; qDebug() << "center on" << ds->name;
MainWindow::instance()->globe()->centerOnDiveSite(ds->uuid); MainWindow::instance()->globe()->centerOnDiveSite(ds);
} }
#endif #endif

2
qt-ui/subsurfacewebservices.cpp
View file

@ -419,7 +419,7 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button)
// we can update the globe // we can update the globe
if (changed) { if (changed) {
MainWindow::instance()->globe()->repopulateLabels(); MainWindow::instance()->globe()->repopulateLabels();
MainWindow::instance()->globe()->centerOnDiveSite(current_dive->dive_site_uuid); MainWindow::instance()->globe()->centerOnDiveSite(get_dive_site_by_uuid(current_dive->dive_site_uuid));
} }
#endif #endif