diff options
author | Tomaz Canabrava <tcanabrava@kde.org> | 2014-01-16 18:39:13 -0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-01-17 06:18:25 +0700 |
commit | 58aeb6ce4014899e040a3ef8f4483f18fb44b432 (patch) | |
tree | 9e81e0fded3a1038ffa089e7b1bd49429d529df6 /qt-ui/profile/divecartesianaxis.cpp | |
parent | 254beef5d4c0ead123556ffbc5e37dd2cc81366e (diff) | |
download | subsurface-58aeb6ce4014899e040a3ef8f4483f18fb44b432.tar.gz |
Added the Temperature Graph.
Added the Temperature Graph with its related classes. A Temperature Axis
is also created so the item is plotted on the right place.
Currently the Temperature Axis is just like the depth axis - top is
zero, wich means that the graph is inverted.
Also, the Temperature axis is being displayed as this helps debugging.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/profile/divecartesianaxis.cpp')
-rw-r--r-- | qt-ui/profile/divecartesianaxis.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp index 08138408e..a7721561c 100644 --- a/qt-ui/profile/divecartesianaxis.cpp +++ b/qt-ui/profile/divecartesianaxis.cpp @@ -143,15 +143,16 @@ qreal DiveCartesianAxis::posAtValue(qreal value) QPointF p = pos(); double size = max - min; - double percent = value / size; + double distanceFromOrigin = value - min; + double percent = (value - min) / size; double realSize = orientation == Qt::Horizontal ? m.x2() - m.x1() : m.y2() - m.y1(); double retValue = realSize * percent; - retValue = (orientation == Qt::Horizontal) ? + double adjusted = (orientation == Qt::Horizontal) ? retValue + m.x1() + p.x() : retValue + m.y1() + p.y(); - return retValue; + return adjusted; } qreal DiveCartesianAxis::percentAt(const QPointF& p) @@ -192,6 +193,12 @@ QString TimeAxis::textForValue(double value) return QString::number(value / 60); } +QString TemperatureAxis::textForValue(double value) +{ + return QString::number(mkelvin_to_C( (int) value)); +} + + void DiveCartesianPlane::setLeftAxis(DiveCartesianAxis* axis) { leftAxis = axis; |