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

core: use C++ structures for tanksystem info

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-03 23:18:45 +02:00 • committed by bstoeger
parent 1af00703b3
commit 3c1401785b
13 changed files with 93 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-models/tankinfomodel.cpp
View file

@ -7,15 +7,13 @@
QVariant TankInfoModel::data(const QModelIndex &index, int role) const
{
if (index.row() < 0 || index.row() >= tank_info_table.nr)
if (index.row() < 0 || index.row() >= (int)tank_info_table.size())
return QVariant();
if (role == Qt::FontRole)
return defaultModelFont();
if (role == Qt::DisplayRole || role == Qt::EditRole) {
const struct tank_info &info = tank_info_table.infos[index.row()];
volume_t size = {0};
pressure_t pressure = {0};
extract_tank_info(&info, &size, &pressure);
const struct tank_info &info = tank_info_table[index.row()];
auto [size, pressure] = extract_tank_info(info);
switch (index.column()) {
case BAR:
@ -23,7 +21,7 @@ QVariant TankInfoModel::data(const QModelIndex &index, int role) const
case ML:
return size.mliter;
case DESCRIPTION:
return info.name;
return QString::fromStdString(info.name);
}
}
return QVariant();
@ -31,7 +29,7 @@ QVariant TankInfoModel::data(const QModelIndex &index, int role) const
int TankInfoModel::rowCount(const QModelIndex&) const
{
return tank_info_table.nr;
return (int)tank_info_table.size();
}
TankInfoModel::TankInfoModel(QObject *parent) : CleanerTableModel(parent)