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

planner: move same-time check to DivePlannerPointsModel

Browse source 
There must not be two dive planner points at the same time
stamp, as this violates the laws of physics (and internal
assumptions).

The corresponding test was done in the profile code at
two different places with floating point arithmetics.
This is a bad idea, because
1) code duplication
2) danger of rounding issues

Instead, do this in one central point in the planner model
and use integer arithmetics. Simply add a few seconds until
a unique timestamp is obtained.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-25 16:03:03 +01:00 • committed by Dirk Hohndel
parent 91136b2c51
commit 891839d254
2 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
profile-widget/profilewidget2.cpp
View file

@ -1873,19 +1873,6 @@ void ProfileWidget2::keyLeftAction()
if (dp.time / 60 <= 0) if (dp.time / 60 <= 0)
continue; continue;
// don't overlap positions.
// maybe this is a good place for a 'goto'?
double xpos = timeAxis->posAtValue((dp.time - 60) / 60);
bool nextStep = false;
for (const auto &h: handles) {
if (IS_FP_SAME(h->pos().x(), xpos)) {
nextStep = true;
break;
}
}
if (nextStep)
continue;
dp.time -= 60; dp.time -= 60;
plannerModel->editStop(row, dp); plannerModel->editStop(row, dp);
} }
@ -1907,19 +1894,6 @@ void ProfileWidget2::keyRightAction()
if (dp.time / 60.0 >= timeAxis->maximum()) if (dp.time / 60.0 >= timeAxis->maximum())
continue; continue;
// don't overlap positions.
// maybe this is a good place for a 'goto'?
double xpos = timeAxis->posAtValue((dp.time + 60) / 60);
bool nextStep = false;
for (const auto &h: handles) {
if (IS_FP_SAME(h->pos().x(), xpos)) {
nextStep = true;
break;
}
}
if (nextStep)
continue;
dp.time += 60; dp.time += 60;
plannerModel->editStop(row, dp); plannerModel->editStop(row, dp);
} }

12
qt-models/diveplannermodel.cpp
View file

@ -844,6 +844,18 @@ void DivePlannerPointsModel::editStop(int row, divedatapoint newData)
*/ */
int old_first_cylid = divepoints[0].cylinderid; int old_first_cylid = divepoints[0].cylinderid;
// Refuse creation of two points with the same time stamp.
// Note: "time" is moved in the positive direction to avoid
// time becoming zero or, worse, negative.
while (std::any_of(divepoints.begin(), divepoints.begin() + row,
[t = newData.time] (const divedatapoint &data)
{ return data.time == t; }))
newData.time += 10;
while (std::any_of(divepoints.begin() + row + 1, divepoints.end(),
[t = newData.time] (const divedatapoint &data)
{ return data.time == t; }))
newData.time += 10;
// Is it ok to change data first and then move the rows? // Is it ok to change data first and then move the rows?
divepoints[row] = newData; divepoints[row] = newData;