From 21d34db3a94e004affdaceb091382b251071d89d Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabrava@kde.org>
Date: Tue, 21 Jan 2014 13:35:40 -0200
Subject: Simplfy the code for the cylinder pressure.
Instead of asking the data as we do on the generic models, use the
internal knowledge of the class.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
qt-ui/profile/diveprofileitem.cpp | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
(limited to 'qt-ui')
diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp
index 0715bc58b..f33ebeec7 100644
--- a/qt-ui/profile/diveprofileitem.cpp
+++ b/qt-ui/profile/diveprofileitem.cpp
@@ -226,22 +226,19 @@ void DiveGasPressureItem::modelDataChanged()
QPolygonF boundingPoly; // This is the "Whole Item", but a pressure can be divided in N Polygons.
polygons.clear();
- for (int i = 0; i < dataModel->rowCount(); i++) {
- int sPressure = dataModel->index(i, DivePlotDataModel::SENSOR_PRESSURE).data().toInt();
- int iPressure = dataModel->index(i, DivePlotDataModel::INTERPOLATED_PRESSURE).data().toInt();
- int cylIndex = dataModel->index(i, DivePlotDataModel::CYLINDERINDEX).data().toInt();
- int sec = dataModel->index(i, DivePlotDataModel::TIME).data().toInt();
- int mbar = sPressure ? sPressure : iPressure;
-
- if (cylIndex != last_index) {
+ for (int i = 0, count = dataModel->rowCount(); i < count; i++) {
+ plot_data* entry = dataModel->data() + i;
+ int mbar = GET_PRESSURE(entry);
+
+ if (entry->cylinderindex != last_index) {
polygons.append(QPolygonF()); // this is the polygon that will be actually drawned on screen.
- last_index = cylIndex;
+ last_index = entry->cylinderindex;
}
if (!mbar) {
continue;
}
- QPointF point(hAxis->posAtValue(sec), vAxis->posAtValue(mbar));
+ QPointF point(hAxis->posAtValue(entry->sec), vAxis->posAtValue(mbar));
boundingPoly.push_back(point); // The BoundingRect
polygons.last().push_back(point); // The polygon thta will be plotted.
}
--
cgit v1.2.3-70-g09d2