From a95943ec6662af47857b01e065c00514e933c66d Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Thu, 7 Feb 2019 22:42:07 +0100 Subject: [PATCH 1/3] added save, export and swap files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e42f4b6..b1a9f41 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ _*/ build-* *.user tags +*.esgraf48 +*.swp +*.pdf From f5d8b3f3d51ab5c21b15390c12ef9c6af99dba3f Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Fri, 8 Feb 2019 21:46:11 +0100 Subject: [PATCH 2/3] Sorted results by test order --- source/ResultWidget/ResultModel.cpp | 49 +++++++++++++++-------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/source/ResultWidget/ResultModel.cpp b/source/ResultWidget/ResultModel.cpp index 907662b..b4eebb9 100644 --- a/source/ResultWidget/ResultModel.cpp +++ b/source/ResultWidget/ResultModel.cpp @@ -18,6 +18,7 @@ ResultModel::ResultModel(QObject *parent) : QAbstractTableModel(parent) { m_results = {{"V2", "SVK", "VE", "Passiv", "Genus", "Akkusativ", "Dativ", "Genitiv", "Plural"}}; + m_results = {{"V2", "SVK", "VE", "Genus", "Akkusativ", "Dativ", "Plural", "Passiv", "Genitiv"}}; } int ResultModel::rowCount(const QModelIndex &parent) const @@ -123,21 +124,21 @@ void ResultModel::setAge(const Age &age) void ResultModel::setPluralResult(unsigned int points) { - if (m_results[8].points() != points) + if (m_results[6].points() != points) { - m_results[8].setPoints(points); - m_results[8].setPR(PluralPR().lookup(m_age, points)); - emit dataChanged(index(0, 8), index(4, 8)); + m_results[6].setPoints(points); + m_results[6].setPR(PluralPR().lookup(m_age, points)); + emit dataChanged(index(0, 6), index(4, 6)); } } void ResultModel::setGenusResult(unsigned int points) { - if (m_results[4].points() != points) + if (m_results[3].points() != points) { - m_results[4].setPoints(points); - m_results[4].setPR(GenusPR().lookup(m_age, points)); - emit dataChanged(index(0, 4), index(4, 4)); + m_results[3].setPoints(points); + m_results[3].setPR(GenusPR().lookup(m_age, points)); + emit dataChanged(index(0, 3), index(4, 3)); } } @@ -153,21 +154,21 @@ void ResultModel::setVerbEndResult(unsigned int points) void ResultModel::setAkkusativResult(unsigned int points) { - if (m_results[5].points() != points) + if (m_results[4].points() != points) { - m_results[5].setPoints(points); - m_results[5].setPR(AkkusativPR().lookup(m_age, points)); - emit dataChanged(index(0, 5), index(4, 5)); + m_results[4].setPoints(points); + m_results[4].setPR(AkkusativPR().lookup(m_age, points)); + emit dataChanged(index(0, 4), index(4, 4)); } } void ResultModel::setDativResult(unsigned int points) { - if (m_results[6].points() != points) + if (m_results[5].points() != points) { - m_results[6].setPoints(points); - m_results[6].setPR(DativPR().lookup(m_age, points)); - emit dataChanged(index(0, 6), index(4, 6)); + m_results[5].setPoints(points); + m_results[5].setPR(DativPR().lookup(m_age, points)); + emit dataChanged(index(0, 5), index(4, 5)); } } @@ -193,21 +194,21 @@ void ResultModel::setSvkResult(unsigned int points) void ResultModel::setPassivResult(unsigned int points) { - if (m_results[3].points() != points) + if (m_results[7].points() != points) { - m_results[3].setPoints(points); - m_results[3].setPR(PassivPR().lookup(m_age, points)); - emit dataChanged(index(0, 3), index(4, 3)); + m_results[7].setPoints(points); + m_results[7].setPR(PassivPR().lookup(m_age, points)); + emit dataChanged(index(0, 7), index(4, 7)); } } void ResultModel::setGenitivResult(unsigned int points) { - if (m_results[7].points() != points) + if (m_results[8].points() != points) { - m_results[7].setPoints(points); - m_results[7].setPR(GenitivPR().lookup(m_age, points)); - emit dataChanged(index(0, 7), index(4, 7)); + m_results[8].setPoints(points); + m_results[8].setPR(GenitivPR().lookup(m_age, points)); + emit dataChanged(index(0, 8), index(4, 8)); } } From edc7aca7252632b7212bdd34bd40233d597cdc55 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Fri, 8 Feb 2019 21:48:11 +0100 Subject: [PATCH 3/3] Bumped version number --- source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index bd5bc26..a5c5666 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.6) -set(BUILD_VERSION_MAJOR_MINOR 0.4) +set(BUILD_VERSION_MAJOR_MINOR 0.5) if ($ENV{BUILD_NUMBER}) set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})