mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Another Model Cleanup

Browse source 
Conversion of the WSInfoModel, that populates the list
of weigthsystems in the Equipment tab.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
Tomaz Canabrava 2013-10-11 11:13:16 -03:00
parent a4efa8c444
commit fac316865c
2 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
qt-ui/models.cpp
View file

@ -545,11 +545,6 @@ void WSInfoModel::clear()
{ {
} }
int WSInfoModel::columnCount(const QModelIndex& parent) const
{
return 2;
}
QVariant WSInfoModel::data(const QModelIndex& index, int role) const QVariant WSInfoModel::data(const QModelIndex& index, int role) const
{ {
QVariant ret; QVariant ret;
@ -578,31 +573,6 @@ QVariant WSInfoModel::data(const QModelIndex& index, int role) const
return ret; return ret;
} }
QVariant WSInfoModel::headerData(int section, Qt::Orientation orientation, int role) const
{
QVariant ret;
if (orientation != Qt::Horizontal)
return ret;
switch(role){
case Qt::FontRole :
ret = defaultModelFont();
break;
case Qt::DisplayRole :
switch(section) {
case GR:
ret = tr("kg");
break;
case DESCRIPTION:
ret = tr("Description");
break;
}
break;
}
return ret;
}
int WSInfoModel::rowCount(const QModelIndex& parent) const int WSInfoModel::rowCount(const QModelIndex& parent) const
{ {
return rows+1; return rows+1;
@ -613,8 +583,9 @@ const QString& WSInfoModel::biggerString() const
return biggerEntry; return biggerEntry;
} }
WSInfoModel::WSInfoModel() : QAbstractTableModel(), rows(-1) WSInfoModel::WSInfoModel() : rows(-1)
{ {
setHeaderDataStrings( QStringList() << tr("Description") << tr("kg"));
struct ws_info_t *info = ws_info; struct ws_info_t *info = ws_info;
for (info = ws_info; info->name; info++, rows++){ for (info = ws_info; info->name; info++, rows++){
QString wsInfoName(info->name); QString wsInfoName(info->name);

4
qt-ui/models.h
View file

@ -55,7 +55,7 @@ private:
}; };
/* Encapsulate ws_info */ /* Encapsulate ws_info */
class WSInfoModel : public QAbstractTableModel { class WSInfoModel : public CleanerTableModel {
Q_OBJECT Q_OBJECT
public: public:
static WSInfoModel* instance(); static WSInfoModel* instance();
@ -63,8 +63,6 @@ public:
enum Column {DESCRIPTION, GR}; enum Column {DESCRIPTION, GR};
WSInfoModel(); WSInfoModel();
/*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*/ QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
/*reimp*/ int rowCount(const QModelIndex& parent = QModelIndex()) const; /*reimp*/ int rowCount(const QModelIndex& parent = QModelIndex()) const;
/*reimp*/ bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()); /*reimp*/ bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex());