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

Move code that handles location to a sane place

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-07-13 15:38:46 -03:00 • committed by Dirk Hohndel
parent c658f2878b
commit 1a68e7985b
2 changed files with 19 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
qt-ui/maintab.cpp
View file

@ -818,13 +818,24 @@ void MainTab::reload()
mydive->what = displayed_dive.what; \ mydive->what = displayed_dive.what; \
} }
void MainTab::updateDisplayedDiveDiveSite() void MainTab::updateDisplayedDiveSite()
{ {
const QString new_name = ui.location->text(); const QString new_name = ui.location->text();
const QString orig_name = displayed_dive_site.name; const QString orig_name = displayed_dive_site.name;
const uint32_t orig_uuid = displayed_dive_site.uuid; const uint32_t orig_uuid = displayed_dive_site.uuid;
const uint32_t new_uuid = locationManagementEditHelper->diveSiteUuid(); const uint32_t new_uuid = locationManagementEditHelper->diveSiteUuid();
qDebug() << "Updating Displayed Dive Site";
if(current_dive) {
struct dive_site *ds_from_dive = get_dive_site_by_uuid(current_dive->dive_site_uuid);
if (!dive_site_has_gps_location(ds_from_dive) &&
same_string(displayed_dive_site.notes, "SubsurfaceWebservice")) {
ds_from_dive->latitude = displayed_dive_site.latitude;
ds_from_dive->longitude = displayed_dive_site.longitude;
delete_dive_site(displayed_dive_site.uuid);
}
}
if(orig_uuid) { if(orig_uuid) {
if (new_uuid && orig_uuid != new_uuid) { if (new_uuid && orig_uuid != new_uuid) {
displayed_dive.dive_site_uuid = new_uuid; displayed_dive.dive_site_uuid = new_uuid;
@ -835,7 +846,7 @@ void MainTab::updateDisplayedDiveDiveSite()
} else { } else {
qDebug() << "Current divesite is the same as informed"; qDebug() << "Current divesite is the same as informed";
} }
} else { } else if (!orig_uuid) {
if (new_uuid) { if (new_uuid) {
displayed_dive.dive_site_uuid = new_uuid; displayed_dive.dive_site_uuid = new_uuid;
copy_dive_site(get_dive_site_by_uuid(displayed_dive.dive_site_uuid), &displayed_dive_site); copy_dive_site(get_dive_site_by_uuid(displayed_dive.dive_site_uuid), &displayed_dive_site);
@ -854,6 +865,10 @@ void MainTab::acceptChanges()
struct dive *d; struct dive *d;
bool do_replot = false; bool do_replot = false;
if(ui.location->hasFocus()) {
this->setFocus();
}
acceptingEdit = true; acceptingEdit = true;
tabBar()->setTabIcon(0, QIcon()); // Notes tabBar()->setTabIcon(0, QIcon()); // Notes
tabBar()->setTabIcon(1, QIcon()); // Equipment tabBar()->setTabIcon(1, QIcon()); // Equipment
@ -866,7 +881,6 @@ void MainTab::acceptChanges()
struct dive *added_dive = clone_dive(&displayed_dive); struct dive *added_dive = clone_dive(&displayed_dive);
record_dive(added_dive); record_dive(added_dive);
addedId = added_dive->id; addedId = added_dive->id;
updateDisplayedDiveDiveSite();
get_dive_by_uniq_id(added_dive->id)->dive_site_uuid = displayed_dive_site.uuid; get_dive_by_uniq_id(added_dive->id)->dive_site_uuid = displayed_dive_site.uuid;
// unselect everything as far as the UI is concerned and select the new // unselect everything as far as the UI is concerned and select the new
@ -925,7 +939,6 @@ void MainTab::acceptChanges()
MODIFY_SELECTED_DIVES(mydive->when -= offset;); MODIFY_SELECTED_DIVES(mydive->when -= offset;);
} }
updateDisplayedDiveDiveSite();
if (displayed_dive.dive_site_uuid != cd->dive_site_uuid) if (displayed_dive.dive_site_uuid != cd->dive_site_uuid)
MODIFY_SELECTED_DIVES(EDIT_VALUE(dive_site_uuid)); MODIFY_SELECTED_DIVES(EDIT_VALUE(dive_site_uuid));
@ -1406,54 +1419,7 @@ void MainTab::on_location_editingFinished()
return; return;
} }
QString currText = ui.location->text(); updateDisplayedDiveSite();
struct dive_site *ds;
int idx;
bool found = false;
for_each_dive_site (idx,ds) {
if (same_string(ds->name, qPrintable(currText))) {
found = true;
break;
}
}
if (!found) {
uint32_t uuid = create_dive_site(qPrintable(ui.location->text()));
ds = get_dive_site_by_uuid(uuid);
if (same_string(displayed_dive_site.notes, "SubsurfaceWebservice")) {
ds->latitude = displayed_dive_site.latitude;
ds->longitude = displayed_dive_site.longitude;
delete_dive_site(displayed_dive_site.uuid);
}
displayed_dive.dive_site_uuid = uuid;
copy_dive_site(get_dive_site_by_uuid(uuid), &displayed_dive_site);
markChangedWidget(ui.location);
LocationInformationModel::instance()->update();
emit diveSiteChanged(uuid);
return;
}
if (!get_dive_site(idx))
return;
if (current_dive) {
struct dive_site *ds_from_dive = get_dive_site_by_uuid(displayed_dive.dive_site_uuid);
if(ds_from_dive && ui.location->text() == ds_from_dive->name)
return;
ds_from_dive = get_dive_site(idx);
if (!dive_site_has_gps_location(ds_from_dive) &&
same_string(displayed_dive_site.notes, "SubsurfaceWebservice")) {
ds_from_dive->latitude = displayed_dive_site.latitude;
ds_from_dive->longitude = displayed_dive_site.longitude;
delete_dive_site(displayed_dive_site.uuid);
}
displayed_dive.dive_site_uuid = ds_from_dive->uuid;
copy_dive_site(get_dive_site_by_uuid(ds_from_dive->uuid), &displayed_dive_site);
markChangedWidget(ui.location);
emit diveSiteChanged(ds_from_dive->uuid);
}
} }
void MainTab::on_suit_textChanged(const QString &text) void MainTab::on_suit_textChanged(const QString &text)

2
qt-ui/maintab.h
View file

@ -123,7 +123,7 @@ private:
dive_trip_t displayedTrip; dive_trip_t displayedTrip;
bool acceptingEdit; bool acceptingEdit;
LocationManagementEditHelper *locationManagementEditHelper; LocationManagementEditHelper *locationManagementEditHelper;
void updateDisplayedDiveDiveSite(); void updateDisplayedDiveSite();
}; };
#endif // MAINTAB_H #endif // MAINTAB_H