From a6025c8efd1ae83c68fdf65fbffa827802757f2f Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 21 Jul 2013 09:44:52 -0300 Subject: 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 --- qt-ui/diveplanner.cpp | 17 ++++++++++++++++- qt-ui/diveplanner.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-70-g09d2