diff options
Diffstat (limited to 'qt-ui/diveplanner.cpp')
| -rw-r--r-- | qt-ui/diveplanner.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index d11b89617..c73487048 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -388,6 +388,7 @@ bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &v { int o2 = 0; int he = 0; + int i, shift; if (role == Qt::EditRole) { divedatapoint &p = divepoints[index.row()]; switch (index.column()) { @@ -398,10 +399,13 @@ bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &v p.time = value.toInt() * 60; break; case DURATION: - if (index.row()) - p.time = value.toInt() * 60 + divepoints[index.row() - 1].time; + i = index.row(); + if (i) + shift = divepoints[i].time - divepoints[i - 1].time - value.toInt() * 60; else - p.time = value.toInt() * 60; + shift = divepoints[i].time - value.toInt() * 60; + while (i < divepoints.size()) + divepoints[i++].time -= shift; break; case CCSETPOINT: { int po2 = 0; @@ -445,7 +449,7 @@ QVariant DivePlannerPointsModel::headerData(int section, Qt::Orientation orienta Qt::ItemFlags DivePlannerPointsModel::flags(const QModelIndex &index) const { - if (index.column() != DURATION && index.column() != REMOVE) + if (index.column() != REMOVE) return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; else return QAbstractItemModel::flags(index); @@ -764,6 +768,7 @@ void DivePlannerPointsModel::clear() } else { stagingDive = alloc_dive(); } + bool oldRecalc = setRecalc(false); CylindersModel::instance()->setDive(stagingDive); if (rowCount() > 0) { beginRemoveRows(QModelIndex(), 0, rowCount() - 1); @@ -771,12 +776,15 @@ void DivePlannerPointsModel::clear() endRemoveRows(); } CylindersModel::instance()->clear(); + setRecalc(oldRecalc); } void DivePlannerPointsModel::addDecoToModel() { struct divedatapoint *dp; + if (diveplan_empty(&diveplan)) + return; bool oldRecalc = plannerModel->setRecalc(false); plannerModel->removeDeco(); @@ -832,7 +840,7 @@ void DivePlannerPointsModel::createTemporaryPlan() #if DEBUG_PLAN dump_plan(&diveplan); #endif - if (plannerModel->recalcQ()) { + if (plannerModel->recalcQ() && !diveplan_empty(&diveplan)) { plan(&diveplan, &cache, &tempDive, stagingDive, isPlanner()); addDecoToModel(); if (mode == ADD || mode == PLAN) { |