diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-07-10 22:47:53 +0200 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2019-07-12 09:59:28 +0200 |
| commit | efe9bcce02fdf4eaad05ff27d8f3eb96d3958cc3 (patch) | |
| tree | daacb3307786e7840a56f8761a32e4aee32de17c | |
| parent | f93e0aafd52be47b99132a0d38629e1dffaaaa9e (diff) | |
| download | subsurface-efe9bcce02fdf4eaad05ff27d8f3eb96d3958cc3.tar.gz | |
Profile: stop animations on export
The plotDive() function had a flag to plot pictures asynchronously.
This was used on export. Rename this field to "instant" and disable
animations when set. This should make sure that the axes are properly
exported.
Fixes #2170
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 6 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0292c4fea..233274054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Export: fix axes when exporting multiple profile pictures - Snap: add `removable-media` plug for access to /media and /mnt paths - Desktop: Add undo functionality for dive computer movement and deletion - Import: Small enhancements on Suunto SDE import diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index c2514e59e..f3cf31c50 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -548,7 +548,7 @@ void ProfileWidget2::resetZoom() } // Currently just one dive, but the plan is to enable All of the selected dives. -void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPictures, bool plotPicturesSynchronously) +void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPictures, bool instant) { static bool firstCall = true; #ifndef SUBSURFACE_MOBILE @@ -594,7 +594,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict } // special handling for the first time we display things - animSpeed = qPrefDisplay::animation_speed(); + animSpeed = instant ? 0 : qPrefDisplay::animation_speed(); if (firstCall && haveFilesOnCommandLine()) { animSpeed = 0; firstCall = false; @@ -823,7 +823,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict if (doClearPictures) clearPictures(); else - plotPicturesInternal(d, plotPicturesSynchronously); + plotPicturesInternal(d, instant); toolTipItem->refresh(mapToScene(mapFromGlobal(QCursor::pos()))); #endif diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index fa3f7f95d..2956b18a5 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -75,7 +75,7 @@ public: ProfileWidget2(QWidget *parent = 0); void resetZoom(); void scale(qreal sx, qreal sy); - void plotDive(const struct dive *d = 0, bool force = false, bool clearPictures = false, bool plotPicturesSynchronously = false); + void plotDive(const struct dive *d = 0, bool force = false, bool clearPictures = false, bool instant = false); void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *vAxis, int vData, int hData, int zValue); void setPrintMode(bool mode, bool grayscale = false); bool getPrintMode(); |