summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/templatelayout.cpp
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2017-09-18 16:10:47 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-09-20 08:54:41 -0700
commita6f186279fcce9631623b94bfdc00fa3fd071b4c (patch)
tree22e907959336c94887f210da14f7fc5c54496b6d /desktop-widgets/templatelayout.cpp
parent5e9bdce195c1ec3ca077ce75cf2c0a221d6029de (diff)
downloadsubsurface-a6f186279fcce9631623b94bfdc00fa3fd071b4c.tar.gz
Add a checkbox to turn off plan variations
... as those come with a performance penalty Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'desktop-widgets/templatelayout.cpp')
-rw-r--r--desktop-widgets/templatelayout.cpp24
1 files changed, 15 insertions, 9 deletions
diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index a059a2dad..9f933e91c 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -12,7 +12,7 @@ int getTotalWork(print_options *printOptions)
if (printOptions->print_selected) {
// return the correct number depending on all/selected dives
// but don't return 0 as we might divide by this number
- return amount_selected ? amount_selected : 1;
+ return amount_selected && !in_planner() ? amount_selected : 1;
}
return dive_table.nr;
}
@@ -98,15 +98,21 @@ QString TemplateLayout::generate()
QVariantList diveList;
struct dive *dive;
- int i;
- for_each_dive (i, dive) {
- //TODO check for exporting selected dives only
- if (!dive->selected && PrintOptions->print_selected)
- continue;
- DiveObjectHelper *d = new DiveObjectHelper(dive);
+ if (in_planner()) {
+ DiveObjectHelper *d = new DiveObjectHelper(&displayed_dive);
diveList.append(QVariant::fromValue(d));
- progress++;
- emit progressUpdated(lrint(progress * 100.0 / totalWork));
+ emit progressUpdated(100.0);
+ } else {
+ int i;
+ for_each_dive (i, dive) {
+ //TODO check for exporting selected dives only
+ if (!dive->selected && PrintOptions->print_selected)
+ continue;
+ DiveObjectHelper *d = new DiveObjectHelper(dive);
+ diveList.append(QVariant::fromValue(d));
+ progress++;
+ emit progressUpdated(lrint(progress * 100.0 / totalWork));
+ }
}
Grantlee::Context c;
c.insert("dives", diveList);