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

Fix planner / add dive handling of DiveHandler Points

Browse source 
Dirk, is this really necessary or it's just something that you forgot
to remove? this is adding a bit of pain to fix some issues on the planner,
so I'm commenting this out untill you have a bit of time to look at it.
It looks like this was added to handle the gas in the pos-1, but you reverted
if so, this completely reverts it, and things works as expected again.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-11-14 18:45:32 -02:00 • committed by Dirk Hohndel
parent 1ee08005b2
commit 0f50b73f9e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qt-ui/diveplanner.cpp
View file

@ -422,7 +422,7 @@ void DivePlannerGraphics::mouseDoubleClickEvent(QMouseEvent* event)
void DivePlannerPointsModel::createSimpleDive() void DivePlannerPointsModel::createSimpleDive()
{ {
plannerModel->addStop(0, 0, O2_IN_AIR, 0, 0); // plannerModel->addStop(0, 0, O2_IN_AIR, 0, 0);
plannerModel->addStop(M_OR_FT(15,45), 1 * 60, O2_IN_AIR, 0, 0); plannerModel->addStop(M_OR_FT(15,45), 1 * 60, O2_IN_AIR, 0, 0);
plannerModel->addStop(M_OR_FT(15,45), 40 * 60, O2_IN_AIR, 0, 0); plannerModel->addStop(M_OR_FT(15,45), 40 * 60, O2_IN_AIR, 0, 0);
plannerModel->addStop(M_OR_FT(5,15), 42 * 60, O2_IN_AIR, 0, 0); plannerModel->addStop(M_OR_FT(5,15), 42 * 60, O2_IN_AIR, 0, 0);
@ -517,7 +517,7 @@ void DivePlannerGraphics::drawProfile()
// Re-position the user generated dive handlers // Re-position the user generated dive handlers
int last = 0; int last = 0;
for (int i = 1; i < plannerModel->rowCount(); i++) { for (int i = 0; i < plannerModel->rowCount(); i++) {
divedatapoint dp = plannerModel->at(i); divedatapoint dp = plannerModel->at(i);
if (dp.time == 0) // those are the magic entries for tanks if (dp.time == 0) // those are the magic entries for tanks
continue; continue;
@ -1161,6 +1161,11 @@ int DivePlannerPointsModel::addStop(int milimeters, int minutes, int o2, int he,
if (o2 != -1) if (o2 != -1)
if (!addGas(o2, he)) if (!addGas(o2, he))
qDebug("addGas failed"); // FIXME add error propagation qDebug("addGas failed"); // FIXME add error propagation
/*
* Dirk, is this really necessary or it's just something that you forgot
* to remove? this is adding a bit of pain to fix some issues on the planner,
* so I'm commenting this out untill you have a bit of time to look at it.
*
if(row == 0) { if(row == 0) {
if (o2 == -1) { if (o2 == -1) {
o2 = O2_IN_AIR; o2 = O2_IN_AIR;
@ -1176,7 +1181,7 @@ int DivePlannerPointsModel::addStop(int milimeters, int minutes, int o2, int he,
divepoints.append( point ); divepoints.append( point );
endInsertRows(); endInsertRows();
row++; row++;
} } */
// check if there's already a new stop before this one: // check if there's already a new stop before this one:
for (int i = 0; i < row; i++) { for (int i = 0; i < row; i++) {