mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-20 06:45:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Geo taxonomy: show the chosen taxonomy entries in the notes pane

Browse source 
This isn't perfect - I'd like to have them show behind the word Location
instead as what we have now creates movement in the position of the fields
on the screen which I think is distracting.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-01 12:33:48 -07:00
parent a413141b33
commit 3055f4ac22
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
qt-ui/maintab.cpp
View file

@ -496,9 +496,26 @@ void MainTab::updateDiveInfo(bool clear)
if (!clear) {
struct dive_site *ds = get_dive_site_by_uuid(displayed_dive.dive_site_uuid);
qDebug() << "showing dive site uuid" << ds->uuid << ds;
if (ds) {
// construct the location tags
QString locationTag;
if (ds->taxonomy.nr) {
QString connector = "";
for (int i = 0; i < 3; i++) {
qDebug() << "looking for category" << prefs.geocoding.category[i];
for (int j = 0; j < NR_CATEGORIES; j++) {
qDebug() << "seeing category" << ds->taxonomy.category[j].category;
if (ds->taxonomy.category[j].category == prefs.geocoding.category[i]) {
locationTag += connector + QString(ds->taxonomy.category[j].value);
connector = " / ";
break;
}
}
}
}
ui.location->setText(ds->name);
ui.locationTags->setText(ds->description); // TODO: This should be three tags following davide's explanation.
ui.locationTags->setText(locationTag);
if (displayed_dive.dive_site_uuid)
copy_dive_site(get_dive_site_by_uuid(displayed_dive.dive_site_uuid), &displayed_dive_site);
} else {