diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2014-05-31 21:36:35 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-31 21:36:35 -0700 |
commit | ac1168f1860a78fee0e6e576054a6e3d9b39d185 (patch) | |
tree | 80bf5049b5dbfeff17789bd0908e6ba2d289a08a | |
parent | ed26dfdd6bd095f117d4f43a638688d19bb9be5b (diff) | |
download | subsurface-ac1168f1860a78fee0e6e576054a6e3d9b39d185.tar.gz |
Revert "Show the calculated deco stops in the planner table"
This reverts commit 7d42b53bba235894668ed1f2da3f5d17cd97b9c5.
With the addition of the dive plan details widget we no longer want to
show the deco points in the dive planner points table.
Conflicts:
qt-ui/diveplanner.cpp
-rw-r--r-- | qt-ui/diveplanner.cpp | 25 | ||||
-rw-r--r-- | qt-ui/diveplanner.h | 1 |
2 files changed, 0 insertions, 26 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index a74a780c3..252c0ffc3 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -779,30 +779,6 @@ void DivePlannerPointsModel::clear() setRecalc(oldRecalc); } -void DivePlannerPointsModel::addDecoToModel() -{ - struct divedatapoint *dp; - - if (diveplan_empty(&diveplan)) - return; - bool oldRecalc = plannerModel->setRecalc(false); - plannerModel->removeDeco(); - - unsigned int lastdepth = 0; - for (dp = diveplan.dp; dp != NULL; dp = dp->next) { - if (dp->time == 0) // magic entry for available tank - continue; - if (!dp->entered) { - if (dp->depth) { - if (dp->depth == lastdepth || dp->o2 != dp->next->o2 || dp->he != dp->next->he) - plannerModel->addStop(dp->depth, dp->time, dp->next->o2, dp->next->he, 0, false); - lastdepth = dp->depth; - } - } - } - plannerModel->setRecalc(oldRecalc); -} - void DivePlannerPointsModel::createTemporaryPlan() { // This needs to be done in the following steps: @@ -843,7 +819,6 @@ void DivePlannerPointsModel::createTemporaryPlan() if (plannerModel->recalcQ() && !diveplan_empty(&diveplan)) { plan(&diveplan, &cache, &tempDive, stagingDive, isPlanner(), false); MainWindow::instance()->setPlanNotes(tempDive->notes); - addDecoToModel(); if (mode == ADD || mode == PLAN) { // copy the samples and events, but don't overwrite the cylinders copy_samples(tempDive, current_dive); diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index 7cc4265bd..a281b7634 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -99,7 +99,6 @@ private: QVector<sample> backupSamples; // For editing added dives. struct dive *stagingDive; QVector<QPair<int, int> > oldGases; - void addDecoToModel(); }; class DiveHandler : public QObject, public QGraphicsEllipseItem { |