Curve reference add ui data models and fix invalid memory crashes

This commit is contained in:
elecpower
2020-12-21 23:33:18 +11:00
parent f14c1be306
commit 613ed78527
12 changed files with 166 additions and 96 deletions
@@ -505,3 +505,27 @@ void dumpModelContents(QString desc, AbstractRawItemDataModel * dataModel)
else
qDebug() << "model:" << desc << "did not cast";
}
CurveRefTypeItemModel::CurveRefTypeItemModel(QObject * parent) :
AbstractStandardItemModel(parent)
{
for (int i = 0; i <= CurveReference::MAX_CURVE_REF_TYPE; i++) {
QStandardItem * modelItem = new QStandardItem();
modelItem->setText(CurveReference::typeToString((CurveReference::CurveRefType)i));
modelItem->setData(i, ItemIdRole);
modelItem->setData(CurveReference::isTypeAvailable((CurveReference::CurveRefType)i), IsAvailableRole);
appendRow(modelItem);
}
}
CurveRefFuncItemModel::CurveRefFuncItemModel(QObject * parent) :
AbstractStandardItemModel(parent)
{
for (int i = 1; i <= CurveReference::functionCount(); i++) {
QStandardItem * modelItem = new QStandardItem();
modelItem->setText(CurveReference::functionToString(i));
modelItem->setData(i, ItemIdRole);
modelItem->setData(CurveReference::isFunctionAvailable(i), IsAvailableRole);
appendRow(modelItem);
}
}
+33 -3
View File
@@ -30,11 +30,20 @@ class GeneralSettings;
class ModelData;
class AdjustmentReference;
class AbstractRawItemDataModel: public QStandardItemModel
class AbstractStandardItemModel: public QStandardItemModel
{
Q_OBJECT
public:
enum DataRoles { ItemIdRole = Qt::UserRole, ItemTypeRole, ItemFlagsRole, IsAvailableRole };
explicit AbstractStandardItemModel(QObject * parent = nullptr) :
QStandardItemModel(parent)
{}
enum DataRoles {
ItemIdRole = Qt::UserRole,
ItemTypeRole,
ItemFlagsRole,
IsAvailableRole
};
Q_ENUM(DataRoles)
enum DataGroups {
@@ -43,9 +52,14 @@ class AbstractRawItemDataModel: public QStandardItemModel
PositiveGroup = 0x04
};
Q_ENUM(DataGroups)
};
class AbstractRawItemDataModel: public AbstractStandardItemModel
{
Q_OBJECT
public:
explicit AbstractRawItemDataModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent = nullptr) :
QStandardItemModel(parent),
AbstractStandardItemModel(parent),
generalSettings(generalSettings),
modelData(modelData)
{}
@@ -221,4 +235,20 @@ class CommonItemModels: public QObject
void dumpModelContents(QString desc, AbstractRawItemDataModel * dataModel);
class CurveRefTypeItemModel : public AbstractStandardItemModel
{
Q_OBJECT
public:
explicit CurveRefTypeItemModel(QObject * parent = nullptr);
};
class CurveRefFuncItemModel : public AbstractStandardItemModel
{
Q_OBJECT
public:
explicit CurveRefFuncItemModel(QObject * parent = nullptr);
};
#endif // RAWITEMDATAMODELS_H