From 4f5621c4c6acc3a1dbc1dbdc1267a222dcf66854 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 13 Apr 2020 15:35:27 +0200 Subject: Planner: fold MainWindow::setupForAddAndPlan into createSimpleDive() There was only one caller of MainWindow::setupForAddAndPlan() left and that caller immediately called DivePlannerPointsModel::createSimpleDive(). Thus, we might just as fold the former in the latter and thus concentrate all the prepare-dive-for-plan business in one place. Signed-off-by: Berthold Stoeger --- qt-models/diveplannermodel.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'qt-models/diveplannermodel.cpp') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 6bb560098..ea24c3a73 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -46,6 +46,16 @@ void DivePlannerPointsModel::removeSelectedPoints(const QVector &rows) void DivePlannerPointsModel::createSimpleDive() { + // clean out the dive and give it an id and the correct dc model + clear_dive(&displayed_dive); + displayed_dive.id = dive_getUniqID(); + displayed_dive.when = QDateTime::currentMSecsSinceEpoch() / 1000L + gettimezoneoffset() + 3600; + displayed_dive.dc.model = strdup("planned dive"); // don't translate! this is stored in the XML file + + clear(); + setupCylinders(); + setupStartTime(); + // initialize the start time in the plan diveplan.when = displayed_dive.when; -- cgit v1.2.3-70-g09d2