mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: implement proper Qt-model semantics in WeightInfoModel

Browse source 
- Use a beginResetModel()/endResetModel() pair instead of distinct
addRows / removeRows pairs.

- Reuse the update function in the constructor().

- Let "rows" be the number of rows, not the number of rows minus one.

- Remove updateInfo() function as it does the same as update().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-27 16:53:13 +02:00 committed by Dirk Hohndel
parent 36d8dcc3bf
commit cab0147093
3 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/mainwindow.cpp
View file

@ -425,7 +425,7 @@ void MainWindow::refreshDisplay(bool doRecreateDiveList)
setApplicationState("Default");
diveList->setEnabled(true);
diveList->setFocus();
WSInfoModel::instance()->updateInfo();
WSInfoModel::instance()->update();
ui.actionAutoGroup->setChecked(autogroup);
}

44
qt-models/weightsysteminfomodel.cpp
View file

@ -68,50 +68,20 @@ QVariant WSInfoModel::data(const QModelIndex &index, int role) const
int WSInfoModel::rowCount(const QModelIndex&) const
{
return rows + 1;
return rows;
}
WSInfoModel::WSInfoModel() : rows(-1)
WSInfoModel::WSInfoModel()
{
setHeaderDataStrings(QStringList() << tr("Description") << tr("kg"));
struct ws_info_t *info;
for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
;
if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows);
endInsertRows();
}
}
void WSInfoModel::updateInfo()
{
struct ws_info_t *info;
beginRemoveRows(QModelIndex(), 0, this->rows);
endRemoveRows();
rows = -1;
for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
;
if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows);
endInsertRows();
}
update();
}
void WSInfoModel::update()
{
if (rows > -1) {
beginRemoveRows(QModelIndex(), 0, rows);
endRemoveRows();
rows = -1;
}
struct ws_info_t *info;
for (info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
beginResetModel();
rows = 0;
for (struct ws_info_t *info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
;
if (rows > -1) {
beginInsertRows(QModelIndex(), 0, rows);
endInsertRows();
}
endResetModel();
}

1
qt-models/weightsysteminfomodel.h
View file

@ -22,7 +22,6 @@ public:
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
void clear();
void update();
void updateInfo();
private:
int rows;