mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: send plan in calculatedPlanNotes

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2020-04-13 15:09:35 +02:00 committed by Robert C. Helling
parent f123972dbf
commit 62cbf26cc8
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/mainwindow.cpp
View file

@ -799,9 +799,9 @@ void MainWindow::planCreated()
diveList->setFocus();
}
void MainWindow::setPlanNotes()
void MainWindow::setPlanNotes(QString plan)
{
plannerDetails->divePlanOutput()->setHtml(displayed_dive.notes);
plannerDetails->divePlanOutput()->setHtml(plan);
}
void MainWindow::printPlan()

2
desktop-widgets/mainwindow.h
View file

@ -165,7 +165,7 @@ slots:
void planCanceled();
void planCreated();
void setEnabledToolbar(bool arg1);
void setPlanNotes();
void setPlanNotes(QString plan);
// Some shortcuts like "change DC" or "copy/paste dive components"
// should only be enabled when the profile's visible.
void disableShortcuts(bool disablePaste = true);

4
qt-models/diveplannermodel.cpp
View file

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

2
qt-models/diveplannermodel.h
View file

@ -118,7 +118,7 @@ signals:
void cylinderModelEdited();
void startTimeChanged(QDateTime);
void recreationChanged(bool);
void calculatedPlanNotes();
void calculatedPlanNotes(QString);
void variationsComputed(QString);
private: