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

Print subtests 2, 3 and 4

Browse source
This commit is contained in:
Michael Mandl 2018-12-08 21:02:35 +01:00
parent e2237110cf
commit 49b52f1dbc
21 changed files with 223 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/SubTests/AkkusativDativ/AkkusativModel.cpp
View file

@ -105,3 +105,8 @@ void AkkusativModel::write(ESGRAF48::AkkusativModel &model) const
futterModel->set_zucker(testItems[7].isChecked());
}
}
std::string AkkusativModel::getName() const
{
return "Subtest 4: Akkusativ und Dativ";
}

3
source/SubTests/AkkusativDativ/AkkusativModel.h
View file

@ -12,4 +12,7 @@ public:
void read(const ESGRAF48::AkkusativModel &model);
void write(ESGRAF48::AkkusativModel &model) const;
protected:
std::string getName() const override;
};

5
source/SubTests/AkkusativDativ/DativModel.cpp
View file

@ -105,3 +105,8 @@ void DativModel::write(ESGRAF48::DativModel &model) const
futterModel->set_zucker(testItems[7].isChecked());
}
}
std::string DativModel::getName() const
{
return "";
}

3
source/SubTests/AkkusativDativ/DativModel.h
View file

@ -12,4 +12,7 @@ public:
void read(const ESGRAF48::DativModel &model);
void write(ESGRAF48::DativModel &model) const;
protected:
std::string getName() const override;
};

5
source/SubTests/Genus/GenusModel.cpp
View file

@ -95,3 +95,8 @@ void GenusModel::write(ESGRAF48::GenusModel &model) const
zirkusModel->set_baum(testItems[3].isChecked());
}
}
std::string GenusModel::getName() const
{
return "Subtest 3: Genus";
}

3
source/SubTests/Genus/GenusModel.h
View file

@ -12,4 +12,7 @@ public:
void read(const ESGRAF48::GenusModel &model);
void write(ESGRAF48::GenusModel &model) const;
protected:
std::string getName() const override;
};

5
source/SubTests/LateSkills/GenitivModel.cpp
View file

@ -107,3 +107,8 @@ void GenitivModel::write(ESGRAF48::LateSkillsGenitivModel &model) const
attributierungModel->set_guertel2(testItems[9].isChecked());
}
}
std::string GenitivModel::getName() const
{
return "";
}

3
source/SubTests/LateSkills/GenitivModel.h
View file

@ -14,4 +14,7 @@ public:
void read(const ESGRAF48::LateSkillsGenitivModel &model);
void write(ESGRAF48::LateSkillsGenitivModel &model) const;
protected:
std::string getName() const override;
};

5
source/SubTests/LateSkills/PassivModel.cpp
View file

@ -65,3 +65,8 @@ void PassivModel::write(ESGRAF48::LateSkillsPassivModel &model) const
model.set_fleisch1(testItems[8].isChecked());
model.set_fleisch2(testItems[9].isChecked());
}
std::string PassivModel::getName() const
{
return "Subtest 6: Späte Fähigkeiten (7;0 - 8;11)";
}

3
source/SubTests/LateSkills/PassivModel.h
View file

@ -14,4 +14,7 @@ public:
void read(const ESGRAF48::LateSkillsPassivModel &model);
void write(ESGRAF48::LateSkillsPassivModel &model) const;
protected:
std::string getName() const override;
};

5
source/SubTests/Plural/PluralModel.cpp
View file

@ -51,3 +51,8 @@ void PluralModel::write(ESGRAF48::PluralModel &model) const
model.set_baer(testItems[7].isChecked());
model.set_apfel(testItems[8].isChecked());
}
std::string PluralModel::getName() const
{
return "Subtest 5: Plural";
}

3
source/SubTests/Plural/PluralModel.h
View file

@ -15,4 +15,7 @@ public:
void read(const ESGRAF48::PluralModel &model);
void write(ESGRAF48::PluralModel &model) const;
protected:
std::string getName() const override;
};

19
source/SubTests/V2Svk/V2SvkModel.cpp
View file

@ -200,22 +200,7 @@ void V2SvkModel::read(const ESGRAF48::V2SvkModel &model)
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
}
void V2SvkModel::printTo(QTextCursor &cursor) const
std::string V2SvkModel::getName() const
{
cursor.insertBlock();
QTextCharFormat headerFormat;
headerFormat.setFontPointSize(12);
cursor.insertText(
"Subtest 1: Verbzweitstellungsregel (V2) und Subjekt-Verb-Kontrollregel (SVK)",
headerFormat);
QTextTableFormat tableFormat;
tableFormat.setCellPadding(2);
tableFormat.setCellSpacing(0);
QTextTable *table = cursor.insertTable(1, 1, tableFormat);
cursor.movePosition(QTextCursor::NextBlock);
return "Subtest 1: Verbzweitstellungsregel (V2) und Subjekt-Verb-Kontrollregel (SVK)";
}

4
source/SubTests/V2Svk/V2SvkModel.h
View file

@ -18,8 +18,8 @@ public:
void write(ESGRAF48::V2SvkModel &model) const;
void read(const ESGRAF48::V2SvkModel &model);
void printTo(QTextCursor &cursor) const;
protected:
bool isValidIndex(const QModelIndex &index) const override;
std::string getName() const override;
};

153
source/SubTests/VerbEnd/VerbEndModel.cpp
View file

@ -98,154 +98,7 @@ void VerbEndModel::read(const ESGRAF48::VerbEndModel &model)
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
}
void VerbEndModel::printTo(QTextCursor &cursor) const
std::string VerbEndModel::getName() const
{
cursor.insertBlock();
QTextCharFormat headerFormat;
headerFormat.setFontPointSize(12);
cursor.insertText("Subtest 2: Verbendstellungsregel (VE)", headerFormat);
QTextTableFormat tableFormat;
tableFormat.setCellPadding(2);
tableFormat.setCellSpacing(0);
tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::PercentageLength, 15),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 9),
QTextLength(QTextLength::PercentageLength, 2),
QTextLength(QTextLength::PercentageLength, 5),
QTextLength(QTextLength::PercentageLength, 1),
QTextLength(QTextLength::PercentageLength, 5)});
QTextTable *table = cursor.insertTable(6, 13, tableFormat);
table->mergeCells(0, 0, 2, 1);
table->mergeCells(2, 0, 2, 1);
table->mergeCells(4, 0, 2, 1);
const char *emptyBox = "\u2610";
//const char *checkBox = "\u2611";
const char *checkBox = "x";
cursor.insertText("Telefonat");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Kausal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Kausal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Relativ");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Kausal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Final");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Temporal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Temporal");
cursor.movePosition(QTextCursor::NextRow);
const auto &telTestItems = m_tests.at(0).items();
cursor.insertText(telTestItems[0].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(telTestItems[1].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(telTestItems[2].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(telTestItems[3].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(telTestItems[4].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(telTestItems[5].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(telTestItems[6].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(QString::number(m_tests.at(0).getPoints()));
cursor.movePosition(QTextCursor::NextRow);
cursor.insertText("Zaubertrick");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Relativ");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Final");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Kausal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Final");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Temporal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Kausal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Temporal");
cursor.movePosition(QTextCursor::NextRow);
const auto &trickTestItems = m_tests.at(1).items();
cursor.insertText(trickTestItems[0].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(trickTestItems[1].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(trickTestItems[2].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(trickTestItems[3].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(trickTestItems[4].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(trickTestItems[5].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(trickTestItems[6].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(QString::number(m_tests.at(1).getPoints()));
cursor.movePosition(QTextCursor::NextRow);
cursor.insertText("Zauberregel");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Temporal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Kausal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Final");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Relativ");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Temporal");
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText("Relativ");
cursor.movePosition(QTextCursor::NextRow);
const auto &regelTestItems = m_tests.at(2).items();
cursor.insertText(regelTestItems[0].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(regelTestItems[1].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(regelTestItems[2].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(regelTestItems[3].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(regelTestItems[4].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(regelTestItems[5].isChecked() ? checkBox : emptyBox);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.movePosition(QTextCursor::NextCell);
cursor.insertText(QString::number(m_tests.at(2).getPoints()));
cursor.movePosition(QTextCursor::NextBlock);
}
return "Subtest 2: Verbendstellungsregel (VE)";
};

3
source/SubTests/VerbEnd/VerbEndModel.h
View file

@ -15,5 +15,6 @@ public:
void write(ESGRAF48::VerbEndModel &model) const;
void read(const ESGRAF48::VerbEndModel &model);
void printTo(QTextCursor &cursor) const;
protected:
std::string getName() const override;
};