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

Merge branch 'release/sorted-results'

feature/qt-as-conan-package
mandlm 2019-02-08 21:48:23 +01:00
parent 7d40320c89 edc7aca725
commit cd001913c2
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,3 +3,6 @@ _*/
build-* build-*
*.user *.user
tags tags
*.esgraf48
*.swp
*.pdf

2
source/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.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}) if ($ENV{BUILD_NUMBER})
set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER}) set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})

49
source/ResultWidget/ResultModel.cpp
View File

@ -18,6 +18,7 @@ ResultModel::ResultModel(QObject *parent)
: QAbstractTableModel(parent) : QAbstractTableModel(parent)
{ {
m_results = {{"V2", "SVK", "VE", "Passiv", "Genus", "Akkusativ", "Dativ", "Genitiv", "Plural"}}; 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 int ResultModel::rowCount(const QModelIndex &parent) const
@ -123,21 +124,21 @@ void ResultModel::setAge(const Age &age)
void ResultModel::setPluralResult(unsigned int points) 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[6].setPoints(points);
m_results[8].setPR(PluralPR().lookup(m_age, points)); m_results[6].setPR(PluralPR().lookup(m_age, points));
emit dataChanged(index(0, 8), index(4, 8)); emit dataChanged(index(0, 6), index(4, 6));
} }
} }
void ResultModel::setGenusResult(unsigned int points) 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[3].setPoints(points);
m_results[4].setPR(GenusPR().lookup(m_age, points)); m_results[3].setPR(GenusPR().lookup(m_age, points));
emit dataChanged(index(0, 4), index(4, 4)); emit dataChanged(index(0, 3), index(4, 3));
} }
} }
@ -153,21 +154,21 @@ void ResultModel::setVerbEndResult(unsigned int points)
void ResultModel::setAkkusativResult(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[4].setPoints(points);
m_results[5].setPR(AkkusativPR().lookup(m_age, points)); m_results[4].setPR(AkkusativPR().lookup(m_age, points));
emit dataChanged(index(0, 5), index(4, 5)); emit dataChanged(index(0, 4), index(4, 4));
} }
} }
void ResultModel::setDativResult(unsigned int points) 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[5].setPoints(points);
m_results[6].setPR(DativPR().lookup(m_age, points)); m_results[5].setPR(DativPR().lookup(m_age, points));
emit dataChanged(index(0, 6), index(4, 6)); emit dataChanged(index(0, 5), index(4, 5));
} }
} }
@ -193,21 +194,21 @@ void ResultModel::setSvkResult(unsigned int points)
void ResultModel::setPassivResult(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[7].setPoints(points);
m_results[3].setPR(PassivPR().lookup(m_age, points)); m_results[7].setPR(PassivPR().lookup(m_age, points));
emit dataChanged(index(0, 3), index(4, 3)); emit dataChanged(index(0, 7), index(4, 7));
} }
} }
void ResultModel::setGenitivResult(unsigned int points) 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[8].setPoints(points);
m_results[7].setPR(GenitivPR().lookup(m_age, points)); m_results[8].setPR(GenitivPR().lookup(m_age, points));
emit dataChanged(index(0, 7), index(4, 7)); emit dataChanged(index(0, 8), index(4, 8));
} }
} }