summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-10-07 19:34:02 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-08 06:27:38 +0100
commit2eed9c0b9b56a507cfeb6f387176f675643dd436 (patch)
treeb178a86ddee295d791dd8230caaaaab4d5d4a44e /qt-ui
parentebf2407db670e78d1a503cabf27d823da31ecabf (diff)
downloadsubsurface-2eed9c0b9b56a507cfeb6f387176f675643dd436.tar.gz
Move the algorithm to divesite.cpp file
This shouldn't be on the maintab.cpp, this file is already too convoluted. [Dirk Hohndel: slightly refactored this commit and the next one to make the code actually work and make the split across the two commits more reasonable] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/maintab.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index d4483273e..49af15677 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -487,29 +487,8 @@ void MainTab::updateDiveInfo(bool clear)
}
if (ds) {
- // construct the location tags
- QString locationTag;
- if (ds->taxonomy.nr) {
- locationTag = "<small><small>(tags: ";
- QString connector = "";
- for (int i = 0; i < 3; i++) {
- if (prefs.geocoding.category[i] == TC_NONE)
- continue;
- for (int j = 0; j < TC_NR_CATEGORIES; j++) {
- if (ds->taxonomy.category[j].category == prefs.geocoding.category[i]) {
- QString tag = ds->taxonomy.category[j].value;
- if (!tag.isEmpty()) {
- locationTag += connector + tag;
- connector = " / ";
- }
- break;
- }
- }
- }
- locationTag += ")</small></small>";
- }
ui.location->setCurrentDiveSiteUuid(ds->uuid);
- ui.locationTags->setText(locationTag);
+ ui.locationTags->setText(constructLocationTags(ds->uuid));
} else {
ui.location->clear();
clear_dive_site(&displayed_dive_site);