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

Merge branch 'master' into develop

feature/qt-as-conan-package
mandlm 2019-01-27 20:10:59 +01:00
parent 6cd13ad94b 51937bb499
commit 8444eda4ee
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/MetaData/MetaDataModel.cpp
View File

@ -166,3 +166,8 @@ std::string MetaDataModel::toHtml() const
return out.str();
}
Age MetaDataModel::getAge() const
{
return {m_dateOfBirth, m_dateOfTest};
}

11
source/MetaData/MetaDataModel.h
View File

@ -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;
};

2
source/ResultWidget/PRMap.cpp
View File

@ -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)