diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-12-01 15:36:20 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-01 15:37:28 -0800 |
commit | 63eff39edd2b97d80720a6198b2825a853372b15 (patch) | |
tree | 13aff0739d19dd10cb66a9b6ec44130c221d49c3 | |
parent | 3f72500f87cc2824b468f62c1a4bef524ceadfff (diff) | |
download | subsurface-63eff39edd2b97d80720a6198b2825a853372b15.tar.gz |
QML-UI: turn of some profile features
We don't have a tooltip on the QML UI as it's rendered into a pixmal.
We also don't need the timer as we don't need the TTS calculations.
And we don't need the acrobatics to figure out if we're in the planner as
we don't support the visual planner (or any planner, at this point) with
the mobile UI.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | profile-widget/diveprofileitem.cpp | 3 | ||||
-rw-r--r-- | profile-widget/profilewidget2.cpp | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index 849a9d3de..5f2849fb4 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -166,6 +166,7 @@ void DiveProfileItem::modelDataChanged(const QModelIndex &topLeft, const QModelI reported_ceiling_in_red = prefs.redceiling; profileColor = getColor(DEPTH_BOTTOM); +#ifndef SUBSURFACE_MOBILE int currState = qobject_cast<ProfileWidget2 *>(scene()->views().first())->currentState; if (currState == ProfileWidget2::PLAN) { plot_data *entry = dataModel->data().entry; @@ -181,7 +182,7 @@ void DiveProfileItem::modelDataChanged(const QModelIndex &topLeft, const QModelI } } } - +#endif /* Show any ceiling we may have encountered */ if (prefs.dcceiling && !prefs.redceiling) { QPolygonF p = polygon(); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 2306a2831..1e8f38ed6 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -501,9 +501,10 @@ void ProfileWidget2::resetZoom() void ProfileWidget2::plotDive(struct dive *d, bool force) { static bool firstCall = true; +#ifndef SUBSURFACE_MOBILE QTime measureDuration; // let's measure how long this takes us (maybe we'll turn of TTL calculation later measureDuration.start(); - +#endif if (currentState != ADD && currentState != PLAN) { if (!d) { if (selected_dive == -1) @@ -549,10 +550,11 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) // restore default zoom level resetZoom(); +#ifndef SUBSURFACE_MOBILE // reset some item visibility on printMode changes toolTipItem->setVisible(!printMode); rulerItem->setVisible(prefs.rulergraph && !printMode && currentState != PLAN && currentState != ADD); - +#endif if (currentState == EMPTY) setProfileState(); @@ -598,8 +600,9 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) } dataModel->setDive(&displayed_dive, plotInfo); +#ifndef SUBSURFACE_MOBILE toolTipItem->setPlotInfo(plotInfo); - +#endif // It seems that I'll have a lot of boilerplate setting the model / axis for // each item, I'll mostly like to fix this in the future, but I'll keep at this for now. profileYAxis->setMaximum(maxdepth); @@ -699,6 +702,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) // OK, how long did this take us? Anything above the second is way too long, // so if we are calculation TTS / NDL then let's force that off. +#ifndef SUBSURFACE_MOBILE if (measureDuration.elapsed() > 1000 && prefs.calcndltts) { prefs.calcndltts = false; QSettings s; @@ -706,6 +710,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) s.setValue("calcndltts", false); report_error(qPrintable(tr("Show NDL / TTS was disabled because of excessive processing time"))); } +#endif emit showError(); } |