diff --git a/source/MetaData/MetaDataModel.cpp b/source/MetaData/MetaDataModel.cpp index 94c2a62..f2911e8 100644 --- a/source/MetaData/MetaDataModel.cpp +++ b/source/MetaData/MetaDataModel.cpp @@ -166,3 +166,8 @@ std::string MetaDataModel::toHtml() const return out.str(); } + +Age MetaDataModel::getAge() const +{ + return {m_dateOfBirth, m_dateOfTest}; +} diff --git a/source/MetaData/MetaDataModel.h b/source/MetaData/MetaDataModel.h index 0c8bbeb..72811e6 100644 --- a/source/MetaData/MetaDataModel.h +++ b/source/MetaData/MetaDataModel.h @@ -24,19 +24,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; std::string toHtml() const; - Age getAge() const - { - return { m_dateOfBirth, m_dateOfTest }; - } + Age getAge() const; }; diff --git a/source/ResultWidget/PRMap.cpp b/source/ResultWidget/PRMap.cpp index 41e76dc..8c1cc7b 100644 --- a/source/ResultWidget/PRMap.cpp +++ b/source/ResultWidget/PRMap.cpp @@ -20,7 +20,7 @@ unsigned int PRMap::lookup(const Age &age, const unsigned int &points) if (m_ages.back() < age) { - return m_ages.size() - 1; + return m_ages.size() - 2; } for (size_t index = 1; index < m_ages.size(); ++index)