diff options
| -rw-r--r-- | qt-ui/models.cpp | 36 | ||||
| -rw-r--r-- | qt-ui/models.h | 6 |
2 files changed, 7 insertions, 35 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 492b0ac4c..df957ea7c 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -46,8 +46,9 @@ QVariant CleanerTableModel::headerData(int section, Qt::Orientation orientation, ret = defaultModelFont(); break; case Qt::DisplayRole: - return headers.at(section); + ret = headers.at(section); } + return ret; } void CleanerTableModel::setHeaderDataStrings(const QStringList& newHeaders) @@ -349,8 +350,10 @@ void CylindersModel::remove(const QModelIndex& index) endRemoveRows(); } -WeightModel::WeightModel(QObject* parent): QAbstractTableModel(parent), current(0), rows(0) +WeightModel::WeightModel(QObject* parent): current(0), rows(0) { + //enum Column {REMOVE, TYPE, WEIGHT}; + setHeaderDataStrings(QStringList() << tr("") << tr("Type") << tr("Weight")); } weightsystem_t* WeightModel::weightSystemAt(const QModelIndex& index) @@ -378,11 +381,6 @@ void WeightModel::clear() } } -int WeightModel::columnCount(const QModelIndex& parent) const -{ - return COLUMNS; -} - QVariant WeightModel::data(const QModelIndex& index, int role) const { QVariant ret; @@ -476,30 +474,6 @@ int WeightModel::rowCount(const QModelIndex& parent) const return rows; } -QVariant WeightModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - QVariant ret; - if (orientation == Qt::Vertical) - return ret; - - switch (role) { - case Qt::FontRole: - ret = defaultModelFont(); - break; - case Qt::DisplayRole: - switch(section) { - case TYPE: - ret = tr("Type"); - break; - case WEIGHT: - ret = tr("Weight"); - break; - } - break; - } - return ret; -} - void WeightModel::add() { if (rows >= MAX_WEIGHTSYSTEMS) diff --git a/qt-ui/models.h b/qt-ui/models.h index 24f829add..5e3d07121 100644 --- a/qt-ui/models.h +++ b/qt-ui/models.h @@ -109,14 +109,12 @@ private: /* Encapsulation of the Weight Model, that represents * the current weights on a dive. */ -class WeightModel : public QAbstractTableModel { +class WeightModel : public CleanerTableModel { Q_OBJECT public: - enum Column {REMOVE, TYPE, WEIGHT, COLUMNS}; + enum Column {REMOVE, TYPE, WEIGHT}; explicit WeightModel(QObject *parent = 0); - /*reimp*/ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - /*reimp*/ int columnCount(const QModelIndex& parent = QModelIndex()) const; /*reimp*/ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; /*reimp*/ int rowCount(const QModelIndex& parent = QModelIndex()) const; /*reimp*/ Qt::ItemFlags flags(const QModelIndex& index) const; |