mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: remove DivePlannerPointsModel::setRecalc()

Browse source 
The only external user of setRecalc() was turning recalculation
on. In fact, this happened when constructing the planner-widget.
However, for example editing of the profile only works when
the recalc flag is on.

This is all very confusing, let's just turn the flag on by
default and remove the accessor. Internally, the planner can
simply use the std::exchange function to set and reset the
recalc flag.

Perhaps the setting/resetting can be replaced by simple
        recalc = true;
        ...
        recalc = false;
pairs. It is unclear whether there is need for recursion.
Something to be investigated.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-02-23 20:29:18 +01:00 • committed by Dirk Hohndel
parent 457be51ff6
commit 4009d4c87f
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop-widgets/diveplanner.cpp
View file

@ -32,7 +32,6 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent) : QWidget(parent, QFlag(0)
ui.tableWidget->setTitle(tr("Dive planner points"));
ui.tableWidget->setModel(plannerModel);
connect(ui.tableWidget, &TableView::itemClicked, plannerModel, &DivePlannerPointsModel::remove);
plannerModel->setRecalc(true);
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::GAS, new AirTypesDelegate(this));
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::DIVEMODE, new DiveTypesDelegate(this));
ui.cylinderTableWidget->setTitle(tr("Available gases"));

22
qt-models/diveplannermodel.cpp
View file

@ -221,13 +221,13 @@ bool DivePlannerPointsModel::updateMaxDepth()
void DivePlannerPointsModel::removeDeco()
{
bool oldrec = setRecalc(false);
bool oldrec = std::exchange(recalc, false);
QVector<int> computedPoints;
for (int i = 0; i < rowCount(); i++)
if (!at(i).entered)
computedPoints.push_back(i);
removeSelectedPoints(computedPoints);
setRecalc(oldrec);
recalc = oldrec;
}
void DivePlannerPointsModel::addCylinder_clicked()
@ -254,13 +254,6 @@ bool DivePlannerPointsModel::isPlanner() const
/* When the planner adds deco stops to the model, adding those should not trigger a new deco calculation.
* We thus start the planner only when recalc is true. */
bool DivePlannerPointsModel::setRecalc(bool rec)
{
bool old = recalc;
recalc = rec;
return old;
}
bool DivePlannerPointsModel::recalcQ() const
{
return recalc;
@ -456,7 +449,7 @@ DivePlannerPointsModel::DivePlannerPointsModel(QObject *parent) : QAbstractTable
d(nullptr),
cylinders(true),
mode(NOTHING),
recalc(false)
recalc(true)
{
memset(&diveplan, 0, sizeof(diveplan));
startTime.setTimeSpec(Qt::UTC);
@ -996,14 +989,14 @@ bool DivePlannerPointsModel::tankInUse(int cylinderid) const
void DivePlannerPointsModel::clear()
{
bool oldRecalc = setRecalc(false);
bool oldrec = std::exchange(recalc, false);
beginResetModel();
divepoints.clear();
endResetModel();
cylinders.clear();
preserved_until.seconds = 0;
setRecalc(oldRecalc);
recalc = oldrec;
}
void DivePlannerPointsModel::createTemporaryPlan()
@ -1240,7 +1233,6 @@ finish:
free(save);
free(cache);
free(dive);
// setRecalc(oldRecalc);
}
void DivePlannerPointsModel::computeVariationsDone(QString variations)
@ -1255,10 +1247,10 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
{
// Ok, so, here the diveplan creates a dive
struct deco_state *cache = NULL;
bool oldRecalc = setRecalc(false);
bool oldrec = std::exchange(recalc, false);
removeDeco();
createTemporaryPlan();
setRecalc(oldRecalc);
recalc = oldrec;
//TODO: C-based function here?
struct decostop stoptable[60];

1
qt-models/diveplannermodel.h
View file

@ -41,7 +41,6 @@ public:
bool isPlanner() const;
void createSimpleDive(struct dive *d);
Mode currentMode() const;
bool setRecalc(bool recalc);
bool recalcQ() const;
bool tankInUse(int cylinderid) const;
CylindersModel *cylindersModel();