mandlm/ESGRAF48
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

refactored common test-model functions to base class

Browse source
This commit is contained in:
Michael Mandl 2018-05-24 20:35:16 +02:00
parent 3ad5d3bd57
commit 8f170eb83b
14 changed files with 353 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/Genus/CMakeLists.txt
View file

@ -27,6 +27,8 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PRIVATE
CheckableItem
CheckableItem
CheckableTest
CheckableTestModel
Qt5::Widgets
)

209
source/Genus/GenusModel.cpp
View file

@ -1,208 +1,11 @@
#include "GenusModel.h"
#include <QJsonArray>
#include <QDebug>
GenusModel::GenusModel(QObject *parent)
: QAbstractTableModel(parent)
: CheckableTestModel(parent)
{
}
int GenusModel::rowCount(const QModelIndex &parent) const
{
return 3;
}
int GenusModel::columnCount(const QModelIndex &parent) const
{
return 8;
}
QVariant GenusModel::data(const QModelIndex &index, int role) const
{
if (!isValidIndex(index))
{
return {};
}
try
{
auto &item = getItem(index);
if (role == Qt::DisplayRole)
{
return item.getText().c_str();
}
if (role == Qt::CheckStateRole)
{
return item.isChecked() ? Qt::Checked : Qt::Unchecked;
}
}
catch (std::runtime_error &e)
{
qDebug() << "GenusModel::data" << index << e.what();
}
return {};
}
Qt::ItemFlags GenusModel::flags(const QModelIndex &index) const
{
if (isValidIndex(index))
{
return Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
}
return Qt::NoItemFlags;
}
bool GenusModel::setData(
const QModelIndex &index, const QVariant &value, int role)
{
if (!isValidIndex(index))
{
return false;
}
try
{
if (role == Qt::CheckStateRole)
{
auto &item = getItem(index);
item.setState(value.toBool());
return true;
}
}
catch (std::runtime_error &e)
{
qDebug() << "GenusModel::setData" << index << e.what();
}
return false;
}
QVariant GenusModel::headerData(
int section, Qt::Orientation orientation, int role) const
{
if (role == Qt::DisplayRole && orientation == Qt::Vertical)
{
switch (section)
{
case 0:
return "Tiere";
case 1:
return "Futter";
case 2:
return "Zirkus";
default:
return {};
}
}
return {};
}
void GenusModel::write(QJsonObject &json) const
{
QJsonArray tiere;
m_tiere.write(tiere);
json["Tiere"] = tiere;
QJsonArray futter;
m_futter.write(futter);
json["Futter"] = futter;
QJsonArray zirkus;
m_zirkus.write(zirkus);
json["Zirkus"] = zirkus;
}
void GenusModel::read(const QJsonObject &json)
{
if (json["Tiere"].isArray())
{
m_tiere.read(json["Tiere"].toArray());
}
if (json["Futter"].isArray())
{
m_futter.read(json["Futter"].toArray());
}
if (json["Zirkus"].isArray())
{
m_zirkus.read(json["Zirkus"].toArray());
}
}
bool GenusModel::isValidIndex(const QModelIndex &index) const
{
switch (index.row())
{
case 0:
return index.column() < m_tiere.size();
case 1:
return index.column() < m_futter.size();
case 2:
return index.column() < m_zirkus.size();
default:
return false;
}
}
CheckableItems &GenusModel::getItems(const QModelIndex &index)
{
switch (index.row())
{
case 0:
return m_tiere;
case 1:
return m_futter;
case 2:
return m_zirkus;
default:
break;
}
throw std::runtime_error("invalid index");
}
const CheckableItems &GenusModel::getItems(const QModelIndex &index) const
{
switch (index.row())
{
case 0:
return m_tiere;
case 1:
return m_futter;
case 2:
return m_zirkus;
default:
break;
}
throw std::runtime_error("invalid index");
}
CheckableItem &GenusModel::getItem(const QModelIndex &index)
{
auto &items = getItems(index);
if (index.column() < items.size())
{
return items.at(index.column());
}
throw std::runtime_error("invalid index");
}
const CheckableItem &GenusModel::getItem(const QModelIndex &index) const
{
auto &items = getItems(index);
if (index.column() < items.size())
{
return items.at(index.column());
}
throw std::runtime_error("invalid index");
m_tests = { { "Tiere", { "Tiger", "Bär", "Katze", "Pferd", "Gans",
"Elefant", "Katze", "Hund" } },
{ "Futter", { "Salat", "Fleisch", "Knocken", "Banane", "Apfel", "Möhre",
"Honig", "Zucker" } },
{ "Zirkus", { "Kiste", "Holz", "Vorhang", "Baum" } } };
}

36
source/Genus/GenusModel.h
View file

@ -1,43 +1,11 @@
#pragma once
#include "CheckableItem.h"
#include "CheckableItems.h"
#include "CheckableTestModel.h"
#include <QAbstractTableModel>
class GenusModel : public QAbstractTableModel
class GenusModel : public CheckableTestModel
{
Q_OBJECT
private:
CheckableItems m_tiere = { "Tiger", "Bär", "Katze", "Pferd", "Gans",
"Elefant", "Katze", "Hund" };
CheckableItems m_futter = { "Salat", "Fleisch", "Knocken", "Banane",
"Apfel", "Möhre", "Honig", "Zucker" };
CheckableItems m_zirkus = { "Kiste", "Holz", "Vorhang", "Baum" };
public:
GenusModel(QObject *parent);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(
const QModelIndex &index, int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value,
int role = Qt::EditRole) override;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const override;
void write(QJsonObject &json) const;
void read(const QJsonObject &json);
private:
bool isValidIndex(const QModelIndex &index) const;
CheckableItems &getItems(const QModelIndex &index);
const CheckableItems &getItems(const QModelIndex &index) const;
CheckableItem &getItem(const QModelIndex &index);
const CheckableItem &getItem(const QModelIndex &index) const;
};