mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
Add Information about the Pressure to the Model.
Added missing information about the pressure to the model; this shows that I didn't do something right, as the model has 0 pressure information. Need to fix that on the next commit. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
e3ec5ef290
commit
0787347691
4 changed files with 8 additions and 2 deletions
|
@ -31,6 +31,9 @@ QVariant DivePlotDataModel::data(const QModelIndex& index, int role) const
|
|||
case TEMPERATURE: return item.temperature;
|
||||
case COLOR: return item.velocity;
|
||||
case USERENTERED: return false;
|
||||
case CYLINDERINDEX: return item.cylinderindex;
|
||||
case SENSOR_PRESSURE: return item.pressure[0];
|
||||
case INTERPOLATED_PRESSURE: return item.pressure[1];
|
||||
}
|
||||
}
|
||||
if (role == Qt::BackgroundRole) {
|
||||
|
@ -61,6 +64,9 @@ QVariant DivePlotDataModel::headerData(int section, Qt::Orientation orientation,
|
|||
case TEMPERATURE: return tr("Temperature");
|
||||
case COLOR: return tr("Color");
|
||||
case USERENTERED: return tr("User Entered");
|
||||
case CYLINDERINDEX: return tr("Cylinder Index");
|
||||
case SENSOR_PRESSURE: return tr("Sensor Pressure");
|
||||
case INTERPOLATED_PRESSURE: return tr("Interpolated Pressure");
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ struct plot_info;
|
|||
class DivePlotDataModel : public QAbstractTableModel{
|
||||
Q_OBJECT
|
||||
public:
|
||||
enum {DEPTH, TIME, PRESSURE, TEMPERATURE, USERENTERED, COLOR, COLUMNS};
|
||||
enum {DEPTH, TIME, PRESSURE, TEMPERATURE, USERENTERED, COLOR, CYLINDERINDEX, SENSOR_PRESSURE, INTERPOLATED_PRESSURE, COLUMNS};
|
||||
explicit DivePlotDataModel(QObject* parent = 0);
|
||||
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
|
||||
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||
|
|
|
@ -58,4 +58,5 @@ public:
|
|||
virtual void modelDataChanged();
|
||||
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
|
||||
};
|
||||
|
||||
#endif
|
|
@ -335,7 +335,6 @@ void ProfileWidget2::plotDives(QList<dive*> dives)
|
|||
temperatureItem->setHorizontalDataColumn(DivePlotDataModel::TIME);
|
||||
scene()->addItem(temperatureItem);
|
||||
|
||||
|
||||
emit startProfileState();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue