diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-02-04 14:12:43 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-04 07:09:35 -0800 |
| commit | 2516ae7e5f2a8912a394181fe451337a3a22c9ee (patch) | |
| tree | 946737d8f4ef1f8ed749bf188c2d5ac7cd3331e0 | |
| parent | cd38cda186c0fd0849854ae85c012a152ec5ffbc (diff) | |
| download | subsurface-2516ae7e5f2a8912a394181fe451337a3a22c9ee.tar.gz | |
Let cylinderid = -1 mean same gas as before
It's not too clever to give 0 a special meaning (as here:
use same gas as for previous leg) when 0 is a legitimate
value.
This should solve Willem's gas disappearance problem when
reediting a dive in the planner.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 2 | ||||
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 3 | ||||
| -rw-r--r-- | qt-models/diveplannermodel.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 0ad2b5601..38aa9d64f 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -932,7 +932,7 @@ void ProfileWidget2::mouseDoubleClickEvent(QMouseEvent *event) int minutes = rint(timeAxis->valueAt(mappedPos) / 60); int milimeters = rint(profileYAxis->valueAt(mappedPos) / M_OR_FT(1, 1)) * M_OR_FT(1, 1); - plannerModel->addStop(milimeters, minutes * 60, 0, 0, true); + plannerModel->addStop(milimeters, minutes * 60, -1, 0, true); } } diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 5a06313f4..38fbbb1b8 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -588,11 +588,12 @@ int DivePlannerPointsModel::lastEnteredPoint() return -1; } +// cylinderid_in == -1 means same gas as before. int DivePlannerPointsModel::addStop(int milimeters, int seconds, int cylinderid_in, int ccpoint, bool entered) { int cylinderid = 0; bool usePrevious = false; - if (cylinderid_in) + if (cylinderid_in >= 0) cylinderid = cylinderid_in; else usePrevious = true; diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h index eff668909..e9227f671 100644 --- a/qt-models/diveplannermodel.h +++ b/qt-models/diveplannermodel.h @@ -57,7 +57,7 @@ public: public slots: - int addStop(int millimeters = 0, int seconds = 0, int cylinderid_in = 0, int ccpoint = 0, bool entered = true); + int addStop(int millimeters = 0, int seconds = 0, int cylinderid_in = -1, int ccpoint = 0, bool entered = true); void addCylinder_clicked(); void setGFHigh(const int gfhigh); void triggerGFHigh(); |