mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: Autom. move first datapoint gas to first gaslist position p2

Browse source 
This is a amendment to 24bd5a8dce

Move the cylinder also to first position if first planner datapoint
cylinder change because a row is added or deleted to the dive datapoints.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2017-10-18 09:02:28 +02:00 • committed by Robert C. Helling
parent 7a82103c99
commit 27a8fd51ed
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qt-models/diveplannermodel.cpp
View file

@ -756,12 +756,15 @@ void DivePlannerPointsModel::editStop(int row, divedatapoint newData)
* When moving divepoints rigorously, we might end up with index * When moving divepoints rigorously, we might end up with index
* out of range, thus returning the last one instead. * out of range, thus returning the last one instead.
*/ */
int old_first_cylid = divepoints[0].cylinderid;
if (row >= divepoints.count()) if (row >= divepoints.count())
return; return;
divepoints[row] = newData; divepoints[row] = newData;
std::sort(divepoints.begin(), divepoints.end(), divePointsLessThan); std::sort(divepoints.begin(), divepoints.end(), divePointsLessThan);
if (updateMaxDepth()) if (updateMaxDepth())
CylindersModel::instance()->updateBestMixes(); CylindersModel::instance()->updateBestMixes();
if (divepoints[0].cylinderid != old_first_cylid)
CylindersModel::instance()->moveAtFirst(divepoints[0].cylinderid);
emitDataChanged(); emitDataChanged();
} }
@ -790,6 +793,8 @@ void DivePlannerPointsModel::remove(const QModelIndex &index)
if (!dp.entered) if (!dp.entered)
return; return;
int old_first_cylid = divepoints[0].cylinderid;
/* TODO: this seems so wrong. /* TODO: this seems so wrong.
* We can't do this here if we plan to use QML on mobile * We can't do this here if we plan to use QML on mobile
* as mobile has no ControlModifier. * as mobile has no ControlModifier.
@ -809,6 +814,8 @@ void DivePlannerPointsModel::remove(const QModelIndex &index)
} }
endRemoveRows(); endRemoveRows();
CylindersModel::instance()->updateTrashIcon(); CylindersModel::instance()->updateTrashIcon();
if (divepoints[0].cylinderid != old_first_cylid)
CylindersModel::instance()->moveAtFirst(divepoints[0].cylinderid);
} }
struct diveplan &DivePlannerPointsModel::getDiveplan() struct diveplan &DivePlannerPointsModel::getDiveplan()