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

mobile/summary: create DiveSummaryModel

Browse source 
Instead of passing the dive summary via a completely unstructured
QStringList to QML, implement a dynamic model. For potential reuse
on desktop (though somewhat unlikely) the model has two interfaces,
one for QtWidgets and one for QML. The former is based on columns,
whereas the later is based on roles. The number of columns is
set dynamically. The roles currently support access to two columns.
If more columns should be accessed from QML, more roles have to
be added manually.

This commit only creates the model and hooks it into QMLs global
context, but does not yet change the QML page.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Berthold Stoeger 2020-02-08 12:06:57 +01:00 • committed by Dirk Hohndel
parent 48ccd114fc
commit 1a85b0e941
5 changed files with 322 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

58
qt-models/divesummarymodel.h Normal file
View file

@ -0,0 +1,58 @@
// SPDX-License-Identifier: GPL-2.0
#ifndef DIVESUMMARYMODEL_H
#define DIVESUMMARYMODEL_H
#include <QAbstractTableModel>
#include <vector>
class DiveSummaryModel : public QAbstractTableModel {
Q_OBJECT
public:
enum Row {
DIVES,
DIVES_EAN,
DIVES_DEEP,
PLANS,
TIME,
TIME_MAX,
TIME_AVG,
DEPTH_MAX,
DEPTH_AVG,
SAC_MIN,
SAC_MAX,
SAC_AVG,
NUM_ROW
};
// Roles for QML. Amazingly it appears that QML before Qt 5.12 *cannot*
// display run-of-the-mill tabular data.
// Therefore we transform a fixed number of columns, including the header
// into roles that can be displayed by QML. The mind boggles.
enum QMLRoles {
HEADER_ROLE = Qt::UserRole + 1,
COLUMN0_ROLE,
COLUMN1_ROLE,
};
struct Result {
QString dives, divesEAN, divesDeep, plans;
QString time, time_max, time_avg;
QString depth_max, depth_avg;
QString sac_min, sac_max, sac_avg;
};
Q_INVOKABLE void setNumData(int num);
Q_INVOKABLE void calc(int column, int period);
private:
int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const override;
QVariant data(const QModelIndex &index, int role) const override;
QHash<int, QByteArray> roleNames() const override;
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
QVariant dataDisplay(int row, int col) const;
std::vector<Result> results;
};
#endif