aboutsummaryrefslogtreecommitdiffstats
path: root/qt-ui/profile/diveprofileitem.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-05-28 16:23:49 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-05-29 14:09:13 -0700
commitf432b764e78ac3d66f5ab1bfc7c18fbdb75624e5 (patch)
treec2ec5c81660d22bf986968808bd4ecb7256623ae /qt-ui/profile/diveprofileitem.cpp
parent6e4aa7d044a344527e61f17c2254851ba799c4bd (diff)
downloadsubsurface-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/diveprofileitem.cpp')
-rw-r--r--qt-ui/profile/diveprofileitem.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp
index 7d29d28b4..373dd0027 100644
--- a/qt-ui/profile/diveprofileitem.cpp
+++ b/qt-ui/profile/diveprofileitem.cpp
@@ -6,6 +6,7 @@
#include "dive.h"
#include "profile.h"
#include "preferences.h"
+#include "diveplannermodel.h"
#include "helpers.h"
#include "libdivecomputer/parser.h"
#include "mainwindow.h"
@@ -758,7 +759,7 @@ void DiveGasPressureItem::plotPressureValue(int mbar, int sec, QFlags<Qt::Alignm
void DiveGasPressureItem::plotGasValue(int mbar, int sec, struct gasmix gasmix, QFlags<Qt::AlignmentFlag> align, double gasname_offset)
{
- QString gas = gasToStr(gasmix);
+ QString gas = get_gas_string(gasmix);
DiveTextItem *text = new DiveTextItem(this);
text->setPos(hAxis->posAtValue(sec), vAxis->posAtValue(mbar) + gasname_offset );
text->setText(gas);