diff options
| author |  Tomaz Canabrava <tcanabrava@kde.org> | 2013-07-21 09:44:52 -0300 |
|---|---|---|
| committer | Tomaz Canabrava <tcanabrava@kde.org> | 2013-07-21 09:44:52 -0300 |
| commit | a6025c8efd1ae83c68fdf65fbffa827802757f2f (patch) | |
| tree | 29ebcebaf8aa10dbf2bc5905da8b59a3cb3d5373 | |
| parent | 29cb15950e632dd70fa004f721c529c6d0c8041b (diff) | |
| download | subsurface-a6025c8efd1ae83c68fdf65fbffa827802757f2f.tar.gz | |
Added button to reduce dive time on the planner.
Added a button and a method to reduce time on the dive
planner. The dive planner will not reduce below deco-time
and it will also not reduce below TIME_INITIAL_MAX.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
| -rw-r--r-- | qt-ui/diveplanner.cpp | 17 | ||||
| -rw-r--r-- | qt-ui/diveplanner.h | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 74851cef0..3384ddd8f 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -331,7 +331,19 @@ void DivePlannerGraphics::decreaseDepth() void DivePlannerGraphics::decreaseTime() { - + if (timeLine->maximum() -10 < TIME_INITIAL_MAX){ + qDebug() << "oi"; + return; + } + if (timeLine->maximum() - 10 < dpMaxTime){ + qDebug() << timeLine->maximum() << dpMaxTime; + qDebug() << "Como?"; + return; + } + minMinutes -= 10; + timeLine->setMaximum(timeLine->maximum() -10); + timeLine->updateTicks(); + createDecoStops(); } void DivePlannerGraphics::mouseDoubleClickEvent(QMouseEvent* event) @@ -404,6 +416,8 @@ void DivePlannerGraphics::createDecoStops() while(dp->next) dp = dp->next; + dpMaxTime = dp->time / 60.0 + 5; + if (timeLine->maximum() < dp->time / 60.0 + 5 || dp->time / 60.0 + 15 < timeLine->maximum()) { double newMax = fmax(dp->time / 60.0 + 5, minMinutes); @@ -602,6 +616,7 @@ void DiveHandler::mousePressEvent(QGraphicsSceneMouseEvent* event) void Ruler::setMaximum(double maximum) { + qDebug() << "Maximum set " << maximum; max = maximum; } diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index 468df0ed9..ccd81584b 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -130,6 +130,7 @@ private: Button *cancelBtn; // rejects, and clears the dive plan. int minMinutes; // this holds the minimum duration of the dive. + int dpMaxTime; // this is the time of the dive calculated by the deco. }; #endif |