diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-20 14:39:02 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-20 17:32:54 -0700 |
| commit | 11a0c0cc701806ccec975c67d27dec97fbb13b1f (patch) | |
| tree | 15a3ace16588b80a88fea76cec30386414bfc3f7 /qt-models | |
| parent | 94d8abd1a292ac0b02064c906da3a66ccf9e6737 (diff) | |
| download | subsurface-11a0c0cc701806ccec975c67d27dec97fbb13b1f.tar.gz | |
Unify sample pressure and o2pressure as pressure[2] array
We currently carry two pressures around for all the samples and plot
info, but the second pressure is reserved for CCR dives as the O2
cylinder pressure.
That's kind of annoying when we *could* use it for regular sidemount
dives as the secondary pressure.
So start prepping for that instead: don't make it "pressure" and
"o2pressure", make it just be an array of two pressure values.
NOTE! This is purely mindless prepwork. It literally just does a
search-and-replace, keeping the exact same semantics, so "pressure[1]"
is still just O2 pressure.
But at some future date, we can now start using it for a second sensor
value for sidemount instead.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/diveplotdatamodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qt-models/diveplotdatamodel.cpp b/qt-models/diveplotdatamodel.cpp index a804ec1c3..e5bb30ab0 100644 --- a/qt-models/diveplotdatamodel.cpp +++ b/qt-models/diveplotdatamodel.cpp @@ -32,7 +32,7 @@ QVariant DivePlotDataModel::data(const QModelIndex &index, int role) const case TIME: return item.sec; case PRESSURE: - return item.pressure[0]; + return item.pressure[0][0]; case TEMPERATURE: return item.temperature; case COLOR: @@ -42,9 +42,9 @@ QVariant DivePlotDataModel::data(const QModelIndex &index, int role) const case CYLINDERINDEX: return item.cylinderindex; case SENSOR_PRESSURE: - return item.pressure[0]; + return item.pressure[0][0]; case INTERPOLATED_PRESSURE: - return item.pressure[1]; + return item.pressure[0][1]; case CEILING: return item.ceiling; case SAC: |