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

Made possible to add a divepoint between two others.

Browse source 
Made possible to add a divepoint between two others,
this also implemented the last patch in the correct way.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
Tomaz Canabrava 2013-08-26 17:02:34 -03:00
parent 760c14ac0c
commit 3323fecea8
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/diveplanner.cpp
View file

@ -956,13 +956,18 @@ void DivePlannerPointsModel::setStartTime(const QTime& t)
diveplan.when = t.msec(); diveplan.when = t.msec();
} }
bool divePointsLessThan(const divedatapoint& p1, const divedatapoint& p2){
return p1.time <= p2.time;
}
int DivePlannerPointsModel::addStop(int meters, int minutes, const QString& gas, int ccpoint) int DivePlannerPointsModel::addStop(int meters, int minutes, const QString& gas, int ccpoint)
{ {
int row = divepoints.count(); int row = divepoints.count();
// check if there's already a new stop before this one: // check if there's already a new stop before this one:
Q_FOREACH(const divedatapoint& dp, divepoints){ for(int i = 0; i < divepoints.count(); i++){
const divedatapoint& dp = divepoints.at(i);
if (dp.time > minutes ){ if (dp.time > minutes ){
return -1; row = i;
break;
} }
} }
@ -975,6 +980,7 @@ int DivePlannerPointsModel::addStop(int meters, int minutes, const QString& gas,
point.he = 0; point.he = 0;
point.po2 = 0; point.po2 = 0;
divepoints.append( point ); divepoints.append( point );
std::sort(divepoints.begin(), divepoints.end(), divePointsLessThan);
endInsertRows(); endInsertRows();
return row; return row;
} }