diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-05-28 16:23:49 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-05-29 14:09:13 -0700 |
| commit | f432b764e78ac3d66f5ab1bfc7c18fbdb75624e5 (patch) | |
| tree | c2ec5c81660d22bf986968808bd4ecb7256623ae /qt-ui/profile/profilewidget2.cpp | |
| parent | 6e4aa7d044a344527e61f17c2254851ba799c4bd (diff) | |
| download | subsurface-f432b764e78ac3d66f5ab1bfc7c18fbdb75624e5.tar.gz | |
Move DivePlannerModel and CylinderModel to qt-models
Still trying to make it easier for the Mobile Port:
This patch is a bit bigger than I hopped, but it was the smallest that I
could get.
A lot of TODO items where added where I broke the code because the current
implementation would break the QML implementtion on the designer. I'll
most probably fix those myself when I finish the transition to the models
to the new folder.
I only moved both models at once because there's an interdependency
between them (seems inevitable, tough, but I'll take a better look at it
later).
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/profile/profilewidget2.cpp')
| -rw-r--r-- | qt-ui/profile/profilewidget2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index a426ceef2..d70d88763 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -11,6 +11,7 @@ #include "tankitem.h" #include "pref.h" #include "divepicturewidget.h" +#include "diveplannermodel.h" #include "models.h" #include "maintab.h" #include "diveplanner.h" @@ -1562,7 +1563,7 @@ void ProfileWidget2::repositionDiveHandlers() QLineF line(p1, p2); QPointF pos = line.pointAt(0.5); gases[i]->setPos(pos); - gases[i]->setText(dpGasToStr(datapoint)); + gases[i]->setText(get_divepoint_gas_string(datapoint)); gases[i]->setVisible(datapoint.entered && (i == 0 || gases[i]->text() != gases[i-1]->text())); } |