From ac1168f1860a78fee0e6e576054a6e3d9b39d185 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 31 May 2014 21:36:35 -0700 Subject: 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 --- qt-ui/diveplanner.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'qt-ui/diveplanner.cpp') 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); -- cgit v1.2.3-70-g09d2