From bc7be14c656b85ecc5dfb3250c74b1d37503f63f Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Fri, 8 Jun 2018 20:32:19 +0200 Subject: [PATCH] added RP and T-Wert rows to result display --- source/MetaData/MetaDataWidget.ui | 2 +- source/ResultWidget/ResultModel.cpp | 30 +++++++++++++++++++---------- source/mainwindow.ui | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/source/MetaData/MetaDataWidget.ui b/source/MetaData/MetaDataWidget.ui index ae2c11b..aa53971 100644 --- a/source/MetaData/MetaDataWidget.ui +++ b/source/MetaData/MetaDataWidget.ui @@ -7,7 +7,7 @@ 0 0 637 - 269 + 190 diff --git a/source/ResultWidget/ResultModel.cpp b/source/ResultWidget/ResultModel.cpp index cd0dadd..c6aa500 100644 --- a/source/ResultWidget/ResultModel.cpp +++ b/source/ResultWidget/ResultModel.cpp @@ -11,7 +11,7 @@ ResultModel::ResultModel(QObject *parent) int ResultModel::rowCount(const QModelIndex &parent) const { - return 3; + return 5; } int ResultModel::columnCount(const QModelIndex &parent) const @@ -23,13 +23,19 @@ QVariant ResultModel::data(const QModelIndex &index, int role) const { if (role == Qt::DisplayRole) { - if (index.column() < m_results.size()) + switch (index.row()) { - size_t points = m_results[index.column()].points(); - if (points != 0) - { - return static_cast(points); - } + case 0: + if (index.column() < m_results.size()) + { + size_t points = m_results[index.column()].points(); + if (points != 0) + { + return static_cast(points); + } + } + default: + break; } return "-"; @@ -57,11 +63,15 @@ QVariant ResultModel::headerData( switch (section) { case 0: - return ">= PR 84"; + return "RP"; case 1: - return "< PR 84"; + return ">= PR 84"; case 2: + return "< PR 84"; + case 3: return "<= PR 16"; + case 4: + return "T-Wert"; default: return {}; } @@ -80,6 +90,6 @@ void ResultModel::setPluralResult(size_t points) if (m_results[8].points() != points) { m_results[8] = points; - emit dataChanged(index(0, 8), index(2, 8)); + emit dataChanged(index(0, 8), index(4, 8)); } } diff --git a/source/mainwindow.ui b/source/mainwindow.ui index 31baf67..e04d77d 100644 --- a/source/mainwindow.ui +++ b/source/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1125 - 572 + 673