FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Show the calculated deco stops in the planner table"

Browse Source 
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
This commit is contained in:
Dirk Hohndel 2014-05-31 21:36:35 -07:00
parent ed26dfdd6b
commit ac1168f186
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qt-ui/diveplanner.cpp
View File

@ -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);

1
qt-ui/diveplanner.h
View File

@ -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 {