summaryrefslogtreecommitdiffstats
path: root/qt-models
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-04-13 15:09:35 +0200
committerGravatar Robert C. Helling <helling@atdotde.de>2020-05-04 10:42:07 +0200
commit62cbf26cc8abd9373b72f919bdd50f666318873e (patch)
treefba4c49daf2385afdf7b7104b943796632268f80 /qt-models
parentf123972dbf661c051c37387249ab5fb6d83e24fa (diff)
downloadsubsurface-62cbf26cc8abd9373b72f919bdd50f666318873e.tar.gz
planner: send plan in calculatedPlanNotes
Thus, the MainWindow doesn't have to extract the plan from displayed_dive. This is a tiny step in an attempt to detangle the interfaces. The bigger goal will be to make displayed_dive local to the planner. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models')
-rw-r--r--qt-models/diveplannermodel.cpp4
-rw-r--r--qt-models/diveplannermodel.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 5d0375e69..6bb560098 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -985,7 +985,7 @@ void DivePlannerPointsModel::createTemporaryPlan()
computeVariations(plan_copy, &plan_deco_state);
#endif
final_deco_state = plan_deco_state;
- emit calculatedPlanNotes();
+ emit calculatedPlanNotes(QString(displayed_dive.notes));
}
// throw away the cache
free(cache);
@@ -1170,7 +1170,7 @@ void DivePlannerPointsModel::computeVariationsDone(QString variations)
QString notes = QString(displayed_dive.notes);
free(displayed_dive.notes);
displayed_dive.notes = copy_qstring(notes.replace("VARIATIONS", variations));
- emit calculatedPlanNotes();
+ emit calculatedPlanNotes(QString(displayed_dive.notes));
}
void DivePlannerPointsModel::createPlan(bool replanCopy)
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h
index 24b153f0e..08ed8fd79 100644
--- a/qt-models/diveplannermodel.h
+++ b/qt-models/diveplannermodel.h
@@ -118,7 +118,7 @@ signals:
void cylinderModelEdited();
void startTimeChanged(QDateTime);
void recreationChanged(bool);
- void calculatedPlanNotes();
+ void calculatedPlanNotes(QString);
void variationsComputed(QString);
private: