2017-04-27 18:25:32 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2018-05-10 15:35:30 +00:00
|
|
|
#include "qt-models/weightsysteminfomodel.h"
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
#include "core/subsurface-qt/divelistnotifier.h"
|
2016-04-05 05:02:03 +00:00
|
|
|
#include "core/dive.h"
|
|
|
|
#include "core/metrics.h"
|
|
|
|
#include "core/gettextfromc.h"
|
2015-05-28 19:52:13 +00:00
|
|
|
|
|
|
|
WSInfoModel *WSInfoModel::instance()
|
|
|
|
{
|
2017-12-20 19:00:26 +00:00
|
|
|
static WSInfoModel self;
|
|
|
|
return &self;
|
2015-05-28 19:52:13 +00:00
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
bool WSInfoModel::insertRows(int, int count, const QModelIndex &parent)
|
2015-05-28 19:52:13 +00:00
|
|
|
{
|
|
|
|
beginInsertRows(parent, rowCount(), rowCount());
|
|
|
|
rows += count;
|
|
|
|
endInsertRows();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
bool WSInfoModel::setData(const QModelIndex &index, const QVariant &value, int)
|
2015-05-28 19:52:13 +00:00
|
|
|
{
|
2016-03-08 05:28:50 +00:00
|
|
|
//WARN: check for Qt::EditRole
|
2015-05-28 19:52:13 +00:00
|
|
|
struct ws_info_t *info = &ws_info[index.row()];
|
|
|
|
switch (index.column()) {
|
|
|
|
case DESCRIPTION:
|
|
|
|
info->name = strdup(value.toByteArray().data());
|
|
|
|
break;
|
|
|
|
case GR:
|
|
|
|
info->grams = value.toInt();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
emit dataChanged(index, index);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void WSInfoModel::clear()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
QVariant WSInfoModel::data(const QModelIndex &index, int role) const
|
|
|
|
{
|
|
|
|
QVariant ret;
|
|
|
|
if (!index.isValid()) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
struct ws_info_t *info = &ws_info[index.row()];
|
|
|
|
|
|
|
|
int gr = info->grams;
|
|
|
|
switch (role) {
|
|
|
|
case Qt::FontRole:
|
|
|
|
ret = defaultModelFont();
|
|
|
|
break;
|
|
|
|
case Qt::DisplayRole:
|
|
|
|
case Qt::EditRole:
|
|
|
|
switch (index.column()) {
|
|
|
|
case GR:
|
|
|
|
ret = gr;
|
|
|
|
break;
|
|
|
|
case DESCRIPTION:
|
2018-06-17 15:55:47 +00:00
|
|
|
ret = gettextFromC::tr(info->name);
|
2015-05-28 19:52:13 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
int WSInfoModel::rowCount(const QModelIndex&) const
|
2015-05-28 19:52:13 +00:00
|
|
|
{
|
2019-04-27 14:53:13 +00:00
|
|
|
return rows;
|
2015-05-28 19:52:13 +00:00
|
|
|
}
|
|
|
|
|
2019-04-27 14:53:13 +00:00
|
|
|
WSInfoModel::WSInfoModel()
|
2015-05-28 19:52:13 +00:00
|
|
|
{
|
|
|
|
setHeaderDataStrings(QStringList() << tr("Description") << tr("kg"));
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
connect(&diveListNotifier, &DiveListNotifier::dataReset, this, &WSInfoModel::update);
|
2019-04-27 14:53:13 +00:00
|
|
|
update();
|
2015-05-28 19:52:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void WSInfoModel::update()
|
|
|
|
{
|
2019-04-27 14:53:13 +00:00
|
|
|
beginResetModel();
|
|
|
|
rows = 0;
|
|
|
|
for (struct ws_info_t *info = ws_info; info->name && info < ws_info + MAX_WS_INFO; info++, rows++)
|
2019-04-27 14:40:55 +00:00
|
|
|
;
|
2019-04-27 14:53:13 +00:00
|
|
|
endResetModel();
|
2015-05-28 19:52:13 +00:00
|
|
|
}
|