2017-04-27 18:25:32 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2016-04-05 05:02:03 +00:00
|
|
|
#include "qt-models/tankinfomodel.h"
|
|
|
|
#include "core/dive.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/gettextfromc.h"
|
|
|
|
#include "core/metrics.h"
|
2015-05-28 19:39:15 +00:00
|
|
|
|
|
|
|
TankInfoModel *TankInfoModel::instance()
|
|
|
|
{
|
2017-12-20 19:00:26 +00:00
|
|
|
static TankInfoModel self;
|
|
|
|
return &self;
|
2015-05-28 19:39:15 +00:00
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
bool TankInfoModel::insertRows(int, int count, const QModelIndex &parent)
|
2015-05-28 19:39:15 +00:00
|
|
|
{
|
|
|
|
beginInsertRows(parent, rowCount(), rowCount());
|
|
|
|
rows += count;
|
|
|
|
endInsertRows();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
bool TankInfoModel::setData(const QModelIndex &index, const QVariant &value, int)
|
2015-05-28 19:39:15 +00:00
|
|
|
{
|
2016-03-08 05:28:00 +00:00
|
|
|
//WARN Seems wrong, we need to check for role == Qt::EditRole
|
2017-06-13 22:45:18 +00:00
|
|
|
|
|
|
|
if (index.row() < 0 || index.row() > MAX_TANK_INFO - 1)
|
|
|
|
return false;
|
|
|
|
|
2015-05-28 19:39:15 +00:00
|
|
|
struct tank_info_t *info = &tank_info[index.row()];
|
|
|
|
switch (index.column()) {
|
|
|
|
case DESCRIPTION:
|
|
|
|
info->name = strdup(value.toByteArray().data());
|
|
|
|
break;
|
|
|
|
case ML:
|
|
|
|
info->ml = value.toInt();
|
|
|
|
break;
|
|
|
|
case BAR:
|
|
|
|
info->bar = value.toInt();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
emit dataChanged(index, index);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void TankInfoModel::clear()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
QVariant TankInfoModel::data(const QModelIndex &index, int role) const
|
|
|
|
{
|
|
|
|
QVariant ret;
|
2017-06-13 22:45:18 +00:00
|
|
|
if (!index.isValid() || index.row() < 0 || index.row() > MAX_TANK_INFO - 1) {
|
2015-05-28 19:39:15 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (role == Qt::FontRole) {
|
|
|
|
return defaultModelFont();
|
|
|
|
}
|
|
|
|
if (role == Qt::DisplayRole || role == Qt::EditRole) {
|
|
|
|
struct tank_info_t *info = &tank_info[index.row()];
|
|
|
|
int ml = info->ml;
|
|
|
|
double bar = (info->psi) ? psi_to_bar(info->psi) : info->bar;
|
|
|
|
|
|
|
|
if (info->cuft && info->psi)
|
2017-03-23 01:13:49 +00:00
|
|
|
ml = lrint(cuft_to_l(info->cuft) * 1000 / bar_to_atm(bar));
|
2015-05-28 19:39:15 +00:00
|
|
|
|
|
|
|
switch (index.column()) {
|
|
|
|
case BAR:
|
|
|
|
ret = bar * 1000;
|
|
|
|
break;
|
|
|
|
case ML:
|
|
|
|
ret = ml;
|
|
|
|
break;
|
|
|
|
case DESCRIPTION:
|
|
|
|
ret = QString(info->name);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-05-21 15:53:42 +00:00
|
|
|
int TankInfoModel::rowCount(const QModelIndex&) const
|
2015-05-28 19:39:15 +00:00
|
|
|
{
|
2019-04-27 14:45:50 +00:00
|
|
|
return rows;
|
2015-05-28 19:39:15 +00:00
|
|
|
}
|
|
|
|
|
2019-04-27 14:45:50 +00:00
|
|
|
TankInfoModel::TankInfoModel()
|
2015-05-28 19:39:15 +00:00
|
|
|
{
|
|
|
|
setHeaderDataStrings(QStringList() << tr("Description") << tr("ml") << tr("bar"));
|
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, &TankInfoModel::update);
|
2020-11-24 11:50:52 +00:00
|
|
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &TankInfoModel::update);
|
2019-04-27 14:45:50 +00:00
|
|
|
update();
|
2015-05-28 19:39:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void TankInfoModel::update()
|
|
|
|
{
|
2019-04-27 14:45:50 +00:00
|
|
|
beginResetModel();
|
|
|
|
rows = 0;
|
|
|
|
for (struct tank_info_t *info = tank_info; info->name && info < tank_info + MAX_TANK_INFO; info++, rows++)
|
2019-04-27 14:40:55 +00:00
|
|
|
;
|
2019-04-27 14:45:50 +00:00
|
|
|
endResetModel();
|
2015-05-28 19:39:15 +00:00
|
|
|
}
|