Merge branch 'develop' into feature/print-with-qpainter

This commit is contained in:
Michael Mandl 2019-02-03 12:12:34 +01:00
commit f895ec0c1c
33 changed files with 1194 additions and 230 deletions

View file

@ -166,3 +166,8 @@ void MetaDataModel::printTo(QPainter &painter) const
painter.translate(0, 2 * height);
}
Age MetaDataModel::getAge() const
{
return {m_dateOfBirth, m_dateOfTest};
}

View file

@ -25,19 +25,14 @@ public:
MetaDataModel(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;
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;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
void read(const ESGRAF48::MetaDataModel &model);
void write(ESGRAF48::MetaDataModel &model) const;
void printTo(QPainter &painter) const override;
Age getAge() const
{
return { m_dateOfBirth, m_dateOfTest };
}
Age getAge() const;
};