diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-12-01 12:49:38 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-01 15:47:51 -0800 |
| commit | 4d605ce51fcb4bbadf83471568d9f315844f904b (patch) | |
| tree | c229a24d96a44c8083a5e475f7701ae71fc9d8a4 /profile-widget | |
| parent | e06b5072305324d26613760b213888919a92bbf7 (diff) | |
| download | subsurface-4d605ce51fcb4bbadf83471568d9f315844f904b.tar.gz | |
Prevent redundant replanning
Planning dives is heavy on CPU, so better be sure we only
do it when needed. In particular, when moving around dive
points, we only want a new plan once per move and not three
times (triggered at various points in the chain of events).
This should significantly improve planner snappiness.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index abaefb1cd..6ca5334d4 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -914,7 +914,6 @@ void ProfileWidget2::divePlannerHandlerClicked() if (zoomLevel) return; shouldCalculateMaxDepth = false; - replot(); } void ProfileWidget2::divePlannerHandlerReleased() @@ -1827,10 +1826,13 @@ void ProfileWidget2::recreatePlannedDive() timeAxis->setMaximum(timeAxis->maximum() * 1.02); divedatapoint data = plannerModel->at(index); + depth_t oldDepth = data.depth; + int oldtime = data.time; data.depth.mm = lrint(profileYAxis->valueAt(activeHandler->pos()) / M_OR_FT(1, 1)) * M_OR_FT(1, 1); data.time = lrint(timeAxis->valueAt(activeHandler->pos())); - plannerModel->editStop(index, data); + if (data.depth.mm != oldDepth.mm || data.time != oldtime) + plannerModel->editStop(index, data); } void ProfileWidget2::keyDownAction() @@ -1839,6 +1841,8 @@ void ProfileWidget2::keyDownAction() return; DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); + bool oldRecalc = plannerModel->setRecalc(false); + Q_FOREACH (QGraphicsItem *i, scene()->selectedItems()) { if (DiveHandler *handler = qgraphicsitem_cast<DiveHandler *>(i)) { int row = handles.indexOf(handler); @@ -1850,6 +1854,8 @@ void ProfileWidget2::keyDownAction() plannerModel->editStop(row, dp); } } + plannerModel->setRecalc(oldRecalc); + replot(); } void ProfileWidget2::keyUpAction() @@ -1858,6 +1864,7 @@ void ProfileWidget2::keyUpAction() return; DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); + bool oldRecalc = plannerModel->setRecalc(false); Q_FOREACH (QGraphicsItem *i, scene()->selectedItems()) { if (DiveHandler *handler = qgraphicsitem_cast<DiveHandler *>(i)) { int row = handles.indexOf(handler); @@ -1870,6 +1877,8 @@ void ProfileWidget2::keyUpAction() plannerModel->editStop(row, dp); } } + plannerModel->setRecalc(oldRecalc); + replot(); } void ProfileWidget2::keyLeftAction() @@ -1878,6 +1887,7 @@ void ProfileWidget2::keyLeftAction() return; DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); + bool oldRecalc = plannerModel->setRecalc(false); Q_FOREACH (QGraphicsItem *i, scene()->selectedItems()) { if (DiveHandler *handler = qgraphicsitem_cast<DiveHandler *>(i)) { int row = handles.indexOf(handler); @@ -1903,6 +1913,8 @@ void ProfileWidget2::keyLeftAction() plannerModel->editStop(row, dp); } } + plannerModel->setRecalc(oldRecalc); + replot(); } void ProfileWidget2::keyRightAction() @@ -1911,6 +1923,7 @@ void ProfileWidget2::keyRightAction() return; DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); + bool oldRecalc = plannerModel->setRecalc(false); Q_FOREACH (QGraphicsItem *i, scene()->selectedItems()) { if (DiveHandler *handler = qgraphicsitem_cast<DiveHandler *>(i)) { int row = handles.indexOf(handler); @@ -1935,6 +1948,8 @@ void ProfileWidget2::keyRightAction() plannerModel->editStop(row, dp); } } + plannerModel->setRecalc(oldRecalc); + replot(); } void ProfileWidget2::keyDeleteAction() |