mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

profile: don't recalculate plot-info when zooming / scrolling

Browse source 
This is a potentially expensive operation (e.g. interpolation of
pressure values), so don't recalculate the plot data for every
redraw.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-10-22 18:23:15 +02:00 • committed by Dirk Hohndel
parent 6dfc2da8d0
commit 71629521b7
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
profile-widget/profilescene.cpp
View file

@ -324,7 +324,7 @@ bool ProfileScene::isPointOutOfBoundaries(const QPointF &point) const
} }
void ProfileScene::plotDive(const struct dive *dIn, int dcIn, DivePlannerPointsModel *plannerModel, void ProfileScene::plotDive(const struct dive *dIn, int dcIn, DivePlannerPointsModel *plannerModel,
bool inPlanner, bool instant, bool calcMax, double zoom, double zoomedPosition) bool inPlanner, bool instant, bool keepPlotInfo, bool calcMax, double zoom, double zoomedPosition)
{ {
d = dIn; d = dIn;
dc = dcIn; dc = dcIn;
@ -363,7 +363,8 @@ void ProfileScene::plotDive(const struct dive *dIn, int dcIn, DivePlannerPointsM
* shown. * shown.
* create_plot_info_new() automatically frees old plot data. * create_plot_info_new() automatically frees old plot data.
*/ */
create_plot_info_new(d, get_dive_dc_const(d, dc), &plotInfo, !calcMax, planner_ds); if (!keepPlotInfo)
create_plot_info_new(d, get_dive_dc_const(d, dc), &plotInfo, !calcMax, planner_ds);
bool hasHeartBeat = plotInfo.maxhr; bool hasHeartBeat = plotInfo.maxhr;
// For mobile we might want to turn of some features that are normally shown. // For mobile we might want to turn of some features that are normally shown.

2
profile-widget/profilescene.h
View file

@ -42,7 +42,7 @@ public:
// If a plannerModel is passed, the deco-information is taken from there. // If a plannerModel is passed, the deco-information is taken from there.
void plotDive(const struct dive *d, int dc, DivePlannerPointsModel *plannerModel = nullptr, bool inPlanner = false, void plotDive(const struct dive *d, int dc, DivePlannerPointsModel *plannerModel = nullptr, bool inPlanner = false,
bool instant = false, bool calcMax = true, double zoom = 1.0, double zoomedPosition = 0.0); bool instant = false, bool keepPlotInfo = false, bool calcMax = true, double zoom = 1.0, double zoomedPosition = 0.0);
void draw(QPainter *painter, const QRect &pos, void draw(QPainter *painter, const QRect &pos,
const struct dive *d, int dc, const struct dive *d, int dc,

10
profile-widget/profilewidget2.cpp
View file

@ -205,7 +205,9 @@ void ProfileWidget2::plotDive(const struct dive *dIn, int dcIn, int flags)
bool inPlanner = currentState == PLAN; bool inPlanner = currentState == PLAN;
double zoom = zoomLevel == 0 ? 1.0 : pow(zoomFactor, zoomLevel); double zoom = zoomLevel == 0 ? 1.0 : pow(zoomFactor, zoomLevel);
profileScene->plotDive(d, dc, model, inPlanner, flags & RenderFlags::Instant, shouldCalculateMax, zoom, zoomedPosition); profileScene->plotDive(d, dc, model, inPlanner, flags & RenderFlags::Instant,
flags & RenderFlags::DontRecalculatePlotInfo,
shouldCalculateMax, zoom, zoomedPosition);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
rulerItem->setVisible(prefs.rulergraph && currentState != PLAN && currentState != EDIT); rulerItem->setVisible(prefs.rulergraph && currentState != PLAN && currentState != EDIT);
@ -256,7 +258,7 @@ void ProfileWidget2::resizeEvent(QResizeEvent *event)
{ {
QGraphicsView::resizeEvent(event); QGraphicsView::resizeEvent(event);
profileScene->resize(viewport()->size()); profileScene->resize(viewport()->size());
plotDive(d, dc, RenderFlags::Instant); // disable animation on resize events plotDive(d, dc, RenderFlags::Instant | RenderFlags::DontRecalculatePlotInfo); // disable animation on resize events
} }
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
@ -305,7 +307,7 @@ void ProfileWidget2::setZoom(int level)
double pos = mapToScene(mapFromGlobal(QCursor::pos())).x(); double pos = mapToScene(mapFromGlobal(QCursor::pos())).x();
zoomedPosition = pos / profileScene->width(); zoomedPosition = pos / profileScene->width();
} }
replot(); plotDive(d, dc, RenderFlags::DontRecalculatePlotInfo);
} }
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
@ -343,7 +345,7 @@ void ProfileWidget2::mouseMoveEvent(QMouseEvent *event)
if (zoomLevel != 0) { if (zoomLevel != 0) {
zoomedPosition = pos.x() / profileScene->width(); zoomedPosition = pos.x() / profileScene->width();
plotDive(d, dc, RenderFlags::Instant); // TODO: animations don't work when scrolling plotDive(d, dc, RenderFlags::Instant | RenderFlags::DontRecalculatePlotInfo); // TODO: animations don't work when scrolling
} }
double vValue = profileScene->profileYAxis->valueAt(pos); double vValue = profileScene->profileYAxis->valueAt(pos);