mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-01 06:30:26 +00:00
a40b40ae7a
On the equipment tab, unused cylinders (automatically added,
no pressure data) could be hidden. This was implemented using
a QSortFilterProxyModel.
Apparently, it causes confusion if cylinders in the middle of
the list are hidden. Therefore, only hide cylinders at the end
of the list.
QSortFilterProxyModel seems the wrong tool for that job, so
remove it and add a flag "hideUnused" to the base model. Calculate
the number of cylinders when changing the dive.
This is rather complex, because the same model is used for
the planner (which doesn't hide cylinders) and the equipment
tab (which does). Of course, syncing core and model now becomes
harder. For instance, the caching of the number of rows was removed
in a37939889b and now has to be
readded.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
83 lines
2.2 KiB
C++
83 lines
2.2 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef CYLINDERMODEL_H
|
|
#define CYLINDERMODEL_H
|
|
|
|
#include <QSortFilterProxyModel>
|
|
|
|
#include "cleanertablemodel.h"
|
|
#include "core/equipment.h"
|
|
|
|
/* Encapsulation of the Cylinder Model, that presents the
|
|
* Current cylinders that are used on a dive. */
|
|
class CylindersModel : public CleanerTableModel {
|
|
Q_OBJECT
|
|
public:
|
|
enum Column {
|
|
REMOVE,
|
|
TYPE,
|
|
SIZE,
|
|
WORKINGPRESS,
|
|
START,
|
|
END,
|
|
O2,
|
|
HE,
|
|
DEPTH,
|
|
MOD,
|
|
MND,
|
|
USE,
|
|
WORKINGPRESS_INT,
|
|
SIZE_INT,
|
|
COLUMNS
|
|
};
|
|
|
|
enum Roles {
|
|
TEMP_ROLE = Qt::UserRole + 1, // Temporarily set data, but don't store in dive
|
|
COMMIT_ROLE, // Save the temporary data to the dive. Must be set with Column == TYPE.
|
|
REVERT_ROLE // Revert to original data from dive. Must be set with Column == TYPE.
|
|
};
|
|
explicit CylindersModel(bool planner, bool hideUnused, QObject *parent = 0); // First argument: true if this model is used for the planner
|
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
|
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
|
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
|
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
|
|
|
void add();
|
|
void clear();
|
|
void updateDive(dive *d);
|
|
void updateDecoDepths(pressure_t olddecopo2);
|
|
void updateTrashIcon();
|
|
void moveAtFirst(int cylid);
|
|
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
|
bool updateBestMixes();
|
|
void emitDataChanged();
|
|
|
|
signals:
|
|
void divesEdited(int num);
|
|
|
|
public
|
|
slots:
|
|
void remove(QModelIndex index);
|
|
void cylindersReset(const QVector<dive *> &dives);
|
|
void cylinderAdded(dive *d, int pos);
|
|
void cylinderRemoved(dive *d, int pos);
|
|
void cylinderEdited(dive *d, int pos);
|
|
|
|
private:
|
|
dive *d;
|
|
bool inPlanner;
|
|
bool hideUnused;
|
|
int numRows; // Does not include unused cylinders at the end
|
|
// Used if we temporarily change a line because the user is selecting a weight type
|
|
int tempRow;
|
|
cylinder_t tempCyl;
|
|
|
|
cylinder_t *cylinderAt(const QModelIndex &index);
|
|
void initTempCyl(int row);
|
|
void clearTempCyl();
|
|
void commitTempCyl(int row);
|
|
bool cylinderUsed(int i) const;
|
|
int calcNumRows() const;
|
|
void updateNumRows();
|
|
};
|
|
|
|
#endif
|