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

desktop: unglobalize ComboBox-models

Browse source 
The combo-boxes (cylinder type, weightsystem, etc.) were controlled
by global models. Keeping these models up-to-date was very combersome
and buggy.

Create a new model everytime a combobox is opened. Ultimately it
might even be better to create a copy of the strings and switch
to simple QStringListModel. Set data in the core directly and
don't do this via the models.

The result is much simpler and easier to handle.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-30 13:40:00 +01:00 • committed by Michael Keller
parent de313bd01a
commit 0d011231e6
16 changed files with 130 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

52
qt-models/tankinfomodel.cpp
View file

@ -5,48 +5,9 @@
#include "core/gettextfromc.h"
#include "core/metrics.h"
TankInfoModel *TankInfoModel::instance()
{
static TankInfoModel self;
return &self;
}
bool TankInfoModel::insertRows(int, int count, const QModelIndex &parent)
{
beginInsertRows(parent, rowCount(), rowCount() + count - 1);
for (int i = 0; i < count; ++i)
add_tank_info_metric(&tank_info_table, "", 0, 0);
endInsertRows();
return true;
}
bool TankInfoModel::setData(const QModelIndex &index, const QVariant &value, int)
{
//WARN Seems wrong, we need to check for role == Qt::EditRole
if (index.row() < 0 || index.row() >= tank_info_table.nr )
return false;
struct tank_info &info = tank_info_table.infos[index.row()];
switch (index.column()) {
case DESCRIPTION:
free((void *)info.name);
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;
}
QVariant TankInfoModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid() || index.row() < 0 || index.row() >= tank_info_table.nr)
if (index.row() < 0 || index.row() >= tank_info_table.nr)
return QVariant();
if (role == Qt::FontRole)
return defaultModelFont();
@ -75,16 +36,7 @@ int TankInfoModel::rowCount(const QModelIndex&) const
return tank_info_table.nr;
}
TankInfoModel::TankInfoModel()
TankInfoModel::TankInfoModel(QObject *parent) : CleanerTableModel(parent)
{
setHeaderDataStrings(QStringList() << tr("Description") << tr("ml") << tr("bar"));
connect(&diveListNotifier, &DiveListNotifier::dataReset, this, &TankInfoModel::update);
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &TankInfoModel::update);
update();
}
void TankInfoModel::update()
{
beginResetModel();
endResetModel();
}