From 57fe4256e2905fc4bbd6fdb6717acbb5a3995314 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 5 Feb 2019 22:06:43 +0100
Subject: [PATCH] Print akkusativ and dativ model

---
 source/DataModel.cpp                              | 2 ++
 source/SubTests/AkkusativDativ/AkkusativModel.cpp | 7 ++++++-
 source/SubTests/AkkusativDativ/AkkusativModel.h   | 7 +++++--
 source/SubTests/AkkusativDativ/CMakeLists.txt     | 4 +---
 source/SubTests/AkkusativDativ/DativModel.cpp     | 2 +-
 source/SubTests/AkkusativDativ/DativModel.h       | 7 +++++--
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/source/DataModel.cpp b/source/DataModel.cpp
index 0d33a13..b674978 100644
--- a/source/DataModel.cpp
+++ b/source/DataModel.cpp
@@ -128,6 +128,8 @@ void DataModel::printTo(QPrinter &printer) const
 	printer.newPage();
 	painter.resetTransform();
 
+	m_akkusativ.printTo(painter);
+	m_dativ.printTo(painter);
 	m_plural.printTo(painter);
 
 	painter.end();
diff --git a/source/SubTests/AkkusativDativ/AkkusativModel.cpp b/source/SubTests/AkkusativDativ/AkkusativModel.cpp
index 79d2c31..368d297 100644
--- a/source/SubTests/AkkusativDativ/AkkusativModel.cpp
+++ b/source/SubTests/AkkusativDativ/AkkusativModel.cpp
@@ -1,7 +1,7 @@
 #include "AkkusativModel.h"
 
 AkkusativModel::AkkusativModel(QObject *parent)
-    : CheckableTestModel(parent)
+    : PrintableModel(parent)
 {
 	m_tests = {{"Akkusativ Nominalphrase",
 	            {"Tiger", "Katze", "Affe", "Gans", "Bär", "Pferd", "Hund", "Elefant"}},
@@ -105,3 +105,8 @@ void AkkusativModel::write(ESGRAF48::AkkusativModel &model) const
 		futterModel->set_zucker(testItems[7].isChecked());
 	}
 }
+	
+void AkkusativModel::printHeader(QPainter &painter) const
+{
+	drawHeader2(painter, "Subtest 4: Akkusativ und Dativ");
+}
diff --git a/source/SubTests/AkkusativDativ/AkkusativModel.h b/source/SubTests/AkkusativDativ/AkkusativModel.h
index 43a4881..e790ad9 100644
--- a/source/SubTests/AkkusativDativ/AkkusativModel.h
+++ b/source/SubTests/AkkusativDativ/AkkusativModel.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "CheckableTestModel.h"
+#include "PrintableModel.h"
 #include "AkkusativModel.pb.h"
 
-class AkkusativModel : public CheckableTestModel
+class AkkusativModel : public PrintableModel
 {
 	Q_OBJECT
 
@@ -12,4 +12,7 @@ public:
 
 	void read(const ESGRAF48::AkkusativModel &model);
 	void write(ESGRAF48::AkkusativModel &model) const;
+
+protected:
+	void printHeader(QPainter &painter) const override;
 };
diff --git a/source/SubTests/AkkusativDativ/CMakeLists.txt b/source/SubTests/AkkusativDativ/CMakeLists.txt
index a543ee7..da3a956 100644
--- a/source/SubTests/AkkusativDativ/CMakeLists.txt
+++ b/source/SubTests/AkkusativDativ/CMakeLists.txt
@@ -43,9 +43,7 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE
-		CheckableItem
-		CheckableTest
-		CheckableTestModel
+		PrintableModel
 		Qt5::Widgets
 		${Protobuf_LIBRARIES}
 )
diff --git a/source/SubTests/AkkusativDativ/DativModel.cpp b/source/SubTests/AkkusativDativ/DativModel.cpp
index 3741833..9a7cfa5 100644
--- a/source/SubTests/AkkusativDativ/DativModel.cpp
+++ b/source/SubTests/AkkusativDativ/DativModel.cpp
@@ -1,7 +1,7 @@
 #include "DativModel.h"
 
 DativModel::DativModel(QObject *parent)
-    : CheckableTestModel(parent)
+    : PrintableModel(parent)
 {
 	m_tests = {{"Dativ Nominalphrase",
 	            {"Affe", "Gans", "Tiger", "Hund", "Elefant", "Pferd", "Bär", "Katze"}},
diff --git a/source/SubTests/AkkusativDativ/DativModel.h b/source/SubTests/AkkusativDativ/DativModel.h
index 6a9a323..c6c83f0 100644
--- a/source/SubTests/AkkusativDativ/DativModel.h
+++ b/source/SubTests/AkkusativDativ/DativModel.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "CheckableTestModel.h"
+#include "PrintableModel.h"
 #include "DativModel.pb.h"
 
-class DativModel : public CheckableTestModel
+class DativModel : public PrintableModel
 {
 	Q_OBJECT
 
@@ -12,4 +12,7 @@ public:
 
 	void read(const ESGRAF48::DativModel &model);
 	void write(ESGRAF48::DativModel &model) const;
+
+protected:
+	void printHeader(QPainter &) const override {};
 };