From 10ab037358b87b3c21ede2917ad2b7696706048d Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Wed, 5 Jan 2022 20:41:36 +0100
Subject: [PATCH 01/87] [refactor] Struktur

---
 .../github/weichware10/analyse/ClientGui.java | 25 --------
 .../DiagramConfig.java}                       |  6 +-
 .../HeatmapConfig.java}                       |  6 +-
 .../analyse/{ => enums}/AnalyseType.java      |  2 +-
 .../analyse/{ => enums}/DiagrammType.java     |  2 +-
 .../analyse/{ => logic}/Analyse.java          |  2 +-
 .../analyse/{ => logic}/Client.java           | 14 +++--
 .../{Diagramm.java => logic/Diagram.java}     | 11 ++--
 .../analyse/{ => logic}/Heatmap.java          |  8 ++-
 .../analyse/{ => logic}/Verlauf.java          |  2 +-
 .../weichware10/analyse/ClientTest.java       |  2 +
 .../analyse/ConfigDiagrammTest.java           | 46 +++++++-------
 .../analyse/ConfigHeatmapTest.java            | 62 ++++++++++---------
 .../weichware10/analyse/DiagrammTest.java     | 26 ++++----
 .../weichware10/analyse/HeatmapTest.java      | 20 +++---
 .../weichware10/analyse/VerlaufTest.java      |  1 +
 16 files changed, 115 insertions(+), 120 deletions(-)
 delete mode 100644 src/main/java/github/weichware10/analyse/ClientGui.java
 rename src/main/java/github/weichware10/analyse/{ConfigDiagramm.java => config/DiagramConfig.java} (96%)
 rename src/main/java/github/weichware10/analyse/{ConfigHeatmap.java => config/HeatmapConfig.java} (97%)
 rename src/main/java/github/weichware10/analyse/{ => enums}/AnalyseType.java (78%)
 rename src/main/java/github/weichware10/analyse/{ => enums}/DiagrammType.java (73%)
 rename src/main/java/github/weichware10/analyse/{ => logic}/Analyse.java (94%)
 rename src/main/java/github/weichware10/analyse/{ => logic}/Client.java (91%)
 rename src/main/java/github/weichware10/analyse/{Diagramm.java => logic/Diagram.java} (85%)
 rename src/main/java/github/weichware10/analyse/{ => logic}/Heatmap.java (86%)
 rename src/main/java/github/weichware10/analyse/{ => logic}/Verlauf.java (96%)

diff --git a/src/main/java/github/weichware10/analyse/ClientGui.java b/src/main/java/github/weichware10/analyse/ClientGui.java
deleted file mode 100644
index bdcfed2..0000000
--- a/src/main/java/github/weichware10/analyse/ClientGui.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package github.weichware10.analyse;
-
-/**
- * verantwortliche für die graphische Benutzeroberfläche des Clients mit Ein-
- * und Ausgabe.
- */
-public class ClientGui {
-    private Client client;
-
-    /**
-     * verantwortliche für die graphische Benutzeroberfläche des Clients mit Ein-
-     * und Ausgabe.
-     */
-    public ClientGui() {
-        this.client = new Client();
-    }
-
-    /**
-     * zeigt die graphische Benutzeroberfläche an.
-     */
-    public void showGui() {
-        ;
-    }
-
-}
diff --git a/src/main/java/github/weichware10/analyse/ConfigDiagramm.java b/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
similarity index 96%
rename from src/main/java/github/weichware10/analyse/ConfigDiagramm.java
rename to src/main/java/github/weichware10/analyse/config/DiagramConfig.java
index 74332db..edd3b0b 100644
--- a/src/main/java/github/weichware10/analyse/ConfigDiagramm.java
+++ b/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
@@ -1,9 +1,9 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.config;
 
 /**
  * Speicherung der Konfiguration der Diagramm-Analysemethoden.
  */
-public class ConfigDiagramm {
+public class DiagramConfig {
     private int amountAreas; // * 2,4,6,8
     private float minTime; // * >= 0 Länge | Zoomstufe
     private float maxTime; // * <= 10 Länge | Zoomstufe
@@ -12,7 +12,7 @@ public class ConfigDiagramm {
     /**
      * Speicherung der Konfiguration der Diagramm-Analysemethoden.
      */
-    public ConfigDiagramm() {
+    public DiagramConfig() {
         this.amountAreas = 4;
         this.minTime = 0.5f;
         this.maxTime = 2.5f;
diff --git a/src/main/java/github/weichware10/analyse/ConfigHeatmap.java b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
similarity index 97%
rename from src/main/java/github/weichware10/analyse/ConfigHeatmap.java
rename to src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
index 32a7f88..a810078 100644
--- a/src/main/java/github/weichware10/analyse/ConfigHeatmap.java
+++ b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
@@ -1,9 +1,9 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.config;
 
 /**
  * Speicherung der Konfiguration der Heatmap-Analysemethoden.
  */
-public class ConfigHeatmap {
+public class HeatmapConfig {
     private float[] minColor;
     private float[] maxColor;
     private boolean grid;
@@ -14,7 +14,7 @@ public class ConfigHeatmap {
     /**
      * Speicherung der Konfiguration der Heatmap-Analysemethoden.
      */
-    public ConfigHeatmap() {
+    public HeatmapConfig() {
         this.minColor = new float[] { 0, 0, 1 };
         this.maxColor = new float[] { 1, 0, 0 };
         this.grid = true;
diff --git a/src/main/java/github/weichware10/analyse/AnalyseType.java b/src/main/java/github/weichware10/analyse/enums/AnalyseType.java
similarity index 78%
rename from src/main/java/github/weichware10/analyse/AnalyseType.java
rename to src/main/java/github/weichware10/analyse/enums/AnalyseType.java
index b5238f6..8887fa0 100644
--- a/src/main/java/github/weichware10/analyse/AnalyseType.java
+++ b/src/main/java/github/weichware10/analyse/enums/AnalyseType.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.enums;
 
 /**
  * Enum der möglichen Analyse-Typen.
diff --git a/src/main/java/github/weichware10/analyse/DiagrammType.java b/src/main/java/github/weichware10/analyse/enums/DiagrammType.java
similarity index 73%
rename from src/main/java/github/weichware10/analyse/DiagrammType.java
rename to src/main/java/github/weichware10/analyse/enums/DiagrammType.java
index 7b87266..1969cd0 100644
--- a/src/main/java/github/weichware10/analyse/DiagrammType.java
+++ b/src/main/java/github/weichware10/analyse/enums/DiagrammType.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.enums;
 
 /**
  * Enum der möglichen Diagramm-Typen.
diff --git a/src/main/java/github/weichware10/analyse/Analyse.java b/src/main/java/github/weichware10/analyse/logic/Analyse.java
similarity index 94%
rename from src/main/java/github/weichware10/analyse/Analyse.java
rename to src/main/java/github/weichware10/analyse/logic/Analyse.java
index eedc010..450e7fd 100644
--- a/src/main/java/github/weichware10/analyse/Analyse.java
+++ b/src/main/java/github/weichware10/analyse/logic/Analyse.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
 import github.weichware10.util.data.TrialData;
 import java.util.List;
diff --git a/src/main/java/github/weichware10/analyse/Client.java b/src/main/java/github/weichware10/analyse/logic/Client.java
similarity index 91%
rename from src/main/java/github/weichware10/analyse/Client.java
rename to src/main/java/github/weichware10/analyse/logic/Client.java
index d80307a..6321d3b 100644
--- a/src/main/java/github/weichware10/analyse/Client.java
+++ b/src/main/java/github/weichware10/analyse/logic/Client.java
@@ -1,5 +1,8 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
+import github.weichware10.analyse.config.DiagramConfig;
+import github.weichware10.analyse.config.HeatmapConfig;
+import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import java.util.ArrayList;
@@ -10,13 +13,14 @@
 /**
  * Grundlegende Klasse für den Analyse-Client.
  */
+@SuppressWarnings("unused")
 public class Client {
     private TrialData data;
     private TrialData dataForComp;
     private List<AnalyseType> analyseTypes;
     private List<String> analyzedData;
-    private ConfigHeatmap confHm;
-    private ConfigDiagramm confDia;
+    private HeatmapConfig confHm;
+    private DiagramConfig confDia;
 
     public Client() {
         analyseTypes = new ArrayList<AnalyseType>();
@@ -106,7 +110,7 @@ public boolean getDataForComp(DateTime start, DateTime end, ToolType dataType) {
      *
      * @param confHm - Konfiguration der Heatmap-Analyse
      */
-    public void setConfigAnalyseHm(ConfigHeatmap confHm) {
+    public void setConfigAnalyseHm(HeatmapConfig confHm) {
         this.confHm = confHm;
     }
 
@@ -115,7 +119,7 @@ public void setConfigAnalyseHm(ConfigHeatmap confHm) {
      *
      * @param confDia - Konfiguration der Diagramm-Analyse
      */
-    public void setConfigAnalyseDia(ConfigDiagramm confDia) {
+    public void setConfigAnalyseDia(DiagramConfig confDia) {
         this.confDia = confDia;
     }
 
diff --git a/src/main/java/github/weichware10/analyse/Diagramm.java b/src/main/java/github/weichware10/analyse/logic/Diagram.java
similarity index 85%
rename from src/main/java/github/weichware10/analyse/Diagramm.java
rename to src/main/java/github/weichware10/analyse/logic/Diagram.java
index 3351e76..734a348 100644
--- a/src/main/java/github/weichware10/analyse/Diagramm.java
+++ b/src/main/java/github/weichware10/analyse/logic/Diagram.java
@@ -1,14 +1,17 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
+import github.weichware10.analyse.config.DiagramConfig;
+import github.weichware10.analyse.enums.DiagrammType;
 import github.weichware10.util.data.TrialData;
 import java.util.List;
 
 /**
  * verantwortlich für die Erstellung der Diagramm-Diagramme.
  */
-public class Diagramm extends Analyse {
+@SuppressWarnings("unused")
+public class Diagram extends Analyse {
     private final TrialData data;
-    private final ConfigDiagramm confDia;
+    private final DiagramConfig confDia;
 
     /**
      * verantwortlich für die Erstellung der Diagramm-Diagramme.
@@ -16,7 +19,7 @@ public class Diagramm extends Analyse {
      * @param data    - Daten die zur Erstellung der Diagramme benötigt werden
      * @param confDia - Konfigurationen für die Diagrammarten
      */
-    public Diagramm(TrialData data, ConfigDiagramm confDia) {
+    public Diagram(TrialData data, DiagramConfig confDia) {
         this.data = data;
         this.confDia = confDia;
     }
diff --git a/src/main/java/github/weichware10/analyse/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
similarity index 86%
rename from src/main/java/github/weichware10/analyse/Heatmap.java
rename to src/main/java/github/weichware10/analyse/logic/Heatmap.java
index 2084dbd..3ae1af1 100644
--- a/src/main/java/github/weichware10/analyse/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -1,14 +1,16 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
+import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.util.data.TrialData;
 import java.util.List;
 
 /**
  * verantwortlich für die Erstellung der Heatmap.
  */
+@SuppressWarnings("unused")
 public class Heatmap extends Analyse {
     private final TrialData data;
-    private final ConfigHeatmap confHm;
+    private final HeatmapConfig confHm;
     private List<List<Float>> heatmap;
 
     /**
@@ -17,7 +19,7 @@ public class Heatmap extends Analyse {
      * @param data   - Daten die zur Erstellung der Heatmaps benötigt werden
      * @param confHm - Konfiguration der Heatmap
      */
-    public Heatmap(TrialData data, ConfigHeatmap confHm) {
+    public Heatmap(TrialData data, HeatmapConfig confHm) {
         this.data = data;
         this.confHm = confHm;
     }
diff --git a/src/main/java/github/weichware10/analyse/Verlauf.java b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
similarity index 96%
rename from src/main/java/github/weichware10/analyse/Verlauf.java
rename to src/main/java/github/weichware10/analyse/logic/Verlauf.java
index 5675ffb..1281d64 100644
--- a/src/main/java/github/weichware10/analyse/Verlauf.java
+++ b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
 import github.weichware10.util.data.TrialData;
 import java.util.List;
diff --git a/src/test/java/github/weichware10/analyse/ClientTest.java b/src/test/java/github/weichware10/analyse/ClientTest.java
index ed23eb5..db48491 100644
--- a/src/test/java/github/weichware10/analyse/ClientTest.java
+++ b/src/test/java/github/weichware10/analyse/ClientTest.java
@@ -3,6 +3,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import github.weichware10.analyse.enums.AnalyseType;
+import github.weichware10.analyse.logic.Client;
 import github.weichware10.util.Enums.ToolType;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java b/src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java
index 009cd31..eeba9e2 100644
--- a/src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java
+++ b/src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java
@@ -6,6 +6,8 @@
 
 import org.junit.Test;
 
+import github.weichware10.analyse.config.DiagramConfig;
+
 /**
  * Unit Test für Klasse ConfigDiagramm.
  */
@@ -15,20 +17,20 @@ public class ConfigDiagrammTest {
      */
     @Test
     public void amountAreasShouldBeSet() {
-        ConfigDiagramm confDia1 = new ConfigDiagramm();
+        DiagramConfig confDia1 = new DiagramConfig();
         assertEquals("getAmountAreas sollte 4 sein", 4, confDia1.getAmountAreas());
 
-        ConfigDiagramm confDia2 = new ConfigDiagramm();
+        DiagramConfig confDia2 = new DiagramConfig();
         assertTrue("setAmountAreas sollte True zurückgeben", confDia2.setAmountAreas(6));
 
-        ConfigDiagramm confDia3 = new ConfigDiagramm();
+        DiagramConfig confDia3 = new DiagramConfig();
         confDia3.setAmountAreas(2);
         assertEquals("getAmountAreas sollte 2 sein", 2, confDia3.getAmountAreas());
 
-        ConfigDiagramm confDia4 = new ConfigDiagramm();
+        DiagramConfig confDia4 = new DiagramConfig();
         assertFalse("setAmountAreas sollte False zurückgeben", confDia4.setAmountAreas(10));
 
-        ConfigDiagramm confDia5 = new ConfigDiagramm();
+        DiagramConfig confDia5 = new DiagramConfig();
         assertFalse("setAmountAreas sollte False zurückgeben", confDia5.setAmountAreas(-2));
     }
 
@@ -37,20 +39,20 @@ public void amountAreasShouldBeSet() {
      */
     @Test
     public void minTimeShouldBeSet() {
-        ConfigDiagramm confDia1 = new ConfigDiagramm();
+        DiagramConfig confDia1 = new DiagramConfig();
         assertEquals("getMinTime sollte 0.5 zurückgeben", 0.5f, confDia1.getMinTime(), 0.00001f);
 
-        ConfigDiagramm confDia2 = new ConfigDiagramm();
+        DiagramConfig confDia2 = new DiagramConfig();
         assertTrue("setNewTime sollte True zurückgeben", confDia2.setNewTime(1.0f, 2.5f));
 
-        ConfigDiagramm confDia3 = new ConfigDiagramm();
+        DiagramConfig confDia3 = new DiagramConfig();
         confDia3.setNewTime(2.0f, 2.5f);
         assertEquals("getMinTime sollte 2.0 zurückgeben", 2.0f, confDia3.getMinTime(), 0.00001f);
 
-        ConfigDiagramm confDia4 = new ConfigDiagramm();
+        DiagramConfig confDia4 = new DiagramConfig();
         assertFalse("setNewTime sollte False zurückgeben", confDia4.setNewTime(3.0f, 2.5f));
 
-        ConfigDiagramm confDia5 = new ConfigDiagramm();
+        DiagramConfig confDia5 = new DiagramConfig();
         assertFalse("setNewTime sollte False zurückgeben", confDia5.setNewTime(-1.0f, 2.5f));
     }
 
@@ -59,20 +61,20 @@ public void minTimeShouldBeSet() {
      */
     @Test
     public void maxTimeShouldBeSet() {
-        ConfigDiagramm confDia1 = new ConfigDiagramm();
+        DiagramConfig confDia1 = new DiagramConfig();
         assertEquals("getMaxTime sollte 2.5 zurückgeben", 2.5f, confDia1.getMaxTime(), 0.00001f);
 
-        ConfigDiagramm confDia2 = new ConfigDiagramm();
+        DiagramConfig confDia2 = new DiagramConfig();
         assertTrue("setNewTime sollte True zurückgeben", confDia2.setNewTime(0.5f, 3.0f));
 
-        ConfigDiagramm confDia3 = new ConfigDiagramm();
+        DiagramConfig confDia3 = new DiagramConfig();
         confDia3.setNewTime(0.5f, 1.0f);
         assertEquals("getMaxTime sollte 1.0 zurückgeben", 1.0f, confDia3.getMaxTime(), 0.00001f);
 
-        ConfigDiagramm confDia4 = new ConfigDiagramm();
+        DiagramConfig confDia4 = new DiagramConfig();
         assertFalse("setNewTime sollte False zurückgeben", confDia4.setNewTime(0.5f, 0.2f));
 
-        ConfigDiagramm confDia5 = new ConfigDiagramm();
+        DiagramConfig confDia5 = new DiagramConfig();
         assertFalse("setNewTime sollte False zurückgeben", confDia5.setNewTime(0.5f, 12.5f));
     }
 
@@ -81,28 +83,28 @@ public void maxTimeShouldBeSet() {
      */
     @Test
     public void stepsBetweenShouldBeSet() {
-        ConfigDiagramm confDia1 = new ConfigDiagramm();
+        DiagramConfig confDia1 = new DiagramConfig();
         assertEquals("getStepsBetween sollte 4 zurückgeben", 4, confDia1.getStepsBetween());
 
-        ConfigDiagramm confDia2 = new ConfigDiagramm();
+        DiagramConfig confDia2 = new DiagramConfig();
         assertTrue("setStepsBetween sollte True zurückgeben", confDia2.setStepsBetween(8));
 
-        ConfigDiagramm confDia3 = new ConfigDiagramm();
+        DiagramConfig confDia3 = new DiagramConfig();
         confDia3.setStepsBetween(1);
         assertEquals("getStepsBetween sollte 1 zurückgeben", 1, confDia3.getStepsBetween());
 
-        ConfigDiagramm confDia4 = new ConfigDiagramm();
+        DiagramConfig confDia4 = new DiagramConfig();
         assertFalse("setStepsBetween sollte False zurückgeben", confDia4.setStepsBetween(12));
 
-        ConfigDiagramm confDia5 = new ConfigDiagramm();
+        DiagramConfig confDia5 = new DiagramConfig();
         assertFalse("setStepsBetween sollte False zurückgeben", confDia5.setStepsBetween(-2));
 
-        ConfigDiagramm confDia6 = new ConfigDiagramm();
+        DiagramConfig confDia6 = new DiagramConfig();
         confDia6.setNewTime(3.0f, 3.0f);
         confDia6.setStepsBetween(5);
         assertEquals("getStepsBetween sollte 0 zurückgeben", 0, confDia6.getStepsBetween());
 
-        ConfigDiagramm confDia7 = new ConfigDiagramm();
+        DiagramConfig confDia7 = new DiagramConfig();
         confDia7.setStepsBetween(10);
         confDia7.setNewTime(3.0f, 3.0f);
         assertEquals("getStepsBetween sollte 0 zurückgeben", 0, confDia7.getStepsBetween());
diff --git a/src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java b/src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java
index dbcaf3a..eafc91d 100644
--- a/src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java
+++ b/src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java
@@ -6,6 +6,8 @@
 
 import org.junit.Test;
 
+import github.weichware10.analyse.config.HeatmapConfig;
+
 /**
  * Unit Test für Klasse ConfigHeatmap.
  */
@@ -15,17 +17,17 @@ public class ConfigHeatmapTest {
      */
     @Test
     public void minColorShouldBeSet() {
-        ConfigHeatmap confHm1 = new ConfigHeatmap();
+        HeatmapConfig confHm1 = new HeatmapConfig();
         // assertEquals(new float[] { 1, 0, 0 }, confHm1.getMinColor());
         assertEquals("getMinColor[0] sollte 0 zurückgeben", 0, confHm1.getMinColor()[0], 0.0001f);
         assertEquals("getMinColor[1] sollte 0 zurückgeben", 0, confHm1.getMinColor()[1], 0.0001f);
         assertEquals("getMinColor[2] sollte 1 zurückgeben", 1, confHm1.getMinColor()[2], 0.0001f);
 
-        ConfigHeatmap confHm2 = new ConfigHeatmap();
+        HeatmapConfig confHm2 = new HeatmapConfig();
         assertTrue("setMinColor sollte True zurückgeben",
             confHm2.setMinColor(new float[] { 0, 1, 0.5f }));
 
-        ConfigHeatmap confHm3 = new ConfigHeatmap();
+        HeatmapConfig confHm3 = new HeatmapConfig();
         confHm3.setMinColor(new float[] { 0.25f, 0.1f, 1 });
         assertEquals("getMinColor[0] sollte 0.25 zurückgeben",
             0.25f, confHm3.getMinColor()[0], 0.0001f);
@@ -34,15 +36,15 @@ public void minColorShouldBeSet() {
         assertEquals("getMinColor[2] sollte 1 zurückgeben",
             1, confHm3.getMinColor()[2], 0.0001f);
 
-        ConfigHeatmap confHm4 = new ConfigHeatmap();
+        HeatmapConfig confHm4 = new HeatmapConfig();
         assertFalse("setMinColor sollte False zurückgeben",
             confHm4.setMinColor(new float[] { -1, 0, 1 }));
 
-        ConfigHeatmap confHm5 = new ConfigHeatmap();
+        HeatmapConfig confHm5 = new HeatmapConfig();
         assertFalse("setMinColor sollte False zurückgeben",
             confHm5.setMinColor(new float[] { 0.5f, 1.3f, 1 }));
 
-        ConfigHeatmap confHm6 = new ConfigHeatmap();
+        HeatmapConfig confHm6 = new HeatmapConfig();
         assertFalse("setMinColor sollte False zurückgeben",
             confHm6.setMinColor(new float[] { 0.5f, 1.3f, -1 }));
     }
@@ -52,16 +54,16 @@ public void minColorShouldBeSet() {
      */
     @Test
     public void maxColorShouldBeSet() {
-        ConfigHeatmap confHm1 = new ConfigHeatmap();
+        HeatmapConfig confHm1 = new HeatmapConfig();
         assertEquals("getMaxColor[0] sollte 1 zurückgeben", 1, confHm1.getMaxColor()[0], 0.0001f);
         assertEquals("getMaxColor[1] sollte 0 zurückgeben", 0, confHm1.getMaxColor()[1], 0.0001f);
         assertEquals("getMaxColor[2] sollte 0 zurückgeben", 0, confHm1.getMaxColor()[2], 0.0001f);
 
-        ConfigHeatmap confHm2 = new ConfigHeatmap();
+        HeatmapConfig confHm2 = new HeatmapConfig();
         assertTrue("setMaxColor sollte True zurückgeben",
             confHm2.setMaxColor(new float[] { 0.6f, 0.15f, 1.0f }));
 
-        ConfigHeatmap confHm3 = new ConfigHeatmap();
+        HeatmapConfig confHm3 = new HeatmapConfig();
         confHm3.setMaxColor(new float[] { 0.1f, 1.0f, 0.45f });
         assertEquals("getMaxColor[0] sollte 0.1 zurückgeben",
             0.1f, confHm3.getMaxColor()[0], 0.0001f);
@@ -70,15 +72,15 @@ public void maxColorShouldBeSet() {
         assertEquals("getMaxColor[2] sollte 0.45 zurückgeben",
             0.45f, confHm3.getMaxColor()[2], 0.0001f);
 
-        ConfigHeatmap confHm4 = new ConfigHeatmap();
+        HeatmapConfig confHm4 = new HeatmapConfig();
         assertFalse("setMaxColor sollte False zurückgeben",
             confHm4.setMaxColor(new float[] { 0.2f, -0.85f, 0.0f }));
 
-        ConfigHeatmap confHm5 = new ConfigHeatmap();
+        HeatmapConfig confHm5 = new HeatmapConfig();
         assertFalse("setMaxColor sollte False zurückgeben",
             confHm5.setMaxColor(new float[] { 0.2f, 0.16f, 3.0f }));
 
-        ConfigHeatmap confHm6 = new ConfigHeatmap();
+        HeatmapConfig confHm6 = new HeatmapConfig();
         assertFalse("setMaxColor sollte False zurückgeben",
             confHm6.setMaxColor(new float[] { 1.2f, 0.16f, -3.0f }));
     }
@@ -88,14 +90,14 @@ public void maxColorShouldBeSet() {
      */
     @Test
     public void gridShouldBeSet() {
-        ConfigHeatmap confHm1 = new ConfigHeatmap();
+        HeatmapConfig confHm1 = new HeatmapConfig();
         assertTrue("isGrid sollte true zurückgeben", confHm1.isGrid());
 
-        ConfigHeatmap confHm2 = new ConfigHeatmap();
+        HeatmapConfig confHm2 = new HeatmapConfig();
         confHm2.setGrid(false);
         assertFalse("isGrid sollte false zurückgeben", confHm2.isGrid());
 
-        ConfigHeatmap confHm3 = new ConfigHeatmap();
+        HeatmapConfig confHm3 = new HeatmapConfig();
         confHm3.setGrid(true);
         assertTrue("isGrid sollte true zurückgeben", confHm3.isGrid());
     }
@@ -105,14 +107,14 @@ public void gridShouldBeSet() {
      */
     @Test
     public void imageShouldBeSet() {
-        ConfigHeatmap confHm1 = new ConfigHeatmap();
+        HeatmapConfig confHm1 = new HeatmapConfig();
         assertTrue("isImage sollte true zurückgeben", confHm1.isImage());
 
-        ConfigHeatmap confHm2 = new ConfigHeatmap();
+        HeatmapConfig confHm2 = new HeatmapConfig();
         confHm2.setImage(false);
         assertFalse("isImage sollte false zurückgeben", confHm2.isImage());
 
-        ConfigHeatmap confHm3 = new ConfigHeatmap();
+        HeatmapConfig confHm3 = new HeatmapConfig();
         confHm3.setImage(true);
         assertTrue("isImage sollte true zurückgeben", confHm3.isImage());
     }
@@ -122,16 +124,16 @@ public void imageShouldBeSet() {
      */
     @Test
     public void minDiffShouldBeSet() {
-        ConfigHeatmap confHm1 = new ConfigHeatmap();
+        HeatmapConfig confHm1 = new HeatmapConfig();
         assertEquals("getMinDiff[0] sollte 1 zurückgeben", 1, confHm1.getMinDiff()[0], 0.0001f);
         assertEquals("getMinDiff[1] sollte 0 zurückgeben", 0, confHm1.getMinDiff()[1], 0.0001f);
         assertEquals("getMinDiff[2] sollte 1 zurückgeben", 1, confHm1.getMinDiff()[2], 0.0001f);
 
-        ConfigHeatmap confHm2 = new ConfigHeatmap();
+        HeatmapConfig confHm2 = new HeatmapConfig();
         assertTrue("setMinDiff sollte True zurückgeben",
             confHm2.setMinDiff(new float[] { 0.5f, 0.3f, 1.0f }));
 
-        ConfigHeatmap confHm3 = new ConfigHeatmap();
+        HeatmapConfig confHm3 = new HeatmapConfig();
         confHm3.setMinDiff(new float[] { 0.75f, 0.2f, 0.5f });
         assertEquals("getMinDiff[0] sollte 0.75 zurückgeben",
             0.75f, confHm3.getMinDiff()[0], 0.0001f);
@@ -140,15 +142,15 @@ public void minDiffShouldBeSet() {
         assertEquals("getMinDiff[2] sollte 0.5 zurückgeben",
             0.5f, confHm3.getMinDiff()[2], 0.0001f);
 
-        ConfigHeatmap confHm4 = new ConfigHeatmap();
+        HeatmapConfig confHm4 = new HeatmapConfig();
         assertFalse("setMinDiff sollte False zurückgeben",
             confHm4.setMinDiff(new float[] { -1, 0, 1 }));
 
-        ConfigHeatmap confHm5 = new ConfigHeatmap();
+        HeatmapConfig confHm5 = new HeatmapConfig();
         assertFalse("setMinDiff sollte False zurückgeben",
             confHm5.setMinDiff(new float[] { 0.5f, 1.3f, 1 }));
 
-        ConfigHeatmap confHm6 = new ConfigHeatmap();
+        HeatmapConfig confHm6 = new HeatmapConfig();
         assertFalse("setMinDiff sollte False zurückgeben",
             confHm6.setMinDiff(new float[] { 0.5f, 1.3f, -1 }));
     }
@@ -158,16 +160,16 @@ public void minDiffShouldBeSet() {
      */
     @Test
     public void maxDiffShouldBeSet() {
-        ConfigHeatmap confHm1 = new ConfigHeatmap();
+        HeatmapConfig confHm1 = new HeatmapConfig();
         assertEquals("getMaxDiff[0] sollte 1 zurückgeben", 1, confHm1.getMaxDiff()[0], 0.0001f);
         assertEquals("getMaxDiff[1] sollte 1 zurückgeben", 1, confHm1.getMaxDiff()[1], 0.0001f);
         assertEquals("getMaxDiff[2] sollte 0 zurückgeben", 0, confHm1.getMaxDiff()[2], 0.0001f);
 
-        ConfigHeatmap confHm2 = new ConfigHeatmap();
+        HeatmapConfig confHm2 = new HeatmapConfig();
         assertTrue("setMaxDiff sollte True zurückgeben",
             confHm2.setMaxDiff(new float[] { 0.0f, 0.65f, 0.2f }));
 
-        ConfigHeatmap confHm3 = new ConfigHeatmap();
+        HeatmapConfig confHm3 = new HeatmapConfig();
         confHm3.setMaxDiff(new float[] { 0.2f, 1.0f, 0.5f });
         assertEquals("getMaxDiff[0] sollte 0.2 zurückgeben",
             0.2f, confHm3.getMaxDiff()[0], 0.0001f);
@@ -176,15 +178,15 @@ public void maxDiffShouldBeSet() {
         assertEquals("getMaxDiff[2] sollte 0.5 zurückgeben",
             0.5f, confHm3.getMaxDiff()[2], 0.0001f);
 
-        ConfigHeatmap confHm4 = new ConfigHeatmap();
+        HeatmapConfig confHm4 = new HeatmapConfig();
         assertFalse("setMaxDiff sollte False zurückgeben",
             confHm4.setMaxDiff(new float[] { -1, 0, 1 }));
 
-        ConfigHeatmap confHm5 = new ConfigHeatmap();
+        HeatmapConfig confHm5 = new HeatmapConfig();
         assertFalse("setMaxDiff sollte False zurückgeben",
             confHm5.setMaxDiff(new float[] { 0.5f, 1.3f, 1 }));
 
-        ConfigHeatmap confHm6 = new ConfigHeatmap();
+        HeatmapConfig confHm6 = new HeatmapConfig();
         assertFalse("setMaxDiff sollte False zurückgeben",
             confHm6.setMaxDiff(new float[] { 0.5f, 1.3f, -1 }));
     }
diff --git a/src/test/java/github/weichware10/analyse/DiagrammTest.java b/src/test/java/github/weichware10/analyse/DiagrammTest.java
index 8aa7c99..026bf75 100644
--- a/src/test/java/github/weichware10/analyse/DiagrammTest.java
+++ b/src/test/java/github/weichware10/analyse/DiagrammTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import github.weichware10.analyse.config.DiagramConfig;
+import github.weichware10.analyse.logic.Diagram;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
@@ -15,25 +17,25 @@ public class DiagrammTest {
      */
     @Test
     public void createRelFreqImgAreaShouldWork() {
-        Diagramm dia1 = new Diagramm(
+        Diagram dia1 = new Diagram(
                 new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new ConfigDiagramm());
+                new DiagramConfig());
         assertEquals(
                 "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_ZOOMMAPS_1 zurückgeben",
                 ".../diagramm/RELFRQIMGAREA_ZOOMMAPS_1.jpg",
                 dia1.createRelFreqImgArea());
 
-        Diagramm dia2 = new Diagramm(
+        Diagram dia2 = new Diagram(
                 new TrialData(ToolType.EYETRACKING, "5", "3"),
-                new ConfigDiagramm());
+                new DiagramConfig());
         assertEquals(
                 "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_EYETRACKING_5 zurückgeben",
                 ".../diagramm/RELFRQIMGAREA_EYETRACKING_5.jpg",
                 dia2.createRelFreqImgArea());
 
-        Diagramm dia3 = new Diagramm(
+        Diagram dia3 = new Diagram(
                 new TrialData(ToolType.CODECHARTS, "132", "3"),
-                new ConfigDiagramm());
+                new DiagramConfig());
         assertEquals(
                 "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_CODECHARTS_132 zurückgeben",
                 ".../diagramm/RELFRQIMGAREA_CODECHARTS_132.jpg",
@@ -45,24 +47,24 @@ public void createRelFreqImgAreaShouldWork() {
      */
     @Test
     public void createViewTimeDistrSouldWork() {
-        Diagramm dia1 = new Diagramm(
+        Diagram dia1 = new Diagram(
                 new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new ConfigDiagramm());
+                new DiagramConfig());
         assertEquals("createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_ZOOMMAPS_1 zurückgeben",
                 ".../diagramm/VIEWTIMEDISTR_ZOOMMAPS_1.jpg",
                 dia1.createViewTimeDistr());
 
-        Diagramm dia2 = new Diagramm(
+        Diagram dia2 = new Diagram(
                 new TrialData(ToolType.EYETRACKING, "5", "3"),
-                new ConfigDiagramm());
+                new DiagramConfig());
         assertEquals(
                 "createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_EYETRACKING_5 zurückgeben",
                 ".../diagramm/VIEWTIMEDISTR_EYETRACKING_5.jpg",
                 dia2.createViewTimeDistr());
 
-        Diagramm dia3 = new Diagramm(
+        Diagram dia3 = new Diagram(
                 new TrialData(ToolType.CODECHARTS, "132", "3"),
-                new ConfigDiagramm());
+                new DiagramConfig());
         assertEquals(
                 "createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_CODECHARTS_132 zurückgeben",
                 ".../diagramm/VIEWTIMEDISTR_CODECHARTS_132.jpg",
diff --git a/src/test/java/github/weichware10/analyse/HeatmapTest.java b/src/test/java/github/weichware10/analyse/HeatmapTest.java
index 8137319..c912ee2 100644
--- a/src/test/java/github/weichware10/analyse/HeatmapTest.java
+++ b/src/test/java/github/weichware10/analyse/HeatmapTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import github.weichware10.analyse.config.HeatmapConfig;
+import github.weichware10.analyse.logic.Heatmap;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
@@ -17,19 +19,19 @@ public class HeatmapTest {
     public void createHeatmapShouldWork() {
         Heatmap hm1 = new Heatmap(
                 new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         assertEquals("createHeatMap sollte .../heatmap/HEATMAP_ZOOMMAPS_1.jpg ausgeben",
                 ".../heatmap/HEATMAP_ZOOMMAPS_1.jpg", hm1.createHeatmap());
 
         Heatmap hm2 = new Heatmap(
                 new TrialData(ToolType.EYETRACKING, "7", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         assertEquals("createHeatMap sollte .../heatmap/HEATMAP_EYETRACKING_7.jpg ausgeben",
                 ".../heatmap/HEATMAP_EYETRACKING_7.jpg", hm2.createHeatmap());
 
         Heatmap hm3 = new Heatmap(
                 new TrialData(ToolType.CODECHARTS, "3", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         assertEquals("createHeatMap sollte .../heatmap/HEATMAP_CODECHARTS_3.jpg ausgeben",
                 ".../heatmap/HEATMAP_CODECHARTS_3.jpg", hm3.createHeatmap());
     }
@@ -41,10 +43,10 @@ public void createHeatmapShouldWork() {
     public void compHeatmapsShouldWork() {
         Heatmap hm1 = new Heatmap(
                 new TrialData(ToolType.CODECHARTS, "4", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         Heatmap hm2 = new Heatmap(
                 new TrialData(ToolType.EYETRACKING, "2", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         assertEquals(
                 "compHeatmaps sollte .../heatmap/COMPHEATMAP_CODECHARTS_1_EYETRACKING_2.jpg ausgeb",
                 ".../heatmap/COMPHEATMAP_CODECHARTS_4_EYETRACKING_2.jpg",
@@ -52,10 +54,10 @@ public void compHeatmapsShouldWork() {
 
         Heatmap hm3 = new Heatmap(
                 new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         Heatmap hm4 = new Heatmap(
                 new TrialData(ToolType.CODECHARTS, "6", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         assertEquals(
                 "compHeatmaps sollte .../heatmap/COMPHEATMAP_ZOOMMAPS_1_CODECHARTS_6.jpg ausgeben",
                 ".../heatmap/COMPHEATMAP_ZOOMMAPS_1_CODECHARTS_6.jpg",
@@ -63,10 +65,10 @@ public void compHeatmapsShouldWork() {
 
         Heatmap hm5 = new Heatmap(
                 new TrialData(ToolType.EYETRACKING, "8", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         Heatmap hm6 = new Heatmap(
                 new TrialData(ToolType.ZOOMMAPS, "12", "3"),
-                new ConfigHeatmap());
+                new HeatmapConfig());
         assertEquals(
                 "sollte .../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOMMAPS_12.jpg ausgeben",
                 ".../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOMMAPS_12.jpg",
diff --git a/src/test/java/github/weichware10/analyse/VerlaufTest.java b/src/test/java/github/weichware10/analyse/VerlaufTest.java
index 9ed0c64..6333bbf 100644
--- a/src/test/java/github/weichware10/analyse/VerlaufTest.java
+++ b/src/test/java/github/weichware10/analyse/VerlaufTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import github.weichware10.analyse.logic.Verlauf;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;

From fd6d350cee715f0e9a76d31a95f960bb0a5ebb35 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Wed, 5 Jan 2022 21:07:01 +0100
Subject: [PATCH 02/87] [test] Tests an Main angepasst

---
 .../DiagramConfigTest.java}                                 | 6 ++----
 .../HeatmapConfigTest.java}                                 | 6 ++----
 .../github/weichware10/analyse/{ => logic}/ClientTest.java  | 3 +--
 .../analyse/{DiagrammTest.java => logic/DiagramTest.java}   | 5 ++---
 .../github/weichware10/analyse/{ => logic}/HeatmapTest.java | 3 +--
 .../github/weichware10/analyse/{ => logic}/VerlaufTest.java | 3 +--
 6 files changed, 9 insertions(+), 17 deletions(-)
 rename src/test/java/github/weichware10/analyse/{ConfigDiagrammTest.java => config/DiagramConfigTest.java} (97%)
 rename src/test/java/github/weichware10/analyse/{ConfigHeatmapTest.java => config/HeatmapConfigTest.java} (98%)
 rename src/test/java/github/weichware10/analyse/{ => logic}/ClientTest.java (98%)
 rename src/test/java/github/weichware10/analyse/{DiagrammTest.java => logic/DiagramTest.java} (96%)
 rename src/test/java/github/weichware10/analyse/{ => logic}/HeatmapTest.java (97%)
 rename src/test/java/github/weichware10/analyse/{ => logic}/VerlaufTest.java (93%)

diff --git a/src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java b/src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java
similarity index 97%
rename from src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java
rename to src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java
index eeba9e2..a8f0ef9 100644
--- a/src/test/java/github/weichware10/analyse/ConfigDiagrammTest.java
+++ b/src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -6,12 +6,10 @@
 
 import org.junit.Test;
 
-import github.weichware10.analyse.config.DiagramConfig;
-
 /**
  * Unit Test für Klasse ConfigDiagramm.
  */
-public class ConfigDiagrammTest {
+public class DiagramConfigTest {
     /**
      * Testet, ob Anzahl Felder gesetzt wird.
      */
diff --git a/src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java b/src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java
similarity index 98%
rename from src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java
rename to src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java
index eafc91d..1293c0c 100644
--- a/src/test/java/github/weichware10/analyse/ConfigHeatmapTest.java
+++ b/src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -6,12 +6,10 @@
 
 import org.junit.Test;
 
-import github.weichware10.analyse.config.HeatmapConfig;
-
 /**
  * Unit Test für Klasse ConfigHeatmap.
  */
-public class ConfigHeatmapTest {
+public class HeatmapConfigTest {
     /**
      * Testet, ob minimale Farbe gesetzt wird.
      */
diff --git a/src/test/java/github/weichware10/analyse/ClientTest.java b/src/test/java/github/weichware10/analyse/logic/ClientTest.java
similarity index 98%
rename from src/test/java/github/weichware10/analyse/ClientTest.java
rename to src/test/java/github/weichware10/analyse/logic/ClientTest.java
index db48491..0f72dfb 100644
--- a/src/test/java/github/weichware10/analyse/ClientTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/ClientTest.java
@@ -1,10 +1,9 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.analyse.logic.Client;
 import github.weichware10.util.Enums.ToolType;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/github/weichware10/analyse/DiagrammTest.java b/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
similarity index 96%
rename from src/test/java/github/weichware10/analyse/DiagrammTest.java
rename to src/test/java/github/weichware10/analyse/logic/DiagramTest.java
index 026bf75..e537a41 100644
--- a/src/test/java/github/weichware10/analyse/DiagrammTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
@@ -1,9 +1,8 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
 import static org.junit.Assert.assertEquals;
 
 import github.weichware10.analyse.config.DiagramConfig;
-import github.weichware10.analyse.logic.Diagram;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
@@ -11,7 +10,7 @@
 /**
  * Unit Test für Klasse Diagramm.
  */
-public class DiagrammTest {
+public class DiagramTest {
     /**
      * Testet, ob String erstellt und ausgegeben wird.
      */
diff --git a/src/test/java/github/weichware10/analyse/HeatmapTest.java b/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
similarity index 97%
rename from src/test/java/github/weichware10/analyse/HeatmapTest.java
rename to src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
index c912ee2..dc2fd3a 100644
--- a/src/test/java/github/weichware10/analyse/HeatmapTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
@@ -1,9 +1,8 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
 import static org.junit.Assert.assertEquals;
 
 import github.weichware10.analyse.config.HeatmapConfig;
-import github.weichware10.analyse.logic.Heatmap;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
diff --git a/src/test/java/github/weichware10/analyse/VerlaufTest.java b/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
similarity index 93%
rename from src/test/java/github/weichware10/analyse/VerlaufTest.java
rename to src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
index 6333bbf..78e5eb3 100644
--- a/src/test/java/github/weichware10/analyse/VerlaufTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
@@ -1,8 +1,7 @@
-package github.weichware10.analyse;
+package github.weichware10.analyse.logic;
 
 import static org.junit.Assert.assertEquals;
 
-import github.weichware10.analyse.logic.Verlauf;
 import github.weichware10.util.Enums.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;

From 9e9e11d0d36336139973e938abb98fe20766c1cd Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 6 Jan 2022 15:32:20 +0100
Subject: [PATCH 03/87] [feat] Anfang der abstrakten GUI-Klasse

---
 .../java/github/weichware10/analyse/Main.java |  8 +-
 .../github/weichware10/analyse/gui/App.java   | 14 +++
 .../analyse/gui/AppController.java            | 14 +++
 .../analyse/gui/util/AbsScene.java            | 96 +++++++++++++++++++
 .../analyse/gui/util/AbsSceneController.java  | 21 ++++
 .../github/weichware10/analyse/gui/App.fxml   | 10 ++
 6 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/App.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/AppController.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/App.fxml

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index dbf9cf3..c2888ef 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,5 +1,6 @@
 package github.weichware10.analyse;
 
+import github.weichware10.analyse.gui.App;
 import javafx.application.Application;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
@@ -8,15 +9,18 @@
  * Analyse GUI.
  */
 public class Main extends Application {
+
+    public static Stage primaryStage;
+
     public static void main(String[] args) {
         launch(args);
     }
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        primaryStage.setTitle("Analyse");
+        Main.primaryStage = primaryStage;
+        App.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
-        //Zeigt das Fenster
         primaryStage.show();
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/App.java b/src/main/java/github/weichware10/analyse/gui/App.java
new file mode 100644
index 0000000..5a25f71
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/App.java
@@ -0,0 +1,14 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.util.AbsScene;
+
+/**
+ * Der Hauptbildschirm der App.
+ */
+public class App extends AbsScene {
+
+    public static void start() {
+        start(Main.primaryStage,  App.class.getResource("App.fxml"), "Analyse",  null, 300, 300);
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/AppController.java b/src/main/java/github/weichware10/analyse/gui/AppController.java
new file mode 100644
index 0000000..0562899
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/AppController.java
@@ -0,0 +1,14 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+
+/**
+ * Controller für {@link App}.
+ */
+public class AppController extends AbsSceneController {
+
+    @Override
+    protected void initialize() {
+        ; // nothing yet
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
new file mode 100644
index 0000000..0601de7
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
@@ -0,0 +1,96 @@
+package github.weichware10.analyse.gui.util;
+
+import github.weichware10.util.Logger;
+import java.net.URL;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.MenuBar;
+import javafx.scene.layout.BorderPane;
+import javafx.stage.Stage;
+
+/**
+ * Abstrakte Klasse, von der alle Szenen erben. Diese Klasse lädt vorallem FXML-Dateien.
+ */
+public abstract class AbsScene {
+
+    /**
+     * URL der FXML-Datei.
+     */
+    protected static URL fxml;
+    private static Scene scene = null;
+    private static Parent root = null;
+    private static boolean initialized = false;
+
+    /**
+     * lädt die Szene intern und gibt die Instanz der Controller-Klasse zurück.
+     * Falls diese benötigt wird, kann also manuell initialize() aufgerufen werden.
+     * Das sollte jedoch in der Regel nicht nötig sein.
+     *
+     * @param fxml - URL der FXML-Datei
+     * @return das Controller-Objekt.
+     */
+    protected static AbsSceneController initialize(URL fxml) {
+
+        FXMLLoader loader = new FXMLLoader(fxml);
+        Logger.debug(fxml.toString());
+
+        try {
+            root = loader.load();
+        } catch (Exception e) {
+            Logger.error("Error when loading " + fxml, e, true);
+            System.exit(-1);
+        }
+
+        scene = new Scene(root);
+
+        initialized = true;
+        return loader.getController();
+    }
+
+    /**
+     * Setzt die MenuBar, falls das in initialize geladene root-Objekt BorderPane ist.
+     *
+     * @param menuBar - die zu setzende Menüleiste
+     */
+    public static void setMenuBar(MenuBar menuBar) {
+        if (root != null && root.getClass().isInstance(BorderPane.class)) {
+            BorderPane borderPane = (BorderPane) root;
+            borderPane.setTop(menuBar);
+        }
+    }
+
+    /**
+     * Zeigt die Szene an.
+     *
+     * @param primaryStage - das Hauptfenster
+     */
+    public static void start(Stage primaryStage, URL fxml, String title, MenuBar menuBar,
+            Integer width, Integer height) {
+        if (primaryStage == null || title == null || fxml == null) {
+            throw new NullPointerException(
+                    String.format("Stage primaryStage (%s), ",
+                            (primaryStage != null) ? primaryStage.toString() : "null")
+                    + String.format("String title (%s) ",
+                            (title != null) ? title : "null")
+                    + String.format("and URL fxml (%s) are required",
+                            (fxml != null) ? fxml.toString() : "null"));
+        }
+        // aus FXML laden
+        if (!initialized) {
+            initialize(fxml);
+        }
+        // Menüleiste setzen
+        if (menuBar != null) {
+            setMenuBar(menuBar);
+        }
+        // Größe einstellen
+        if (width != null && height != null) {
+            primaryStage.setWidth(width);
+            primaryStage.setHeight(height);
+        }
+        // auf primaryStage setzen
+        primaryStage.setScene(scene);
+        primaryStage.setTitle(title);
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java b/src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java
new file mode 100644
index 0000000..5fbb666
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java
@@ -0,0 +1,21 @@
+package github.weichware10.analyse.gui.util;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+import javafx.fxml.FXML;
+
+
+/**
+ * abstrakte Klasse für Controller-Klassen.
+ */
+public abstract class AbsSceneController {
+
+    @FXML
+    protected ResourceBundle resources;
+    @FXML
+    protected URL location;
+
+    @FXML
+    protected abstract void initialize();
+
+}
diff --git a/src/main/resources/github/weichware10/analyse/gui/App.fxml b/src/main/resources/github/weichware10/analyse/gui/App.fxml
new file mode 100644
index 0000000..0934499
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/App.fxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+
+<BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.AppController">
+   <center>
+      <Label text="Analyse Platzhalter" />
+   </center>
+</BorderPane>

From 16bbc4551e1e5c6d5b565e7ae77bace4272da689 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 6 Jan 2022 15:33:03 +0100
Subject: [PATCH 04/87] [style] unnecessary debug

---
 src/main/java/github/weichware10/analyse/gui/util/AbsScene.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
index 0601de7..e835499 100644
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
@@ -33,7 +33,6 @@ public abstract class AbsScene {
     protected static AbsSceneController initialize(URL fxml) {
 
         FXMLLoader loader = new FXMLLoader(fxml);
-        Logger.debug(fxml.toString());
 
         try {
             root = loader.load();

From 2ad2b1ad99d7cac264c275163efa8af9576cd272 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 6 Jan 2022 18:59:14 +0100
Subject: [PATCH 05/87] [feat] Main Screen + MenuBar

---
 .../github/weichware10/analyse/gui/App.java   | 15 ++++++-
 .../weichware10/analyse/gui/MainMenuBar.java  | 24 ++++++++++
 .../analyse/gui/util/AbsScene.java            | 45 +++++++------------
 .../weichware10/analyse/gui/MainMenuBar.fxml  | 25 +++++++++++
 4 files changed, 80 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml

diff --git a/src/main/java/github/weichware10/analyse/gui/App.java b/src/main/java/github/weichware10/analyse/gui/App.java
index 5a25f71..acdc0ec 100644
--- a/src/main/java/github/weichware10/analyse/gui/App.java
+++ b/src/main/java/github/weichware10/analyse/gui/App.java
@@ -2,13 +2,26 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.scene.Parent;
 
 /**
  * Der Hauptbildschirm der App.
  */
 public class App extends AbsScene {
 
+    private static Parent root;
+
+    /**
+     * Startet die App.
+     */
     public static void start() {
-        start(Main.primaryStage,  App.class.getResource("App.fxml"), "Analyse",  null, 300, 300);
+        root = start(Main.primaryStage,
+                App.class.getResource("App.fxml"),
+                root,
+                "Analyse",
+                MainMenuBar.getMenuBar(),
+                300,
+                300);
     }
+
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
new file mode 100644
index 0000000..a9f511b
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
@@ -0,0 +1,24 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.scene.control.MenuBar;
+
+/**
+ * Haupt-Menüleiste.
+ */
+public class MainMenuBar extends AbsScene {
+
+    private static MenuBar root;
+
+    /**
+     * Initialisiert die MenuBar-Instanz, falls noch nicht vorhanden.
+     *
+     * @return die MenuBar-Instanz
+     */
+    public static MenuBar getMenuBar() {
+        if (root == null) {
+            root = (MenuBar) initialize(MainMenuBar.class.getResource("MainMenuBar.fxml"));
+        }
+        return root;
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
index e835499..3d7463b 100644
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
@@ -15,25 +15,16 @@
 public abstract class AbsScene {
 
     /**
-     * URL der FXML-Datei.
-     */
-    protected static URL fxml;
-    private static Scene scene = null;
-    private static Parent root = null;
-    private static boolean initialized = false;
-
-    /**
-     * lädt die Szene intern und gibt die Instanz der Controller-Klasse zurück.
-     * Falls diese benötigt wird, kann also manuell initialize() aufgerufen werden.
-     * Das sollte jedoch in der Regel nicht nötig sein.
+     * lädt die Szene intern und gibt die root-Instanz zurück.
      *
      * @param fxml - URL der FXML-Datei
      * @return das Controller-Objekt.
      */
-    protected static AbsSceneController initialize(URL fxml) {
+    protected static Parent initialize(URL fxml) {
 
         FXMLLoader loader = new FXMLLoader(fxml);
 
+        Parent root = null;
         try {
             root = loader.load();
         } catch (Exception e) {
@@ -41,10 +32,7 @@ protected static AbsSceneController initialize(URL fxml) {
             System.exit(-1);
         }
 
-        scene = new Scene(root);
-
-        initialized = true;
-        return loader.getController();
+        return root;
     }
 
     /**
@@ -52,8 +40,8 @@ protected static AbsSceneController initialize(URL fxml) {
      *
      * @param menuBar - die zu setzende Menüleiste
      */
-    public static void setMenuBar(MenuBar menuBar) {
-        if (root != null && root.getClass().isInstance(BorderPane.class)) {
+    public static void setMenuBar(MenuBar menuBar, Parent root) {
+        if (root != null && root instanceof BorderPane) {
             BorderPane borderPane = (BorderPane) root;
             borderPane.setTop(menuBar);
         }
@@ -64,24 +52,24 @@ public static void setMenuBar(MenuBar menuBar) {
      *
      * @param primaryStage - das Hauptfenster
      */
-    public static void start(Stage primaryStage, URL fxml, String title, MenuBar menuBar,
+    public static Parent start(Stage primaryStage, URL fxml, Parent root,
+            String title, MenuBar menuBar,
             Integer width, Integer height) {
         if (primaryStage == null || title == null || fxml == null) {
             throw new NullPointerException(
                     String.format("Stage primaryStage (%s), ",
                             (primaryStage != null) ? primaryStage.toString() : "null")
-                    + String.format("String title (%s) ",
-                            (title != null) ? title : "null")
-                    + String.format("and URL fxml (%s) are required",
-                            (fxml != null) ? fxml.toString() : "null"));
+                            + String.format("String title (%s), ",
+                                    (title != null) ? title : "null")
+                            + String.format("and URL fxml (%s) are required",
+                                    (fxml != null) ? fxml.toString() : "null"));
         }
-        // aus FXML laden
-        if (!initialized) {
-            initialize(fxml);
+        if (root == null) {
+            root = initialize(fxml);
         }
         // Menüleiste setzen
         if (menuBar != null) {
-            setMenuBar(menuBar);
+            setMenuBar(menuBar, root);
         }
         // Größe einstellen
         if (width != null && height != null) {
@@ -89,7 +77,8 @@ public static void start(Stage primaryStage, URL fxml, String title, MenuBar men
             primaryStage.setHeight(height);
         }
         // auf primaryStage setzen
-        primaryStage.setScene(scene);
+        primaryStage.setScene(new Scene(root));
         primaryStage.setTitle(title);
+        return root;
     }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
new file mode 100644
index 0000000..7f18901
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+
+<MenuBar xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17">
+  <menus>
+    <Menu mnemonicParsing="false" text="File">
+      <items>
+        <MenuItem mnemonicParsing="false" text="Close" />
+      </items>
+    </Menu>
+    <Menu mnemonicParsing="false" text="Edit">
+      <items>
+        <MenuItem mnemonicParsing="false" text="Delete" />
+      </items>
+    </Menu>
+    <Menu mnemonicParsing="false" text="Help">
+      <items>
+        <MenuItem mnemonicParsing="false" text="About" />
+      </items>
+    </Menu>
+  </menus>
+</MenuBar>

From 732b86f3ef2a630809f2499b1faa35d4c1ce62fe Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Fri, 7 Jan 2022 15:11:56 +0100
Subject: [PATCH 06/87] [chore] util version angepasst

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b2f730..8792da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>v0.2</version>
+      <version>v2.1</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <dependency>

From 0c1ff7fbc6156086848db0cbfa6024dcf235feb8 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Fri, 7 Jan 2022 21:13:45 +0100
Subject: [PATCH 07/87] [fix] util oopsies

---
 src/main/java/github/weichware10/analyse/logic/Client.java      | 2 +-
 src/test/java/github/weichware10/analyse/logic/ClientTest.java  | 2 +-
 src/test/java/github/weichware10/analyse/logic/DiagramTest.java | 2 +-
 src/test/java/github/weichware10/analyse/logic/HeatmapTest.java | 2 +-
 src/test/java/github/weichware10/analyse/logic/VerlaufTest.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Client.java b/src/main/java/github/weichware10/analyse/logic/Client.java
index 6321d3b..61e4f30 100644
--- a/src/main/java/github/weichware10/analyse/logic/Client.java
+++ b/src/main/java/github/weichware10/analyse/logic/Client.java
@@ -3,7 +3,7 @@
 import github.weichware10.analyse.config.DiagramConfig;
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.util.Enums.ToolType;
+import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/github/weichware10/analyse/logic/ClientTest.java b/src/test/java/github/weichware10/analyse/logic/ClientTest.java
index 0f72dfb..f803353 100644
--- a/src/test/java/github/weichware10/analyse/logic/ClientTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/ClientTest.java
@@ -4,7 +4,7 @@
 import static org.junit.Assert.assertTrue;
 
 import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.util.Enums.ToolType;
+import github.weichware10.util.ToolType;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/test/java/github/weichware10/analyse/logic/DiagramTest.java b/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
index e537a41..3481b56 100644
--- a/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertEquals;
 
 import github.weichware10.analyse.config.DiagramConfig;
-import github.weichware10.util.Enums.ToolType;
+import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
 
diff --git a/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java b/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
index dc2fd3a..86bea8e 100644
--- a/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertEquals;
 
 import github.weichware10.analyse.config.HeatmapConfig;
-import github.weichware10.util.Enums.ToolType;
+import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
 
diff --git a/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java b/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
index 78e5eb3..5a723ac 100644
--- a/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
+++ b/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-import github.weichware10.util.Enums.ToolType;
+import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
 import org.junit.Test;
 

From cf630bdc9c409d6a144d4b71fc36a5936d59abbf Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 10:28:26 +0100
Subject: [PATCH 08/87] [refactor] App zu LoginWindow umbenannt

---
 src/main/java/github/weichware10/analyse/Main.java            | 4 ++--
 .../weichware10/analyse/gui/{App.java => LoginWindow.java}    | 4 ++--
 .../gui/{AppController.java => LoginWindowController.java}    | 4 ++--
 .../weichware10/analyse/gui/{App.fxml => LoginWindow.fxml}    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/github/weichware10/analyse/gui/{App.java => LoginWindow.java} (81%)
 rename src/main/java/github/weichware10/analyse/gui/{AppController.java => LoginWindowController.java} (65%)
 rename src/main/resources/github/weichware10/analyse/gui/{App.fxml => LoginWindow.fxml} (92%)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index c2888ef..6b0706a 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,6 +1,6 @@
 package github.weichware10.analyse;
 
-import github.weichware10.analyse.gui.App;
+import github.weichware10.analyse.gui.LoginWindow;
 import javafx.application.Application;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
@@ -19,7 +19,7 @@ public static void main(String[] args) {
     @Override
     public void start(Stage primaryStage) throws Exception {
         Main.primaryStage = primaryStage;
-        App.start();
+        LoginWindow.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
         primaryStage.show();
     }
diff --git a/src/main/java/github/weichware10/analyse/gui/App.java b/src/main/java/github/weichware10/analyse/gui/LoginWindow.java
similarity index 81%
rename from src/main/java/github/weichware10/analyse/gui/App.java
rename to src/main/java/github/weichware10/analyse/gui/LoginWindow.java
index acdc0ec..63cd0d3 100644
--- a/src/main/java/github/weichware10/analyse/gui/App.java
+++ b/src/main/java/github/weichware10/analyse/gui/LoginWindow.java
@@ -7,7 +7,7 @@
 /**
  * Der Hauptbildschirm der App.
  */
-public class App extends AbsScene {
+public class LoginWindow extends AbsScene {
 
     private static Parent root;
 
@@ -16,7 +16,7 @@ public class App extends AbsScene {
      */
     public static void start() {
         root = start(Main.primaryStage,
-                App.class.getResource("App.fxml"),
+                LoginWindow.class.getResource("LoginWindow.fxml"),
                 root,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
diff --git a/src/main/java/github/weichware10/analyse/gui/AppController.java b/src/main/java/github/weichware10/analyse/gui/LoginWindowController.java
similarity index 65%
rename from src/main/java/github/weichware10/analyse/gui/AppController.java
rename to src/main/java/github/weichware10/analyse/gui/LoginWindowController.java
index 0562899..1b584b1 100644
--- a/src/main/java/github/weichware10/analyse/gui/AppController.java
+++ b/src/main/java/github/weichware10/analyse/gui/LoginWindowController.java
@@ -3,9 +3,9 @@
 import github.weichware10.analyse.gui.util.AbsSceneController;
 
 /**
- * Controller für {@link App}.
+ * Controller für {@link LoginWindow}.
  */
-public class AppController extends AbsSceneController {
+public class LoginWindowController extends AbsSceneController {
 
     @Override
     protected void initialize() {
diff --git a/src/main/resources/github/weichware10/analyse/gui/App.fxml b/src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml
similarity index 92%
rename from src/main/resources/github/weichware10/analyse/gui/App.fxml
rename to src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml
index 0934499..915f61c 100644
--- a/src/main/resources/github/weichware10/analyse/gui/App.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml
@@ -3,7 +3,7 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.BorderPane?>
 
-<BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.AppController">
+<BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginWindowController">
    <center>
       <Label text="Analyse Platzhalter" />
    </center>

From a6332012ba2a6328841dcd1e671e8ae6ede56f48 Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 12:28:04 +0100
Subject: [PATCH 09/87] [feat] LoginWindow done

---
 .../java/github/weichware10/analyse/Main.java |  4 +-
 .../github/weichware10/analyse/gui/Login.java | 48 +++++++++++++++++++
 .../analyse/gui/LoginController.java          | 45 +++++++++++++++++
 .../weichware10/analyse/gui/LoginWindow.java  | 27 -----------
 .../analyse/gui/LoginWindowController.java    | 14 ------
 .../github/weichware10/analyse/gui/Login.fxml | 30 ++++++++++++
 .../weichware10/analyse/gui/LoginWindow.fxml  | 10 ----
 7 files changed, 125 insertions(+), 53 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/Login.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/LoginController.java
 delete mode 100644 src/main/java/github/weichware10/analyse/gui/LoginWindow.java
 delete mode 100644 src/main/java/github/weichware10/analyse/gui/LoginWindowController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/Login.fxml
 delete mode 100644 src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 6b0706a..d8af251 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,6 +1,6 @@
 package github.weichware10.analyse;
 
-import github.weichware10.analyse.gui.LoginWindow;
+import github.weichware10.analyse.gui.Login;
 import javafx.application.Application;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
@@ -19,7 +19,7 @@ public static void main(String[] args) {
     @Override
     public void start(Stage primaryStage) throws Exception {
         Main.primaryStage = primaryStage;
-        LoginWindow.start();
+        Login.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
         primaryStage.show();
     }
diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
new file mode 100644
index 0000000..717a88a
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -0,0 +1,48 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.Logger;
+import github.weichware10.util.db.DataBaseClient;
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.scene.Parent;
+
+/**
+ * Der Hauptbildschirm der App.
+ */
+public class Login extends AbsScene {
+    public static DataBaseClient dataBaseClient;
+
+    private static Parent root;
+
+    /**
+     * Startet die App.
+     */
+    public static void start() {
+        root = start(Main.primaryStage,
+                Login.class.getResource("Login.fxml"),
+                root,
+                "Analyse",
+                MainMenuBar.getMenuBar(),
+                300,
+                300);
+    }
+
+    /**
+     * Stellt die Verbindung zur Datenbank her.
+     */
+    public static void connectToDatabase(String username, String password, String schema) {
+        try {
+            Dotenv dotenv = Dotenv.load();
+            String url = dotenv.get("DB_URL");
+            dataBaseClient = new DataBaseClient(url, username, password, schema);
+        } catch (IllegalArgumentException e) {
+            Logger.error("error when loading env", e);
+            // auf null setzen, falls die Verbindung vorher angepasst wurde und dies
+            // gewünscht ist
+            // zurücksetzen auf dataBaseClient-freien Zustand
+            dataBaseClient = null;
+        }
+    }
+
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/LoginController.java b/src/main/java/github/weichware10/analyse/gui/LoginController.java
new file mode 100644
index 0000000..36643ac
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/LoginController.java
@@ -0,0 +1,45 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import javafx.fxml.FXML;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+/**
+ * Controller für {@link Login}.
+ */
+public class LoginController extends AbsSceneController {
+
+    @FXML
+    private TextField benutzernameId;
+
+    @FXML
+    private PasswordField passwortId;
+
+    @FXML
+    private TextField schemaId;
+
+    @Override
+    protected void initialize() {
+        assert benutzernameId != null
+        : "fx:id=\"benutzernameID\" was not injected: check your FXML file 'LoginWindow.fxml'.";
+        assert passwortId != null
+        : "fx:id=\"passwortID\" was not injected: check your FXML file 'LoginWindow.fxml'.";
+        assert schemaId != null
+        : "fx:id=\"schemaID\" was not injected: check your FXML file 'LoginWindow.fxml'.";
+    }
+
+    @FXML
+    private void loginToDatabase() {
+        Login.connectToDatabase(benutzernameId.getText(),
+                                      passwortId.getText(),
+                                      schemaId.getText());
+    }
+
+    @FXML
+    private void closeProgramm() {
+        Main.primaryStage.close();
+    }
+
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/LoginWindow.java b/src/main/java/github/weichware10/analyse/gui/LoginWindow.java
deleted file mode 100644
index 63cd0d3..0000000
--- a/src/main/java/github/weichware10/analyse/gui/LoginWindow.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package github.weichware10.analyse.gui;
-
-import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsScene;
-import javafx.scene.Parent;
-
-/**
- * Der Hauptbildschirm der App.
- */
-public class LoginWindow extends AbsScene {
-
-    private static Parent root;
-
-    /**
-     * Startet die App.
-     */
-    public static void start() {
-        root = start(Main.primaryStage,
-                LoginWindow.class.getResource("LoginWindow.fxml"),
-                root,
-                "Analyse",
-                MainMenuBar.getMenuBar(),
-                300,
-                300);
-    }
-
-}
diff --git a/src/main/java/github/weichware10/analyse/gui/LoginWindowController.java b/src/main/java/github/weichware10/analyse/gui/LoginWindowController.java
deleted file mode 100644
index 1b584b1..0000000
--- a/src/main/java/github/weichware10/analyse/gui/LoginWindowController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package github.weichware10.analyse.gui;
-
-import github.weichware10.analyse.gui.util.AbsSceneController;
-
-/**
- * Controller für {@link LoginWindow}.
- */
-public class LoginWindowController extends AbsSceneController {
-
-    @Override
-    protected void initialize() {
-        ; // nothing yet
-    }
-}
diff --git a/src/main/resources/github/weichware10/analyse/gui/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
new file mode 100644
index 0000000..54cb614
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginController">
+   <center>
+      <VBox alignment="CENTER" prefHeight="200.0" prefWidth="200.0" spacing="10.0" BorderPane.alignment="CENTER">
+         <children>
+            <TextField fx:id="benutzernameId" promptText="Benutzername" />
+            <PasswordField fx:id="passwortId" promptText="Passwort" />
+            <TextField fx:id="schemaId" promptText="Schema" text="public" />
+            <HBox alignment="CENTER" spacing="20.0">
+               <children>
+                  <Button fx:id="loginButtonId" mnemonicParsing="false" onAction="#loginToDatabase" text="Login" />
+                <Button fx:id="beendenButtonId" alignment="CENTER_RIGHT" mnemonicParsing="false" onAction="#closeProgramm" text="Beenden" />
+               </children>
+            </HBox>
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </VBox>
+   </center>
+</BorderPane>
diff --git a/src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml b/src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml
deleted file mode 100644
index 915f61c..0000000
--- a/src/main/resources/github/weichware10/analyse/gui/LoginWindow.fxml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.BorderPane?>
-
-<BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginWindowController">
-   <center>
-      <Label text="Analyse Platzhalter" />
-   </center>
-</BorderPane>

From 76714d8e4b4c511ddd175c4ee1e445193f871f23 Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 12:50:55 +0100
Subject: [PATCH 10/87] =?UTF-8?q?[Style]=20Min=20Breite=20und=20H=C3=B6he?=
 =?UTF-8?q?=20vom=20Fenster=20fest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/github/weichware10/analyse/Main.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index d8af251..b6ecb01 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -21,6 +21,9 @@ public void start(Stage primaryStage) throws Exception {
         Main.primaryStage = primaryStage;
         Login.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
+        // FENSTERGRÖẞE
+        primaryStage.setMinHeight(300);
+        primaryStage.setMinWidth(300);
         primaryStage.show();
     }
 }

From 1ae595cb3815b6e84263624bf1b2695526ebae4f Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:35:40 +0100
Subject: [PATCH 11/87] [feat] MenuBar erstellt

Co-authored-by: Joshua Jeschek <joshuajeschek@users.noreply.github.com>
---
 .../github/weichware10/analyse/gui/Login.java | 49 ++++++++++++---
 .../analyse/gui/LoginController.java          | 25 +++++---
 .../weichware10/analyse/gui/MainMenuBar.java  | 20 +++++++
 .../analyse/gui/MainMenuBarController.java    | 59 +++++++++++++++++++
 .../analyse/gui/util/AbsScene.java            |  7 ++-
 .../github/weichware10/analyse/gui/Login.fxml | 34 ++++++++++-
 .../weichware10/analyse/gui/MainMenuBar.fxml  | 13 ++--
 7 files changed, 178 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java

diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index 717a88a..dd907e7 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -5,13 +5,23 @@
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
 import io.github.cdimascio.dotenv.Dotenv;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
+import javafx.scene.control.TextArea;
+import javafx.scene.layout.Region;
+import javafx.scene.text.Text;
+import javafx.stage.Screen;
 
 /**
  * Der Hauptbildschirm der App.
  */
 public class Login extends AbsScene {
     public static DataBaseClient dataBaseClient;
+    private static SimpleBooleanProperty connection = new SimpleBooleanProperty(false);
+    public static ObservableBooleanValue hasConnection = connection;
+    public static String databaseUrl;
 
     private static Parent root;
 
@@ -19,29 +29,50 @@ public class Login extends AbsScene {
      * Startet die App.
      */
     public static void start() {
+        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
         root = start(Main.primaryStage,
                 Login.class.getResource("Login.fxml"),
                 root,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
-                300,
-                300);
+                (int) screenBounds.getWidth() / 2,
+                (int) screenBounds.getHeight() / 2);
+    }
+
+    /**
+     * Loggt den Nutzer aus und kehrt zum Login-Bildschirm zurück.
+     */
+    public static void logOut() {
+        dataBaseClient = null;
+        connection.set(false);
+        start();
     }
 
     /**
      * Stellt die Verbindung zur Datenbank her.
      */
-    public static void connectToDatabase(String username, String password, String schema) {
-        try {
+    public static void connectToDatabase(String username, String password, String schema,
+            Text warnText, TextArea errorText) {
+        if (databaseUrl == null) {
             Dotenv dotenv = Dotenv.load();
-            String url = dotenv.get("DB_URL");
-            dataBaseClient = new DataBaseClient(url, username, password, schema);
+            databaseUrl = dotenv.get("DB_URL");
+        }
+        try {
+            dataBaseClient = new DataBaseClient(databaseUrl, username, password, schema);
+            connection.set(true);
+            warnText.setVisible(false);
+            errorText.setVisible(false);
+            errorText.setText("");
         } catch (IllegalArgumentException e) {
             Logger.error("error when loading env", e);
-            // auf null setzen, falls die Verbindung vorher angepasst wurde und dies
-            // gewünscht ist
-            // zurücksetzen auf dataBaseClient-freien Zustand
             dataBaseClient = null;
+            connection.set(false);
+            warnText.setVisible(true);
+            errorText.setVisible(true);
+            warnText.setText("Couldn't log into database");
+            errorText.setText(e.getMessage());
+            errorText.setPrefHeight(50);
+            errorText.setPrefWidth(Region.USE_COMPUTED_SIZE);
         }
     }
 
diff --git a/src/main/java/github/weichware10/analyse/gui/LoginController.java b/src/main/java/github/weichware10/analyse/gui/LoginController.java
index 36643ac..f7f1d12 100644
--- a/src/main/java/github/weichware10/analyse/gui/LoginController.java
+++ b/src/main/java/github/weichware10/analyse/gui/LoginController.java
@@ -4,7 +4,9 @@
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import javafx.fxml.FXML;
 import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
+import javafx.scene.text.Text;
 
 /**
  * Controller für {@link Login}.
@@ -13,33 +15,40 @@ public class LoginController extends AbsSceneController {
 
     @FXML
     private TextField benutzernameId;
-
     @FXML
     private PasswordField passwortId;
-
     @FXML
     private TextField schemaId;
+    @FXML
+    private Text warnText;
+    @FXML
+    private TextArea errorText;
 
     @Override
     protected void initialize() {
         assert benutzernameId != null
-        : "fx:id=\"benutzernameID\" was not injected: check your FXML file 'LoginWindow.fxml'.";
+                : "fx:id=\"benutzernameID\" not injected: check 'LoginWindow.fxml'.";
         assert passwortId != null
-        : "fx:id=\"passwortID\" was not injected: check your FXML file 'LoginWindow.fxml'.";
+                : "fx:id=\"passwortID\" not injected: check 'LoginWindow.fxml'.";
         assert schemaId != null
-        : "fx:id=\"schemaID\" was not injected: check your FXML file 'LoginWindow.fxml'.";
+                : "fx:id=\"schemaID\" not injected: check 'LoginWindow.fxml'.";
+        assert warnText != null
+                : "fx:id=\"warnText\" not injected: check 'LoginWindow.fxml'.";
+        assert errorText != null
+                : "fx:id=\"errorText\" not injected: check 'LoginWindow.fxml'.";
     }
 
     @FXML
     private void loginToDatabase() {
         Login.connectToDatabase(benutzernameId.getText(),
-                                      passwortId.getText(),
-                                      schemaId.getText());
+                passwortId.getText(),
+                schemaId.getText(),
+                warnText,
+                errorText);
     }
 
     @FXML
     private void closeProgramm() {
         Main.primaryStage.close();
     }
-
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
index a9f511b..6186e47 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
@@ -1,6 +1,11 @@
 package github.weichware10.analyse.gui;
 
 import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.Logger;
+import java.awt.Desktop;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import javafx.scene.control.MenuBar;
 
 /**
@@ -21,4 +26,19 @@ public static MenuBar getMenuBar() {
         }
         return root;
     }
+
+    /**
+     * öffnet die Dokumentation im Browser.
+     */
+    protected static void openDocs() {
+        if (Desktop.isDesktopSupported()
+                && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+            try {
+                //TODO: Dokumentation richtig setzt bei help drücken
+                Desktop.getDesktop().browse(new URI("https://weichware10.github.io/dokumente/"));
+            } catch (IOException | URISyntaxException e) {
+                Logger.error("error occured while opening documentation", e);
+            }
+        }
+    }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
new file mode 100644
index 0000000..c06fb85
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
@@ -0,0 +1,59 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.Logger;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.fxml.FXML;
+import javafx.scene.control.MenuItem;
+
+/**
+ * Controller für {@link MainMenuBar}.
+ */
+public class MainMenuBarController extends AbsSceneController {
+    @FXML
+    private MenuItem databaseChange;
+
+    @FXML
+    private MenuItem databaseUrlReset;
+
+    @FXML
+    private MenuItem logOutMenu;
+
+    @FXML
+    void logOut() {
+        Logger.info(":menubar Logging out");
+        Login.logOut();
+    }
+
+    private void setLogOutDisable(ObservableBooleanValue obs) {
+        logOutMenu.setDisable(!(obs.get()));
+    }
+
+    @FXML
+    public void openDocumentation() {
+        Logger.info(":menubar Opening Docs");
+        MainMenuBar.openDocs();
+    }
+
+    @FXML
+    protected static void resetDataBaseUrl() {
+        Login.databaseUrl = null;
+    }
+
+    @FXML
+    protected static void setDataBaseUrl() {
+
+    }
+
+    @Override
+    protected void initialize() {
+        assert databaseChange != null
+                : "fx:id=\"databaseChange\" not injected: check 'MainMenuBar.fxml'.";
+        assert databaseUrlReset != null
+                : "fx:id=\"databaseUrlReset\" not injected: check 'MainMenuBar.fxml'.";
+        assert logOutMenu != null
+                : "fx:id=\"logOutMenu\" not injected: check 'MainMenuBar.fxml'.";
+
+        Login.hasConnection.addListener(obs -> setLogOutDisable((ObservableBooleanValue) obs));
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
index 3d7463b..222d646 100644
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
@@ -77,7 +77,12 @@ public static Parent start(Stage primaryStage, URL fxml, Parent root,
             primaryStage.setHeight(height);
         }
         // auf primaryStage setzen
-        primaryStage.setScene(new Scene(root));
+        Scene existingScene = root.getScene();
+        if (existingScene != null) {
+            primaryStage.setScene(existingScene);
+        } else {
+            primaryStage.setScene(new Scene(root));
+        }
         primaryStage.setTitle(title);
         return root;
     }
diff --git a/src/main/resources/github/weichware10/analyse/gui/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
index 54cb614..8efd169 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Login.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
@@ -3,18 +3,46 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
 
 <BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginController">
    <center>
       <VBox alignment="CENTER" prefHeight="200.0" prefWidth="200.0" spacing="10.0" BorderPane.alignment="CENTER">
          <children>
-            <TextField fx:id="benutzernameId" promptText="Benutzername" />
-            <PasswordField fx:id="passwortId" promptText="Passwort" />
-            <TextField fx:id="schemaId" promptText="Schema" text="public" />
+            <GridPane hgap="10.0" vgap="10.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <TextField fx:id="benutzernameId" prefHeight="25.0" prefWidth="92.0" promptText="Benutzername" GridPane.columnIndex="1" />
+                  <PasswordField fx:id="passwortId" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <TextField fx:id="schemaId" promptText="Schema" text="public" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+               </children>
+               <VBox.margin>
+                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+               </VBox.margin>
+            </GridPane>
+            <VBox alignment="CENTER">
+               <children>
+                  <Text fx:id="warnText" fill="#da3633" strokeType="OUTSIDE" strokeWidth="0.0" />
+                  <TextArea fx:id="errorText" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="0.0" prefWidth="0.0" visible="false" />
+               </children>
+            </VBox>
             <HBox alignment="CENTER" spacing="20.0">
                <children>
                   <Button fx:id="loginButtonId" mnemonicParsing="false" onAction="#loginToDatabase" text="Login" />
diff --git a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
index 7f18901..3ab29e6 100644
--- a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
@@ -4,21 +4,18 @@
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
 
-<MenuBar xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17">
+<MenuBar xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.MainMenuBarController">
   <menus>
     <Menu mnemonicParsing="false" text="File">
       <items>
-        <MenuItem mnemonicParsing="false" text="Close" />
-      </items>
-    </Menu>
-    <Menu mnemonicParsing="false" text="Edit">
-      <items>
-        <MenuItem mnemonicParsing="false" text="Delete" />
+            <MenuItem fx:id="databaseChange" mnemonicParsing="false" onAction="#setDataBaseUrl" text="Datenbank ändern" />
+            <MenuItem fx:id="databaseUrlReset" mnemonicParsing="false" text="Datenbank URL reset" />
+        <MenuItem fx:id="logOutMenu" disable="true" mnemonicParsing="false" onAction="#logOut" text="Ausloggen" />
       </items>
     </Menu>
     <Menu mnemonicParsing="false" text="Help">
       <items>
-        <MenuItem mnemonicParsing="false" text="About" />
+        <MenuItem mnemonicParsing="false" onAction="#openDocumentation" text="About" />
       </items>
     </Menu>
   </menus>

From f266dccebcbaa94912f5d89cdb14730baebd1363 Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:48:43 +0100
Subject: [PATCH 12/87] =?UTF-8?q?[style]=20Kommentar=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/github/weichware10/analyse/gui/Login.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index dd907e7..496d9e9 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -15,7 +15,7 @@
 import javafx.stage.Screen;
 
 /**
- * Der Hauptbildschirm der App.
+ * Der Loginbildschirm der App.
  */
 public class Login extends AbsScene {
     public static DataBaseClient dataBaseClient;

From 78eb7964bcf7779c9b0ec8830703108f8e72cd8b Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:55:55 +0100
Subject: [PATCH 13/87] [fix] OnAction von setUrl vorerst rausgenommen

---
 .../weichware10/analyse/gui/MainMenuBarController.java |  2 +-
 .../weichware10/analyse/gui/FunctionChooser.fxml       | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml

diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
index c06fb85..ba051c9 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
@@ -42,7 +42,7 @@ protected static void resetDataBaseUrl() {
 
     @FXML
     protected static void setDataBaseUrl() {
-
+        ;
     }
 
     @Override
diff --git a/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
new file mode 100644
index 0000000..c47ae9f
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.FunctionChooser">
+   <center>
+      <HBox prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+   </center>
+</BorderPane>

From a402cbcaeccd3de16bad87846f45823e9fa3cb64 Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:57:16 +0100
Subject: [PATCH 14/87] =?UTF-8?q?[fix]=20Erg=C3=A4nzung=20zum=20vorherigen?=
 =?UTF-8?q?=20+=20Basic=20Function...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analyse/gui/FunctionChooser.java          | 28 +++++++++++++++++++
 .../gui/FunctionChooserController.java        | 14 ++++++++++
 .../weichware10/analyse/gui/MainMenuBar.fxml  |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java

diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java b/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
new file mode 100644
index 0000000..2f38db4
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
@@ -0,0 +1,28 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.Parent;
+import javafx.stage.Screen;
+
+/**
+ * Der Auswahlbildschirm der App.
+ */
+public class FunctionChooser extends AbsScene {
+    private static Parent root;
+
+    /**
+     * Startet die App.
+     */
+    public static void start() {
+        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
+        root = start(Main.primaryStage,
+                Login.class.getResource("FunctionChooser.fxml"),
+                root,
+                "Analyse",
+                MainMenuBar.getMenuBar(),
+                (int) screenBounds.getWidth() / 2,
+                (int) screenBounds.getHeight() / 2);
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
new file mode 100644
index 0000000..1f7b9a8
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
@@ -0,0 +1,14 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+
+/**
+ * Controller für {@link FunctionChooser}.
+ */
+public class FunctionChooserController extends AbsSceneController {
+
+    @Override
+    protected void initialize() {
+        ;
+    }
+}
diff --git a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
index 3ab29e6..8713b5f 100644
--- a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
@@ -8,7 +8,7 @@
   <menus>
     <Menu mnemonicParsing="false" text="File">
       <items>
-            <MenuItem fx:id="databaseChange" mnemonicParsing="false" onAction="#setDataBaseUrl" text="Datenbank ändern" />
+            <MenuItem fx:id="databaseChange" mnemonicParsing="false" text="Datenbank ändern" />
             <MenuItem fx:id="databaseUrlReset" mnemonicParsing="false" text="Datenbank URL reset" />
         <MenuItem fx:id="logOutMenu" disable="true" mnemonicParsing="false" onAction="#logOut" text="Ausloggen" />
       </items>

From dc58b414001fd3e427ba3e9b501bf193e388b369 Mon Sep 17 00:00:00 2001
From: justinexner <92640370+justinexner@users.noreply.github.com>
Date: Sat, 8 Jan 2022 15:15:03 +0100
Subject: [PATCH 15/87] [feat] FunctionChooser Overlay done

---
 .../analyse/gui/FunctionChooserController.java   | 16 +++++++++++++++-
 .../github/weichware10/analyse/gui/Login.java    |  3 +++
 .../weichware10/analyse/gui/FunctionChooser.fxml | 16 ++++++++++++++--
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
index 1f7b9a8..af0b6fa 100644
--- a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
@@ -1,14 +1,28 @@
 package github.weichware10.analyse.gui;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.Logger;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 
 /**
  * Controller für {@link FunctionChooser}.
  */
 public class FunctionChooserController extends AbsSceneController {
+    @FXML
+    private Button adminButton;
+
+
+    @FXML
+    void logOut() {
+        Logger.info(":FunctionChooser Logging out");
+        Login.logOut();
+    }
 
     @Override
     protected void initialize() {
-        ;
+        assert adminButton != null
+        : "fx:id=\"adminButton\" was not injected: check your FXML file 'FunctionChooser.fxml'.";
+        adminButton.setDisable(!Login.dataBaseClient.permissions.isAdmin);
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index 496d9e9..ad10d14 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -74,6 +74,9 @@ public static void connectToDatabase(String username, String password, String sc
             errorText.setPrefHeight(50);
             errorText.setPrefWidth(Region.USE_COMPUTED_SIZE);
         }
+        if (dataBaseClient != null) {
+            FunctionChooser.start();
+        }
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
index c47ae9f..23ad623 100644
--- a/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.FunctionChooser">
+<BorderPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.FunctionChooserController">
    <center>
-      <HBox prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+      <VBox alignment="CENTER" BorderPane.alignment="CENTER">
+         <children>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
+               <children>
+                  <Button mnemonicParsing="false" text="Analyse" />
+                  <Button fx:id="adminButton" mnemonicParsing="false" text="Admin-Bereich" />
+               </children>
+            </HBox>
+            <Button mnemonicParsing="false" onAction="#logOut" text="LogOut" />
+         </children>
+      </VBox>
    </center>
 </BorderPane>

From 41b306fd4211a88b454dfb38fe506c02568e603e Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 8 Jan 2022 18:15:33 +0100
Subject: [PATCH 16/87] [feat] Log

---
 .../java/github/weichware10/analyse/Main.java | 14 +++
 .../analyse/gui/MainMenuBarController.java    | 26 ++++-
 .../weichware10/analyse/gui/util/Log.java     | 95 +++++++++++++++++++
 .../analyse/gui/util/LogController.java       | 75 +++++++++++++++
 .../weichware10/analyse/gui/MainMenuBar.fxml  |  4 +
 .../weichware10/analyse/gui/util/Log.fxml     | 52 ++++++++++
 template.env                                  |  2 +
 7 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/util/Log.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/util/LogController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/util/Log.fxml
 create mode 100644 template.env

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index b6ecb01..5f585e4 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,9 +1,13 @@
 package github.weichware10.analyse;
 
 import github.weichware10.analyse.gui.Login;
+import github.weichware10.analyse.gui.util.Log;
+import github.weichware10.util.Logger;
+import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
+import org.joda.time.DateTime;
 
 /**
  * Analyse GUI.
@@ -12,12 +16,22 @@ public class Main extends Application {
 
     public static Stage primaryStage;
 
+    /**
+     * Einstiegspunkt der Analyse.
+     *
+     * @param args - args
+     */
     public static void main(String[] args) {
+        // in Datei und Konsole loggen
+        String logfile = String.format(
+                Dotenv.load().get("LOGS") + "/%s.log", DateTime.now().toString("yMMdd-HHmmss"));
+        Logger.setLogfile(logfile);
         launch(args);
     }
 
     @Override
     public void start(Stage primaryStage) throws Exception {
+        Log.start();
         Main.primaryStage = primaryStage;
         Login.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
index ba051c9..1812b5f 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
@@ -1,6 +1,7 @@
 package github.weichware10.analyse.gui;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.fxml.FXML;
@@ -12,12 +13,12 @@
 public class MainMenuBarController extends AbsSceneController {
     @FXML
     private MenuItem databaseChange;
-
     @FXML
     private MenuItem databaseUrlReset;
-
     @FXML
     private MenuItem logOutMenu;
+    @FXML
+    private MenuItem logsMenu;
 
     @FXML
     void logOut() {
@@ -45,6 +46,24 @@ protected static void setDataBaseUrl() {
         ;
     }
 
+    @FXML
+    void toggleLogs() {
+        Logger.info("app:menu Toggling logs");
+        if (Log.visible.get()) {
+            Log.hide();
+        } else {
+            Log.show();
+        }
+    }
+
+    void setLogText(ObservableBooleanValue visible) {
+        if (visible.get()) {
+            logsMenu.setText("hide logs");
+        } else {
+            logsMenu.setText("show logs");
+        }
+    }
+
     @Override
     protected void initialize() {
         assert databaseChange != null
@@ -53,7 +72,10 @@ protected void initialize() {
                 : "fx:id=\"databaseUrlReset\" not injected: check 'MainMenuBar.fxml'.";
         assert logOutMenu != null
                 : "fx:id=\"logOutMenu\" not injected: check 'MainMenuBar.fxml'.";
+        assert logsMenu != null
+                : "fx:id=\"logsMenu\" not injected: check 'MainMenuBar.fxml'.";
 
         Login.hasConnection.addListener(obs -> setLogOutDisable((ObservableBooleanValue) obs));
+        Log.visible.addListener(obs -> setLogText((ObservableBooleanValue) obs));
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/util/Log.java b/src/main/java/github/weichware10/analyse/gui/util/Log.java
new file mode 100644
index 0000000..0420d4d
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/util/Log.java
@@ -0,0 +1,95 @@
+package github.weichware10.analyse.gui.util;
+
+import github.weichware10.util.Logger;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+
+/**
+ * Dialog zum Darstellen der Log Infos.
+ */
+public class Log {
+
+    private static Stage logStage;
+    // private static boolean visible = false;
+
+    private static SimpleBooleanProperty visibleProperty = new SimpleBooleanProperty(false);
+    public static ObservableBooleanValue visible = visibleProperty;
+
+    /**
+     * Startet das Log.
+     */
+    public static void start() {
+        FXMLLoader loader = new FXMLLoader(Log.class.getResource("Log.fxml"));
+
+        Parent root = null;
+        try {
+            root = loader.load();
+        } catch (Exception e) {
+            Logger.error("Error when loading main scene", e, true);
+            System.exit(-1);
+        }
+
+        Scene logScene = new Scene(root, 750, 500);
+        logStage = new Stage();
+        logStage.setScene(logScene);
+        logStage.setTitle("Toolbox - Log");
+        logStage.setMinHeight(500);
+        logStage.setMinWidth(550);
+        logStage.getIcons().add(new Image("app-icon.png"));
+        logStage.addEventFilter(WindowEvent.WINDOW_CLOSE_REQUEST, event -> {
+            hide();
+        });
+    }
+
+    public static boolean isVisible() {
+        return visible.get();
+    }
+
+    public static void show() {
+        logStage.show();
+        visibleProperty.set(true);
+    }
+
+    public static void hide() {
+        logStage.hide();
+        visibleProperty.set(false);
+    }
+
+    public static void close() {
+        logStage.close();
+    }
+
+    /**
+     * Loggt den Inhalt (falls vorhanden) mit dem gegebenen Typ.
+     *
+     * @param content - zu loggender Inhalt
+     * @param type - "DEBUG", "INFO", "WARN" oder "ERROR"
+     */
+    public static void log(String content, String type) {
+        if (content.length() == 0) {
+            return;
+        }
+        switch (type) {
+            case "DEBUG":
+                Logger.debug(content);
+                break;
+            case "INFO":
+                Logger.info(content);
+                break;
+            case "WARN":
+                Logger.warn(content);
+                break;
+            case "ERROR":
+                Logger.error(content);
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/LogController.java b/src/main/java/github/weichware10/analyse/gui/util/LogController.java
new file mode 100644
index 0000000..136c853
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/util/LogController.java
@@ -0,0 +1,75 @@
+package github.weichware10.analyse.gui.util;
+
+import github.weichware10.util.Logger;
+import java.net.URL;
+import java.util.ResourceBundle;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.Pane;
+
+/**
+ * Controller für {@link Log}.
+ */
+public class LogController {
+
+    @FXML
+    private ResourceBundle resources;
+    @FXML
+    private URL location;
+
+
+    @FXML
+    private TextField logInput;
+    @FXML
+    private TextArea logArea;
+    @FXML
+    private Pane logPane;
+    @FXML
+    private MenuButton logMenuButton;
+
+    @FXML
+    void initialize() {
+        assert logArea != null
+                : "fx:id=\"logArea\" not injected: check 'Log.fxml'.";
+        assert logPane != null
+                : "fx:id=\"logPane\" not injected: check 'Log.fxml'.";
+        assert logInput != null
+                : "fx:id=\"logInput\" not injected: check 'Log.fxml'.";
+        assert logMenuButton != null
+                : "fx:id=\"logMenuButton\" not injected: check 'Log.fxml'.";
+        logArea.minHeightProperty().bind(logPane.heightProperty());
+        logArea.minWidthProperty().bind(logPane.widthProperty());
+        Logger.setLogArea(logArea);
+    }
+
+    @FXML
+    void setLogType(ActionEvent event) {
+        Logger.info("log:content Setting log type");
+        // mit try/catch, da Abfrage nach Klasse von event.getSource() nicht gut funktioniert
+        try {
+            MenuItem type = (MenuItem) event.getSource();
+            logMenuButton.setText(type.getText());
+        } catch (Exception e) {
+            Logger.error("an error occured while changing the log type");
+        }
+    }
+
+    @FXML
+    void inputKeyPress(KeyEvent event) {
+        if (event.getCode() == KeyCode.ENTER) {
+            log();
+        }
+    }
+
+    @FXML
+    void log() {
+        Log.log(logInput.getText(), logMenuButton.getText());
+        logInput.clear();
+    }
+}
diff --git a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
index 8713b5f..7b4f5f5 100644
--- a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
@@ -3,6 +3,7 @@
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.SeparatorMenuItem?>
 
 <MenuBar xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.MainMenuBarController">
   <menus>
@@ -10,6 +11,9 @@
       <items>
             <MenuItem fx:id="databaseChange" mnemonicParsing="false" text="Datenbank ändern" />
             <MenuItem fx:id="databaseUrlReset" mnemonicParsing="false" text="Datenbank URL reset" />
+            <SeparatorMenuItem mnemonicParsing="false" />
+            <MenuItem fx:id="logsMenu" mnemonicParsing="false" onAction="#toggleLogs" text="show Logs" />
+            <SeparatorMenuItem mnemonicParsing="false" />
         <MenuItem fx:id="logOutMenu" disable="true" mnemonicParsing="false" onAction="#logOut" text="Ausloggen" />
       </items>
     </Menu>
diff --git a/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml b/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml
new file mode 100644
index 0000000..409ce17
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuButton?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.text.Font?>
+
+<BorderPane fx:id="borderPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.util.LogController">
+   <center>
+      <Pane fx:id="logPane">
+         <children>
+            <TextArea fx:id="logArea" editable="false" />
+         </children>
+         <BorderPane.margin>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </BorderPane.margin>
+      </Pane>
+   </center>
+   <top>
+      <Label text="LOGS" BorderPane.alignment="CENTER">
+         <font>
+            <Font name="System Bold" size="18.0" />
+         </font>
+      </Label>
+   </top>
+   <bottom>
+      <AnchorPane>
+         <children>
+            <MenuButton fx:id="logMenuButton" mnemonicParsing="false" prefWidth="75.0" text="DEBUG">
+              <items>
+                <MenuItem mnemonicParsing="false" onAction="#setLogType" text="DEBUG" />
+                <MenuItem mnemonicParsing="false" onAction="#setLogType" text="INFO" />
+                  <MenuItem mnemonicParsing="false" onAction="#setLogType" text="WARN" />
+                  <MenuItem mnemonicParsing="false" onAction="#setLogType" text="ERROR" />
+              </items>
+            </MenuButton>
+            <TextField fx:id="logInput" onKeyPressed="#inputKeyPress" promptText="log something..." AnchorPane.leftAnchor="85.0" AnchorPane.rightAnchor="44.0" />
+            <Button layoutX="149.0" mnemonicParsing="false" onAction="#log" text="log" AnchorPane.rightAnchor="0.0" />
+         </children>
+         <BorderPane.margin>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </BorderPane.margin>
+      </AnchorPane>
+   </bottom>
+</BorderPane>
diff --git a/template.env b/template.env
new file mode 100644
index 0000000..97ab2fe
--- /dev/null
+++ b/template.env
@@ -0,0 +1,2 @@
+DB_URL=...
+LOGS=...

From 18631c8dca18676aa8c4b5d9a9ad59a5f23e3cbd Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 8 Jan 2022 18:31:37 +0100
Subject: [PATCH 17/87] =?UTF-8?q?[feat]=20sch=C3=B6nerer=20Login-Screen=20?=
 =?UTF-8?q?(finde=20ich)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/weichware10/analyse/gui/Login.fxml | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/github/weichware10/analyse/gui/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
index 8efd169..0eda286 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Login.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
@@ -2,6 +2,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
@@ -13,28 +14,36 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<BorderPane xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginController">
+<BorderPane prefHeight="500.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginController">
    <center>
       <VBox alignment="CENTER" prefHeight="200.0" prefWidth="200.0" spacing="10.0" BorderPane.alignment="CENTER">
          <children>
-            <GridPane hgap="10.0" vgap="10.0">
+            <Label text="Bitte loggen Sie sich ein." />
+            <GridPane>
                <columnConstraints>
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                   <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
                   <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                </columnConstraints>
                <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                </rowConstraints>
                <children>
-                  <TextField fx:id="benutzernameId" prefHeight="25.0" prefWidth="92.0" promptText="Benutzername" GridPane.columnIndex="1" />
-                  <PasswordField fx:id="passwortId" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                  <TextField fx:id="schemaId" promptText="Schema" text="public" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <Label text="Benutzername" GridPane.columnIndex="1" />
+                  <TextField fx:id="benutzernameId" prefHeight="25.0" prefWidth="92.0" promptText="Benutzername" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <Label text="Schema" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <PasswordField fx:id="passwortId" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Label text="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <TextField fx:id="schemaId" promptText="Schema" text="public" GridPane.columnIndex="1" GridPane.rowIndex="5" />
                </children>
                <VBox.margin>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                  <Insets bottom="10.0" left="10.0" right="10.0" />
                </VBox.margin>
             </GridPane>
             <VBox alignment="CENTER">
@@ -55,4 +64,11 @@
          </padding>
       </VBox>
    </center>
+   <bottom>
+      <Label alignment="CENTER" contentDisplay="CENTER" text="die URL der Datenbank kann über die Menüleiste geändert werden." textAlignment="CENTER" wrapText="true" BorderPane.alignment="CENTER">
+         <BorderPane.margin>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </BorderPane.margin>
+      </Label>
+   </bottom>
 </BorderPane>

From ff2d0fb3c00775384864ac136788e555c49c8924 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 8 Jan 2022 18:53:46 +0100
Subject: [PATCH 18/87] =?UTF-8?q?[feat]=20Lader=C3=A4dchen=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/weichware10/analyse/gui/Login.java | 54 +++++++++++++------
 .../analyse/gui/LoginController.java          | 10 +++-
 .../github/weichware10/analyse/gui/Login.fxml | 15 ++++--
 3 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index ad10d14..20f413a 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -5,10 +5,12 @@
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
 import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
+import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.Region;
 import javafx.scene.text.Text;
@@ -52,30 +54,52 @@ public static void logOut() {
      * Stellt die Verbindung zur Datenbank her.
      */
     public static void connectToDatabase(String username, String password, String schema,
-            Text warnText, TextArea errorText) {
-        if (databaseUrl == null) {
-            Dotenv dotenv = Dotenv.load();
-            databaseUrl = dotenv.get("DB_URL");
-        }
-        try {
-            dataBaseClient = new DataBaseClient(databaseUrl, username, password, schema);
-            connection.set(true);
+            Text warnText, TextArea errorText, ProgressIndicator indicator) {
+        setError(warnText, errorText, indicator, true, null);
+
+        Thread loginThread = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                if (databaseUrl == null) {
+                    Dotenv dotenv = Dotenv.load();
+                    databaseUrl = dotenv.get("DB_URL");
+                }
+                try {
+                    dataBaseClient = new DataBaseClient(databaseUrl, username, password, schema);
+                    connection.set(true);
+                    Platform.runLater(() -> setError(warnText, errorText, indicator, false, null));
+                } catch (IllegalArgumentException e) {
+                    Logger.error("login:content error when loggin in", e);
+                    dataBaseClient = null;
+                    connection.set(false);
+                    Platform.runLater(() -> setError(warnText, errorText, indicator, false, e));
+                }
+                if (dataBaseClient != null) {
+                    Platform.runLater(() -> FunctionChooser.start());
+                }
+            }
+        });
+        loginThread.start();
+    }
+
+    private static void setError(Text warnText, TextArea errorText,
+            ProgressIndicator indicator, boolean loading, Exception e) {
+        if (e == null) {
             warnText.setVisible(false);
             errorText.setVisible(false);
             errorText.setText("");
-        } catch (IllegalArgumentException e) {
-            Logger.error("error when loading env", e);
-            dataBaseClient = null;
-            connection.set(false);
+            if (indicator != null) {
+                indicator.setVisible(loading);
+            }
+        } else {
             warnText.setVisible(true);
             errorText.setVisible(true);
             warnText.setText("Couldn't log into database");
             errorText.setText(e.getMessage());
             errorText.setPrefHeight(50);
             errorText.setPrefWidth(Region.USE_COMPUTED_SIZE);
-        }
-        if (dataBaseClient != null) {
-            FunctionChooser.start();
+            indicator.setVisible(loading);
         }
     }
 
diff --git a/src/main/java/github/weichware10/analyse/gui/LoginController.java b/src/main/java/github/weichware10/analyse/gui/LoginController.java
index f7f1d12..a0c76b2 100644
--- a/src/main/java/github/weichware10/analyse/gui/LoginController.java
+++ b/src/main/java/github/weichware10/analyse/gui/LoginController.java
@@ -4,6 +4,7 @@
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import javafx.fxml.FXML;
 import javafx.scene.control.PasswordField;
+import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.text.Text;
@@ -23,6 +24,8 @@ public class LoginController extends AbsSceneController {
     private Text warnText;
     @FXML
     private TextArea errorText;
+    @FXML
+    private ProgressIndicator indicator;
 
     @Override
     protected void initialize() {
@@ -35,7 +38,9 @@ protected void initialize() {
         assert warnText != null
                 : "fx:id=\"warnText\" not injected: check 'LoginWindow.fxml'.";
         assert errorText != null
-                : "fx:id=\"errorText\" not injected: check 'LoginWindow.fxml'.";
+                        : "fx:id=\"errorText\" not injected: check 'LoginWindow.fxml'.";
+        assert indicator != null
+                        : "fx:id=\"loadingIndicator\" not injected: check 'Login.fxml'.";
     }
 
     @FXML
@@ -44,7 +49,8 @@ private void loginToDatabase() {
                 passwortId.getText(),
                 schemaId.getText(),
                 warnText,
-                errorText);
+                errorText,
+                indicator);
     }
 
     @FXML
diff --git a/src/main/resources/github/weichware10/analyse/gui/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
index 0eda286..eca73e7 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Login.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
@@ -11,6 +12,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
@@ -46,12 +48,17 @@
                   <Insets bottom="10.0" left="10.0" right="10.0" />
                </VBox.margin>
             </GridPane>
-            <VBox alignment="CENTER">
+            <StackPane>
                <children>
-                  <Text fx:id="warnText" fill="#da3633" strokeType="OUTSIDE" strokeWidth="0.0" />
-                  <TextArea fx:id="errorText" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="0.0" prefWidth="0.0" visible="false" />
+                  <ProgressIndicator fx:id="indicator" focusTraversable="false" maxHeight="20.0" maxWidth="20.0" minHeight="20.0" minWidth="20.0" prefHeight="20.0" prefWidth="20.0" visible="false" />
+                  <VBox alignment="CENTER">
+                     <children>
+                        <Text fx:id="warnText" fill="#da3633" strokeType="OUTSIDE" strokeWidth="0.0" />
+                        <TextArea fx:id="errorText" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="0.0" prefWidth="0.0" visible="false" />
+                     </children>
+                  </VBox>
                </children>
-            </VBox>
+            </StackPane>
             <HBox alignment="CENTER" spacing="20.0">
                <children>
                   <Button fx:id="loginButtonId" mnemonicParsing="false" onAction="#loginToDatabase" text="Login" />

From c8bdec4515ce21f491bcc8211684fda660ec7a4b Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 8 Jan 2022 20:48:01 +0100
Subject: [PATCH 19/87] [docs] falscher Kommentar

---
 src/main/java/github/weichware10/analyse/gui/util/AbsScene.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
index 222d646..a671ce5 100644
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
@@ -18,7 +18,7 @@ public abstract class AbsScene {
      * lädt die Szene intern und gibt die root-Instanz zurück.
      *
      * @param fxml - URL der FXML-Datei
-     * @return das Controller-Objekt.
+     * @return das geladene Parent Objekt.
      */
     protected static Parent initialize(URL fxml) {
 

From 3c19ee8e6401acbfe69cf695bd03f2371d13f88b Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 8 Jan 2022 21:07:15 +0100
Subject: [PATCH 20/87] [feat] TrialSelector (activate by pressing ctrl+K)

---
 .../java/github/weichware10/analyse/Main.java | 10 +++
 .../analyse/gui/TrialSelector.java            | 32 ++++++++
 .../analyse/gui/TrialSelectorController.java  | 78 +++++++++++++++++++
 .../analyse/gui/TrialSelector.fxml            | 56 +++++++++++++
 4 files changed, 176 insertions(+)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/TrialSelector.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 5f585e4..a5d2675 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,11 +1,14 @@
 package github.weichware10.analyse;
 
 import github.weichware10.analyse.gui.Login;
+import github.weichware10.analyse.gui.TrialSelector;
 import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.scene.image.Image;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
 import org.joda.time.DateTime;
 
@@ -39,5 +42,12 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.setMinHeight(300);
         primaryStage.setMinWidth(300);
         primaryStage.show();
+        primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, e -> keyBindings(e));
+    }
+
+    private void keyBindings(KeyEvent keyEvent) {
+        if (keyEvent.getCode().equals(KeyCode.K) && keyEvent.isControlDown()) {
+            TrialSelector.getTrialId();
+        }
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
new file mode 100644
index 0000000..590b4f2
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -0,0 +1,32 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsScene;
+import java.util.Optional;
+
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.layout.BorderPane;
+
+public class TrialSelector extends AbsScene {
+
+    private static BorderPane root;
+
+    public static String getTrialId() {
+
+        Dialog<String> selectorDialog = new Dialog<>();
+        selectorDialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL);
+
+        if (root == null) {
+            root = (BorderPane) initialize(TrialSelector.class.getResource("TrialSelector.fxml"));
+        }
+        selectorDialog.getDialogPane().setContent(root);
+
+        Optional<String> optResult = selectorDialog.showAndWait();
+
+        if (optResult.isPresent()) {
+            return optResult.get();
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
new file mode 100644
index 0000000..41f3f6c
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
@@ -0,0 +1,78 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.analyse.gui.util.Log;
+import github.weichware10.util.Logger;
+import github.weichware10.util.ToolType;
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+
+public class TrialSelectorController extends AbsSceneController {
+
+    private final int minAmount = 1;
+    private final int maxAmount = 100;
+
+    @FXML
+    private ComboBox<Integer> amountBox;
+    @FXML
+    private TextField configIdField;
+    @FXML
+    private DatePicker endPicker;
+    @FXML
+    private TableView<?> resultTable;
+    @FXML
+    private DatePicker startPicker;
+    @FXML
+    private ComboBox<ToolType> toolTypeBox;
+
+    @FXML
+    private void checkAmountInput() {
+        Integer value;
+        try {
+            value = Integer.valueOf(amountBox.getEditor().getText());
+        } catch (NumberFormatException e) {
+            value = null;
+        }
+        if (value == null) {
+            amountBox.setValue(minAmount);
+        } else if (value > maxAmount) {
+            amountBox.setValue(maxAmount);
+        } else if (value < minAmount) {
+            amountBox.setValue(minAmount);
+        }
+    }
+
+    private void initAmountBox() {
+        for (Integer i = minAmount; i <= maxAmount; i++) {
+            amountBox.getItems().add(i);
+        }
+    }
+
+    private void initToolTypeBox() {
+        for (ToolType toolType : ToolType.values()) {
+            toolTypeBox.getItems().add(toolType);
+        }
+    }
+
+    @Override
+    protected void initialize() {
+        assert amountBox != null
+                : "fx:id=\"amountBox\" not injected: check 'TrialSelector.fxml'.";
+        assert configIdField != null
+                : "fx:id=\"configIdField\" not injected: check 'TrialSelector.fxml'.";
+        assert endPicker != null
+                : "fx:id=\"endPicker\" not injected: check 'TrialSelector.fxml'.";
+        assert resultTable != null
+                : "fx:id=\"resultTable\" not injected: check 'TrialSelector.fxml'.";
+        assert startPicker != null
+                : "fx:id=\"startPicker\" not injected: check 'TrialSelector.fxml'.";
+        assert toolTypeBox != null
+                : "fx:id=\"toolTypeBox\" not injected: check 'TrialSelector.fxml'.";
+        initAmountBox();
+        initToolTypeBox();
+    }
+
+}
diff --git a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
new file mode 100644
index 0000000..abf6ce3
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.DatePicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+
+<BorderPane prefHeight="700.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.TrialSelectorController">
+   <center>
+      <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+         <children>
+            <HBox alignment="CENTER_LEFT" spacing="10.0">
+               <children>
+                  <Label text="Bitte filtern Sie die Versuchsliste, um Ergebnisse zu finden." HBox.hgrow="ALWAYS" />
+                  <HBox alignment="CENTER_RIGHT" fillHeight="false" spacing="10.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <ComboBox fx:id="amountBox" editable="true" onAction="#checkAmountInput" onKeyPressed="#checkAmountInput" prefWidth="150.0" promptText="Anzahl" />
+                        <Button mnemonicParsing="false" text="Suchen" />
+                     </children>
+                  </HBox>
+               </children>
+            </HBox>
+            <HBox spacing="10.0">
+               <children>
+                  <TextField fx:id="configIdField" promptText="Konfigurations-ID" />
+                  <ComboBox fx:id="toolTypeBox" prefWidth="150.0" promptText="Tool-Typ" />
+                  <DatePicker fx:id="startPicker" promptText="Start-Datum" />
+                  <DatePicker fx:id="endPicker" promptText="End-Datum" />
+               </children>
+            </HBox>
+            <TableView fx:id="resultTable" focusTraversable="false" prefHeight="200.0" prefWidth="200.0">
+              <columns>
+                <TableColumn editable="false" prefWidth="75.0" text="Versuchs-ID" />
+                <TableColumn prefWidth="75.0" text="Konfigurations-ID" />
+                  <TableColumn prefWidth="75.0" text="Zeit" />
+                  <TableColumn prefWidth="75.0" text="Antwort" />
+              </columns>
+               <columnResizePolicy>
+                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+               </columnResizePolicy>
+            </TableView>
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </VBox>
+   </center>
+</BorderPane>

From b6b85d5e133e49527fb28f1603c60c6bd5ff30f5 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 8 Jan 2022 22:46:41 +0100
Subject: [PATCH 21/87] [fix] checkstyle TrialSelector

---
 .../java/github/weichware10/analyse/gui/TrialSelector.java | 7 ++++++-
 .../weichware10/analyse/gui/TrialSelectorController.java   | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index 590b4f2..878d350 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -2,15 +2,20 @@
 
 import github.weichware10.analyse.gui.util.AbsScene;
 import java.util.Optional;
-
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.layout.BorderPane;
 
+/**
+ * Auswahldialog für Trial.
+ */
 public class TrialSelector extends AbsScene {
 
     private static BorderPane root;
 
+    /**
+     * Auswahldialog für Trial.
+     */
     public static String getTrialId() {
 
         Dialog<String> selectorDialog = new Dialog<>();
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
index 41f3f6c..61043d6 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
@@ -1,8 +1,6 @@
 package github.weichware10.analyse.gui;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
-import github.weichware10.analyse.gui.util.Log;
-import github.weichware10.util.Logger;
 import github.weichware10.util.ToolType;
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
@@ -10,6 +8,9 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 
+/**
+ * Kontroller für {@link TrialSelector}.
+ */
 public class TrialSelectorController extends AbsSceneController {
 
     private final int minAmount = 1;

From 38a0baf15f2375abe7999a2f9bda08df66f4cf42 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 8 Jan 2022 22:47:15 +0100
Subject: [PATCH 22/87] [feat] Analyzer

---
 .../weichware10/analyse/gui/Analyzer.java     |  81 ++++++++++++++
 .../analyse/gui/AnalyzerController.java       | 100 ++++++++++++++++++
 .../gui/FunctionChooserController.java        |   6 ++
 .../weichware10/analyse/gui/Analyzer.fxml     |  79 ++++++++++++++
 .../analyse/gui/FunctionChooser.fxml          |   2 +-
 5 files changed, 267 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/Analyzer.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
new file mode 100644
index 0000000..b21b27b
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -0,0 +1,81 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.enums.AnalyseType;
+import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.Logger;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.MenuButton;
+import javafx.stage.Screen;
+
+/**
+ * Analysefenster der App.
+ */
+public class Analyzer extends AbsScene {
+
+    private static Parent root;
+    private static AnalyseType analyseType;
+    private static String trialId;
+    private static String trialIdComp;
+
+    /**
+     * Startet die App.
+     */
+    public static void start() {
+        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
+        root = start(Main.primaryStage,
+                Login.class.getResource("Analyzer.fxml"),
+                root,
+                "Analyse",
+                MainMenuBar.getMenuBar(),
+                (int) screenBounds.getWidth() / 2,
+                (int) screenBounds.getHeight() / 2);
+    }
+
+    /**
+     * /**
+     * Setzt den Analyse-Typ.
+     *
+     * @param analyseType - Analyse-Typ
+     */
+    public static void setAnalyseType(AnalyseType analyseType) {
+        Analyzer.analyseType = analyseType;
+
+        if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
+            trialIdComp = null;
+        }
+
+        Logger.info("analyseType set to " + analyseType);
+    }
+
+    /**
+     * Setzt die ausgewählte TrialID.
+     *
+     * @param analyseTypMenuButton - MenuButton für Analyse-Typ
+     */
+    public static void setTrialId(MenuButton analyseTypMenuButton) {
+        String trialId = TrialSelector.getTrialId();
+        if (trialId != null) {
+            analyseTypMenuButton.setDisable(false);
+        }
+        Logger.info("trialId set to " + trialId);
+    }
+
+    /**
+     *  Setzt die ausgewählte TrialID für Vergleichs Trial.
+     *
+     * @param analyseButton - MenuButton für Analyse-Typ
+     */
+    public static void setTrialIdComp(Button analyseButton) {
+        String trialId = TrialSelector.getTrialId();
+        if (trialId != null) {
+            analyseButton.setDisable(false);
+        } else {
+            analyseButton.setDisable(true);
+        }
+        Logger.info("trialIdComp set to " + trialIdComp);
+    }
+
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
new file mode 100644
index 0000000..3b43a00
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
@@ -0,0 +1,100 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.enums.AnalyseType;
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.MenuButton;
+
+/**
+ * Kontroller für {@link Analyzer}.
+ */
+public class AnalyzerController extends AbsSceneController {
+
+    @FXML
+    private Button analyseButton;
+    @FXML
+    private MenuButton analyseTypMenuButton;
+    @FXML
+    private Button configButton;
+    @FXML
+    private Button selectCompTrialButton;
+
+    @FXML
+    void analyze(ActionEvent event) {
+        // TODO: Start Analyse
+    }
+
+    @FXML
+    void selectTrial(ActionEvent event) {
+        analyseTypMenuButton.setDisable(true);
+        configButton.setDisable(true);
+        analyseButton.setDisable(true);
+        selectCompTrialButton.setVisible(false);
+        Analyzer.setTrialId(analyseTypMenuButton);
+    }
+
+    @FXML
+    void selectTrialForComp(ActionEvent event) {
+        Analyzer.setTrialIdComp(analyseButton);
+    }
+
+    @FXML
+    void setCompHeatmap(ActionEvent event) {
+        configButton.setDisable(false);
+        analyseButton.setDisable(true);
+        selectCompTrialButton.setVisible(true);
+        Analyzer.setAnalyseType(AnalyseType.COMPHEATMAP);
+    }
+
+    @FXML
+    void setConfig(ActionEvent event) {
+        // TODO: KonfigDialog erstellen
+    }
+
+    @FXML
+    void setHeapmap(ActionEvent event) {
+        configButton.setDisable(false);
+        analyseButton.setDisable(false);
+        selectCompTrialButton.setVisible(false);
+        Analyzer.setAnalyseType(AnalyseType.HEATPMAP);
+    }
+
+    @FXML
+    void setRelFrqImgArea(ActionEvent event) {
+        configButton.setDisable(false);
+        analyseButton.setDisable(false);
+        selectCompTrialButton.setVisible(false);
+        Analyzer.setAnalyseType(AnalyseType.RELFRQIMGAREA);
+    }
+
+    @FXML
+    void setVerlauf(ActionEvent event) {
+        configButton.setDisable(false);
+        analyseButton.setDisable(false);
+        selectCompTrialButton.setVisible(false);
+        Analyzer.setAnalyseType(AnalyseType.VERLAUF);
+    }
+
+    @FXML
+    void setViewTimeDistr(ActionEvent event) {
+        configButton.setDisable(false);
+        analyseButton.setDisable(false);
+        selectCompTrialButton.setVisible(false);
+        Analyzer.setAnalyseType(AnalyseType.VIEWTIMEDISTR);
+    }
+
+    @FXML
+    protected void initialize() {
+        assert analyseButton != null :
+            "fx:id=\"analyseButton\" not injected: check  'Analyzer.fxml'.";
+        assert analyseTypMenuButton != null :
+            "fx:id=\"analyseTypMenuButton\" not injected: check  'Analyzer.fxml'.";
+        assert configButton != null :
+            "fx:id=\"configButton\" not injected: check  'Analyzer.fxml'.";
+        assert selectCompTrialButton != null :
+            "fx:id=\"selectCompTrialButton\" not injected: check  'Analyzer.fxml'.";
+    }
+
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
index af0b6fa..f30ac27 100644
--- a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
@@ -2,6 +2,7 @@
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 
@@ -19,6 +20,11 @@ void logOut() {
         Login.logOut();
     }
 
+    @FXML
+    void startAnalyzer(ActionEvent event) {
+        Analyzer.start();
+    }
+
     @Override
     protected void initialize() {
         assert adminButton != null
diff --git a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
new file mode 100644
index 0000000..1f96f20
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright (c) 2015, 2019, Gluon and/or its affiliates.
+  All rights reserved. Use is subject to license terms.
+
+  This file is available and licensed under the following license:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the distribution.
+  - Neither the name of Oracle Corporation nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.chart.BarChart?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.MenuButton?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.AnalyzerController">
+   <children>
+      <HBox alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0" spacing="15.0">
+         <children>
+            <Button mnemonicParsing="false" onAction="#selectTrial" text="Auswahl Trial" />
+            <MenuButton fx:id="analyseTypMenuButton" disable="true" mnemonicParsing="false" text="Analyse-Typ">
+              <items>
+                <MenuItem mnemonicParsing="false" onAction="#setHeapmap" text="Heatmap" />
+                <MenuItem mnemonicParsing="false" onAction="#setCompHeatmap" text="Heatmap Vergleich" />
+                  <MenuItem mnemonicParsing="false" onAction="#setVerlauf" text="Verlauf" />
+                  <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsvertilung Bildbereiche" />
+                  <MenuItem mnemonicParsing="false" onAction="#setViewTimeDistr" text="Verteilung Betrachtungszeit" />
+              </items>
+            </MenuButton>
+            <Button fx:id="configButton" disable="true" mnemonicParsing="false" onAction="#setConfig" text="Konfiguration" />
+            <Button fx:id="selectCompTrialButton" mnemonicParsing="false" onAction="#selectTrialForComp" text="Auswahl Vergleichs-Trial" visible="false" />
+            <Button fx:id="analyseButton" disable="true" mnemonicParsing="false" onAction="#analyze" text="Analyse" />
+         </children>
+         <VBox.margin>
+            <Insets />
+         </VBox.margin>
+      </HBox>
+      <BarChart title="Beispiel">
+        <xAxis>
+          <CategoryAxis side="BOTTOM" />
+        </xAxis>
+        <yAxis>
+          <NumberAxis side="LEFT" />
+        </yAxis>
+      </BarChart>
+   </children>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+   </padding>
+</VBox>
diff --git a/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
index 23ad623..52dc22c 100644
--- a/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
@@ -11,7 +11,7 @@
          <children>
             <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
                <children>
-                  <Button mnemonicParsing="false" text="Analyse" />
+                  <Button mnemonicParsing="false" onAction="#startAnalyzer" text="Analyse" />
                   <Button fx:id="adminButton" mnemonicParsing="false" text="Admin-Bereich" />
                </children>
             </HBox>

From be13f9a11a087de13b6dd1d79ab5f0f493b705c8 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 8 Jan 2022 22:56:53 +0100
Subject: [PATCH 23/87] [fix] trialId -> trialIdComp

---
 src/main/java/github/weichware10/analyse/gui/Analyzer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index b21b27b..1135f03 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -69,8 +69,8 @@ public static void setTrialId(MenuButton analyseTypMenuButton) {
      * @param analyseButton - MenuButton für Analyse-Typ
      */
     public static void setTrialIdComp(Button analyseButton) {
-        String trialId = TrialSelector.getTrialId();
-        if (trialId != null) {
+        String trialIdComp = TrialSelector.getTrialId();
+        if (trialIdComp != null) {
             analyseButton.setDisable(false);
         } else {
             analyseButton.setDisable(true);

From 2c6127c431bdf4ef4059a6b5603a38517ba82b95 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sun, 9 Jan 2022 15:08:18 +0100
Subject: [PATCH 24/87] [refactor] dataBaseClient in Main gepackt

---
 src/main/java/github/weichware10/analyse/Main.java     |  2 ++
 .../analyse/gui/FunctionChooserController.java         |  3 ++-
 .../java/github/weichware10/analyse/gui/Login.java     | 10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index a5d2675..d458077 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -4,6 +4,7 @@
 import github.weichware10.analyse.gui.TrialSelector;
 import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
+import github.weichware10.util.db.DataBaseClient;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.scene.image.Image;
@@ -18,6 +19,7 @@
 public class Main extends Application {
 
     public static Stage primaryStage;
+    public static DataBaseClient dataBaseClient;
 
     /**
      * Einstiegspunkt der Analyse.
diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
index f30ac27..e416f1b 100644
--- a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
@@ -1,5 +1,6 @@
 package github.weichware10.analyse.gui;
 
+import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
 import javafx.event.ActionEvent;
@@ -29,6 +30,6 @@ void startAnalyzer(ActionEvent event) {
     protected void initialize() {
         assert adminButton != null
         : "fx:id=\"adminButton\" was not injected: check your FXML file 'FunctionChooser.fxml'.";
-        adminButton.setDisable(!Login.dataBaseClient.permissions.isAdmin);
+        adminButton.setDisable(!Main.dataBaseClient.permissions.isAdmin);
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index 20f413a..f19c10e 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -20,7 +20,6 @@
  * Der Loginbildschirm der App.
  */
 public class Login extends AbsScene {
-    public static DataBaseClient dataBaseClient;
     private static SimpleBooleanProperty connection = new SimpleBooleanProperty(false);
     public static ObservableBooleanValue hasConnection = connection;
     public static String databaseUrl;
@@ -45,7 +44,7 @@ public static void start() {
      * Loggt den Nutzer aus und kehrt zum Login-Bildschirm zurück.
      */
     public static void logOut() {
-        dataBaseClient = null;
+        Main.dataBaseClient = null;
         connection.set(false);
         start();
     }
@@ -66,16 +65,17 @@ public void run() {
                     databaseUrl = dotenv.get("DB_URL");
                 }
                 try {
-                    dataBaseClient = new DataBaseClient(databaseUrl, username, password, schema);
+                    Main.dataBaseClient = new DataBaseClient(
+                            databaseUrl, username, password, schema);
                     connection.set(true);
                     Platform.runLater(() -> setError(warnText, errorText, indicator, false, null));
                 } catch (IllegalArgumentException e) {
                     Logger.error("login:content error when loggin in", e);
-                    dataBaseClient = null;
+                    Main.dataBaseClient = null;
                     connection.set(false);
                     Platform.runLater(() -> setError(warnText, errorText, indicator, false, e));
                 }
-                if (dataBaseClient != null) {
+                if (Main.dataBaseClient != null) {
                     Platform.runLater(() -> FunctionChooser.start());
                 }
             }

From ca5343556ef7230f1f810e651a3762f40db42870 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sun, 9 Jan 2022 15:11:32 +0100
Subject: [PATCH 25/87] [feat] login on enter

---
 .../github/weichware10/analyse/gui/LoginController.java  | 9 +++++++++
 .../resources/github/weichware10/analyse/gui/Login.fxml  | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/LoginController.java b/src/main/java/github/weichware10/analyse/gui/LoginController.java
index a0c76b2..73b042d 100644
--- a/src/main/java/github/weichware10/analyse/gui/LoginController.java
+++ b/src/main/java/github/weichware10/analyse/gui/LoginController.java
@@ -7,6 +7,8 @@
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.text.Text;
 
 /**
@@ -43,6 +45,13 @@ protected void initialize() {
                         : "fx:id=\"loadingIndicator\" not injected: check 'Login.fxml'.";
     }
 
+    @FXML
+    private void loginOnEnter(KeyEvent keyEvent) {
+        if (keyEvent.getCode().equals(KeyCode.ENTER)) {
+            loginToDatabase();
+        }
+    }
+
     @FXML
     private void loginToDatabase() {
         Login.connectToDatabase(benutzernameId.getText(),
diff --git a/src/main/resources/github/weichware10/analyse/gui/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
index eca73e7..e57a912 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Login.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Login.fxml
@@ -38,11 +38,11 @@
                </rowConstraints>
                <children>
                   <Label text="Benutzername" GridPane.columnIndex="1" />
-                  <TextField fx:id="benutzernameId" prefHeight="25.0" prefWidth="92.0" promptText="Benutzername" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <TextField fx:id="benutzernameId" onKeyPressed="#loginOnEnter" prefHeight="25.0" prefWidth="92.0" promptText="Benutzername" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   <Label text="Schema" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                  <PasswordField fx:id="passwortId" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <PasswordField fx:id="passwortId" onKeyPressed="#loginOnEnter" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                   <Label text="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                  <TextField fx:id="schemaId" promptText="Schema" text="public" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                  <TextField fx:id="schemaId" onKeyPressed="#loginOnEnter" promptText="Schema" text="public" GridPane.columnIndex="1" GridPane.rowIndex="5" />
                </children>
                <VBox.margin>
                   <Insets bottom="10.0" left="10.0" right="10.0" />

From 44b9c2b9310b8c3228adf8c0a75f1c9179c6d063 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sun, 9 Jan 2022 19:08:27 +0100
Subject: [PATCH 26/87] [feat] aktueller Stand TrialSelector

---
 pom.xml                                       |   2 +-
 .../java/github/weichware10/analyse/Main.java |   2 +-
 .../weichware10/analyse/gui/Analyzer.java     |  23 ++--
 .../analyse/gui/TrialSelector.java            | 114 ++++++++++++++++--
 .../analyse/gui/TrialSelectorController.java  |  92 +++++++++++---
 .../analyse/gui/TrialSelector.fxml            |  44 ++++---
 6 files changed, 223 insertions(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8792da0..503d33e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>v2.1</version>
+      <version>87106a8</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <dependency>
diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index d458077..b3e9f36 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -49,7 +49,7 @@ public void start(Stage primaryStage) throws Exception {
 
     private void keyBindings(KeyEvent keyEvent) {
         if (keyEvent.getCode().equals(KeyCode.K) && keyEvent.isControlDown()) {
-            TrialSelector.getTrialId();
+            TrialSelector.getTrialData();
         }
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index 1135f03..8de4fb2 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -4,6 +4,7 @@
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
+import github.weichware10.util.data.TrialData;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
@@ -17,8 +18,8 @@ public class Analyzer extends AbsScene {
 
     private static Parent root;
     private static AnalyseType analyseType;
-    private static String trialId;
-    private static String trialIdComp;
+    private static TrialData trial;
+    private static TrialData trialComp;
 
     /**
      * Startet die App.
@@ -44,38 +45,38 @@ public static void setAnalyseType(AnalyseType analyseType) {
         Analyzer.analyseType = analyseType;
 
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
-            trialIdComp = null;
+            trialComp = null;
         }
 
         Logger.info("analyseType set to " + analyseType);
     }
 
     /**
-     * Setzt die ausgewählte TrialID.
+     * Setzt das ausgewählte Trial.
      *
      * @param analyseTypMenuButton - MenuButton für Analyse-Typ
      */
     public static void setTrialId(MenuButton analyseTypMenuButton) {
-        String trialId = TrialSelector.getTrialId();
-        if (trialId != null) {
+        trial = TrialSelector.getTrialData();
+        if (trial != null) {
             analyseTypMenuButton.setDisable(false);
         }
-        Logger.info("trialId set to " + trialId);
+        Logger.info("trialId set to " + trial.trialId);
     }
 
     /**
-     *  Setzt die ausgewählte TrialID für Vergleichs Trial.
+     *  Setzt das ausgewählte Vergleichs Trial.
      *
      * @param analyseButton - MenuButton für Analyse-Typ
      */
     public static void setTrialIdComp(Button analyseButton) {
-        String trialIdComp = TrialSelector.getTrialId();
-        if (trialIdComp != null) {
+        trialComp = TrialSelector.getTrialData();
+        if (trialComp != null) {
             analyseButton.setDisable(false);
         } else {
             analyseButton.setDisable(true);
         }
-        Logger.info("trialIdComp set to " + trialIdComp);
+        Logger.info("trialIdComp set to " + trialComp.trialId);
     }
 
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index 878d350..181c301 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -1,10 +1,26 @@
 package github.weichware10.analyse.gui;
 
+import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.Logger;
+import github.weichware10.util.ToolType;
+import github.weichware10.util.data.TrialData;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
 import java.util.Optional;
+
+import javax.crypto.SecretKey;
+
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
+import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.layout.BorderPane;
+import org.joda.time.DateTime;
 
 /**
  * Auswahldialog für Trial.
@@ -12,26 +28,102 @@
 public class TrialSelector extends AbsScene {
 
     private static BorderPane root;
+    private static TrialSelectorController controller;
+    private static String trialId;
 
     /**
      * Auswahldialog für Trial.
      */
-    public static String getTrialId() {
+    public static TrialData getTrialData() {
 
-        Dialog<String> selectorDialog = new Dialog<>();
-        selectorDialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL);
+        Dialog<Void> selectorDialog = new Dialog<>();
+        ButtonType select = new ButtonType("Trial auswählen", ButtonData.APPLY);
+        selectorDialog.getDialogPane().getButtonTypes().addAll(select, ButtonType.CANCEL);
 
-        if (root == null) {
-            root = (BorderPane) initialize(TrialSelector.class.getResource("TrialSelector.fxml"));
-        }
-        selectorDialog.getDialogPane().setContent(root);
+        selectorDialog.getDialogPane().setContent((root != null) ? root : initialize());
+
+        final Button selectButton = (Button) selectorDialog.getDialogPane().lookupButton(select);
+
+        selectButton.addEventFilter(ActionEvent.ACTION, selectEvent -> {
+            TrialData selected = controller.resultTable.getSelectionModel().getSelectedItem();
+            if (selected == null) {
+                controller.setWarn("Bitte wählen Sie ein Trial aus.");
+                selectEvent.consume();
+                return;
+            }
+            trialId = selected.trialId;
+        });
+
+
+        selectorDialog.showAndWait();
+
+        return (trialId != null) ? Main.dataBaseClient.trials.getTrial(trialId) : null;
+    }
+
+    protected static void search() {
+        String confContent = controller.configIdField.getText();
+        final String configId = (confContent.length() > 0) ? confContent : null;
+
+        final ToolType toolType = controller.toolTypeBox.getValue();
+
+        final DateTime startDate = localDateToDateTime(controller.startPicker.getValue(), false);
+        final DateTime endDate = localDateToDateTime(controller.endPicker.getValue(), true);
+
+        final Integer amount = controller.checkAmountInput();
 
-        Optional<String> optResult = selectorDialog.showAndWait();
+        controller.indicator.setVisible(true);
 
-        if (optResult.isPresent()) {
-            return optResult.get();
-        } else {
+        Thread searchThread = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                List<TrialData> result = Main.dataBaseClient.trials.getList(
+                        configId, toolType, startDate, endDate, amount);
+
+                Platform.runLater(() -> {
+                    controller.indicator.setVisible(false);
+                    controller.resultTable.getItems().clear();
+                    controller.resultTable.getItems().addAll(result);
+                });
+            }
+        });
+
+        searchThread.start();
+    }
+
+    private static DateTime localDateToDateTime(java.time.LocalDate localDate, boolean endOfDay) {
+        if (localDate == null) {
             return null;
         }
+        // Korrigieren der Zeit um einen Tag, dadurch Ende des Tages nach Aufruf von atStartOfDay()
+        localDate = endOfDay ? localDate.plusDays(1) : localDate;
+        LocalDateTime localStart = localDate.atStartOfDay();
+        long instant = localStart.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+        return new org.joda.time.LocalDateTime(instant).toDateTime();
+    }
+
+    private static BorderPane initialize() {
+        FXMLLoader loader = new FXMLLoader(TrialSelector.class.getResource("TrialSelector.fxml"));
+        try {
+            root = loader.load();
+        } catch (Exception e) {
+            Logger.error("Error when loading TrialSelector", e, true);
+            System.exit(-1);
+        }
+        controller = loader.getController();
+        if (controller == null) {
+            Logger.error("Error when loading TrialSelectorController");
+            System.exit(-1);
+        }
+
+        controller.initAmountBox(1, 100, 50);
+        controller.initToolTypeBox();
+        controller.initResultTable();
+        controller.initEndPicker();
+
+        // controller.searchButton.onActionProperty().addListener(e -> Logger.debug("action!"));
+        // controller.searchButton.onActionProperty().addListener(e -> search());
+
+        return root;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
index 61043d6..63f5d34 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
@@ -2,60 +2,115 @@
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.ToolType;
+import github.weichware10.util.data.TrialData;
+import java.time.LocalDate;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.DatePicker;
+import javafx.scene.control.Label;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+import org.joda.time.DateTime;
 
 /**
  * Kontroller für {@link TrialSelector}.
  */
 public class TrialSelectorController extends AbsSceneController {
 
-    private final int minAmount = 1;
-    private final int maxAmount = 100;
+    private int minAmount = 1;
+    private int maxAmount = 100;
+    private int defaultAmount = 50;
 
     @FXML
-    private ComboBox<Integer> amountBox;
+    protected ComboBox<Integer> amountBox;
     @FXML
-    private TextField configIdField;
+    protected TextField configIdField;
     @FXML
-    private DatePicker endPicker;
+    protected DatePicker endPicker;
     @FXML
-    private TableView<?> resultTable;
+    protected TableView<TrialData> resultTable;
     @FXML
-    private DatePicker startPicker;
+    protected DatePicker startPicker;
     @FXML
-    private ComboBox<ToolType> toolTypeBox;
+    protected ComboBox<ToolType> toolTypeBox;
+    @FXML
+    protected Button searchButton;
+    @FXML
+    protected Label warnLabel;
+    @FXML
+    protected ProgressIndicator indicator;
 
     @FXML
-    private void checkAmountInput() {
+    protected Integer checkAmountInput() {
         Integer value;
         try {
             value = Integer.valueOf(amountBox.getEditor().getText());
         } catch (NumberFormatException e) {
             value = null;
         }
+
         if (value == null) {
-            amountBox.setValue(minAmount);
+            value = defaultAmount;
         } else if (value > maxAmount) {
-            amountBox.setValue(maxAmount);
+            value = maxAmount;
         } else if (value < minAmount) {
-            amountBox.setValue(minAmount);
+            value = minAmount;
         }
+
+        amountBox.setValue(value);
+        return value;
+    }
+
+    @FXML
+    private void search() {
+        TrialSelector.search();
     }
 
-    private void initAmountBox() {
+    protected void setWarn(String warn) {
+        warnLabel.setText(warn);
+    }
+
+    protected void initEndPicker() {
+        endPicker.setValue(LocalDate.now());
+    }
+
+    protected void initResultTable() {
+        TableColumn<TrialData, String> trialIdColumn = new TableColumn<>("Versuchs-ID");
+        trialIdColumn.setCellValueFactory(new PropertyValueFactory<>("trialId"));
+        resultTable.getColumns().add(trialIdColumn);
+        TableColumn<TrialData, String> configIdColumn = new TableColumn<>("Konfigurations-ID");
+        configIdColumn.setCellValueFactory(new PropertyValueFactory<>("configId"));
+        resultTable.getColumns().add(configIdColumn);
+        TableColumn<TrialData, String> toolTypeColumn = new TableColumn<>("Tool-Typ");
+        toolTypeColumn.setCellValueFactory(new PropertyValueFactory<>("toolType"));
+        resultTable.getColumns().add(toolTypeColumn);
+        TableColumn<TrialData, DateTime> startTimeColumn = new TableColumn<>("Zeit");
+        startTimeColumn.setCellValueFactory(new PropertyValueFactory<>("startTime"));
+        resultTable.getColumns().add(startTimeColumn);
+        TableColumn<TrialData, String> answerColumn = new TableColumn<>("Antwort");
+        answerColumn.setCellValueFactory(new PropertyValueFactory<>("answer"));
+        resultTable.getColumns().add(answerColumn);
+    }
+
+    protected void initAmountBox(int minAmount, int maxAmount, int defaultAmount) {
+        this.minAmount = minAmount;
+        this.maxAmount = maxAmount;
+        this.defaultAmount = defaultAmount;
         for (Integer i = minAmount; i <= maxAmount; i++) {
             amountBox.getItems().add(i);
         }
+        amountBox.setValue(defaultAmount);
     }
 
-    private void initToolTypeBox() {
+    protected void initToolTypeBox() {
         for (ToolType toolType : ToolType.values()) {
             toolTypeBox.getItems().add(toolType);
         }
+        toolTypeBox.getItems().add(null);
     }
 
     @Override
@@ -72,8 +127,13 @@ protected void initialize() {
                 : "fx:id=\"startPicker\" not injected: check 'TrialSelector.fxml'.";
         assert toolTypeBox != null
                 : "fx:id=\"toolTypeBox\" not injected: check 'TrialSelector.fxml'.";
-        initAmountBox();
-        initToolTypeBox();
+        assert searchButton != null
+                : "fx:id=\"searchButton\" not injected: check 'TrialSelector.fxml'.";
+        assert warnLabel != null
+                : "fx:id=\"warnLabel\" not injected: check 'TrialSelector.fxml'.";
+        assert indicator != null
+                : "fx:id=\"indicator\" not injected: check 'TrialSelector.fxml'.";
+
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
index abf6ce3..dd01b78 100644
--- a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
@@ -5,11 +5,12 @@
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DatePicker?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
 
@@ -22,8 +23,9 @@
                   <Label text="Bitte filtern Sie die Versuchsliste, um Ergebnisse zu finden." HBox.hgrow="ALWAYS" />
                   <HBox alignment="CENTER_RIGHT" fillHeight="false" spacing="10.0" HBox.hgrow="ALWAYS">
                      <children>
-                        <ComboBox fx:id="amountBox" editable="true" onAction="#checkAmountInput" onKeyPressed="#checkAmountInput" prefWidth="150.0" promptText="Anzahl" />
-                        <Button mnemonicParsing="false" text="Suchen" />
+                        <TextField prefWidth="174.0" promptText="Versuchs-ID" />
+                        <ComboBox fx:id="amountBox" editable="true" onAction="#checkAmountInput" onKeyPressed="#checkAmountInput" prefWidth="112.0" promptText="Anzahl" />
+                        <Button fx:id="searchButton" mnemonicParsing="false" onAction="#search" text="Suchen" />
                      </children>
                   </HBox>
                </children>
@@ -36,21 +38,35 @@
                   <DatePicker fx:id="endPicker" promptText="End-Datum" />
                </children>
             </HBox>
-            <TableView fx:id="resultTable" focusTraversable="false" prefHeight="200.0" prefWidth="200.0">
-              <columns>
-                <TableColumn editable="false" prefWidth="75.0" text="Versuchs-ID" />
-                <TableColumn prefWidth="75.0" text="Konfigurations-ID" />
-                  <TableColumn prefWidth="75.0" text="Zeit" />
-                  <TableColumn prefWidth="75.0" text="Antwort" />
-              </columns>
-               <columnResizePolicy>
-                  <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-               </columnResizePolicy>
-            </TableView>
+            <StackPane VBox.vgrow="ALWAYS">
+               <children>
+                  <TableView fx:id="resultTable" focusTraversable="false" prefHeight="200.0" prefWidth="200.0">
+                     <columnResizePolicy>
+                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                     </columnResizePolicy>
+                  </TableView>
+                  <ProgressIndicator fx:id="indicator" maxHeight="30.0" maxWidth="30.0" minHeight="30.0" minWidth="30.0" prefHeight="30.0" prefWidth="30.0" translateY="-15.0" visible="false" StackPane.alignment="CENTER" />
+               </children>
+            </StackPane>
          </children>
          <padding>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </padding>
       </VBox>
    </center>
+   <bottom>
+      <HBox BorderPane.alignment="CENTER_RIGHT">
+         <BorderPane.margin>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </BorderPane.margin>
+         <children>
+            <Button mnemonicParsing="false" text="reset" />
+            <HBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
+               <children>
+                  <Label fx:id="warnLabel" textFill="#da3633" />
+               </children>
+            </HBox>
+         </children>
+      </HBox>
+   </bottom>
 </BorderPane>

From a193ec665ab62d973b560f5f05a3146a24a0e950 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sun, 9 Jan 2022 19:44:41 +0100
Subject: [PATCH 27/87] [style] checkstyle

---
 .../java/github/weichware10/analyse/gui/TrialSelector.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index 181c301..93f7f66 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -8,17 +8,13 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.List;
-import java.util.Optional;
-
-import javax.crypto.SecretKey;
-
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
-import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.layout.BorderPane;
 import org.joda.time.DateTime;
 

From d9611d20d61c6455caecb9d8e1b8a3e6159ecf32 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sun, 9 Jan 2022 19:58:09 +0100
Subject: [PATCH 28/87] [refactor] initialize now returns controller

---
 .../weichware10/analyse/gui/Analyzer.java     |  3 +-
 .../analyse/gui/FunctionChooser.java          |  3 +-
 .../github/weichware10/analyse/gui/Login.java |  3 +-
 .../weichware10/analyse/gui/MainMenuBar.java  |  2 +-
 .../analyse/gui/TrialSelector.java            | 20 ++----------
 .../analyse/gui/util/AbsScene.java            | 32 +++++++++++++++----
 6 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index 8de4fb2..a999460 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -29,10 +29,11 @@ public static void start() {
         root = start(Main.primaryStage,
                 Login.class.getResource("Analyzer.fxml"),
                 root,
+                null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2);
+                (int) screenBounds.getHeight() / 2).root;
     }
 
     /**
diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java b/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
index 2f38db4..3f801c7 100644
--- a/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
+++ b/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
@@ -20,9 +20,10 @@ public static void start() {
         root = start(Main.primaryStage,
                 Login.class.getResource("FunctionChooser.fxml"),
                 root,
+                null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2);
+                (int) screenBounds.getHeight() / 2).root;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index f19c10e..0b4f6a0 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -34,10 +34,11 @@ public static void start() {
         root = start(Main.primaryStage,
                 Login.class.getResource("Login.fxml"),
                 root,
+                null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2);
+                (int) screenBounds.getHeight() / 2).root;
     }
 
     /**
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
index 6186e47..e27151e 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
@@ -22,7 +22,7 @@ public class MainMenuBar extends AbsScene {
      */
     public static MenuBar getMenuBar() {
         if (root == null) {
-            root = (MenuBar) initialize(MainMenuBar.class.getResource("MainMenuBar.fxml"));
+            root = (MenuBar) initialize(MainMenuBar.class.getResource("MainMenuBar.fxml")).root;
         }
         return root;
     }
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index 93f7f66..2cd8e12 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -2,7 +2,6 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
-import github.weichware10.util.Logger;
 import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
 import java.time.LocalDateTime;
@@ -10,7 +9,6 @@
 import java.util.List;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
@@ -99,27 +97,15 @@ private static DateTime localDateToDateTime(java.time.LocalDate localDate, boole
     }
 
     private static BorderPane initialize() {
-        FXMLLoader loader = new FXMLLoader(TrialSelector.class.getResource("TrialSelector.fxml"));
-        try {
-            root = loader.load();
-        } catch (Exception e) {
-            Logger.error("Error when loading TrialSelector", e, true);
-            System.exit(-1);
-        }
-        controller = loader.getController();
-        if (controller == null) {
-            Logger.error("Error when loading TrialSelectorController");
-            System.exit(-1);
-        }
+        InitResult ir = initialize(TrialSelector.class.getResource("TrialSelector.fxml"));
+        root = (BorderPane) ir.root;
+        controller = (TrialSelectorController) ir.controller;
 
         controller.initAmountBox(1, 100, 50);
         controller.initToolTypeBox();
         controller.initResultTable();
         controller.initEndPicker();
 
-        // controller.searchButton.onActionProperty().addListener(e -> Logger.debug("action!"));
-        // controller.searchButton.onActionProperty().addListener(e -> search());
-
         return root;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
index a671ce5..3a53d39 100644
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
+++ b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
@@ -18,9 +18,9 @@ public abstract class AbsScene {
      * lädt die Szene intern und gibt die root-Instanz zurück.
      *
      * @param fxml - URL der FXML-Datei
-     * @return das geladene Parent Objekt.
+     * @return das geladene Parent Objekt und die Controller-Instanz.
      */
-    protected static Parent initialize(URL fxml) {
+    protected static InitResult initialize(URL fxml) {
 
         FXMLLoader loader = new FXMLLoader(fxml);
 
@@ -32,7 +32,9 @@ protected static Parent initialize(URL fxml) {
             System.exit(-1);
         }
 
-        return root;
+        AbsSceneController controller = loader.getController();
+
+        return new InitResult(root, controller);
     }
 
     /**
@@ -51,9 +53,10 @@ public static void setMenuBar(MenuBar menuBar, Parent root) {
      * Zeigt die Szene an.
      *
      * @param primaryStage - das Hauptfenster
+     * @return das Initialisierungsergebniss
      */
-    public static Parent start(Stage primaryStage, URL fxml, Parent root,
-            String title, MenuBar menuBar,
+    public static InitResult start(Stage primaryStage, URL fxml, Parent root,
+            AbsSceneController controller, String title, MenuBar menuBar,
             Integer width, Integer height) {
         if (primaryStage == null || title == null || fxml == null) {
             throw new NullPointerException(
@@ -65,7 +68,9 @@ public static Parent start(Stage primaryStage, URL fxml, Parent root,
                                     (fxml != null) ? fxml.toString() : "null"));
         }
         if (root == null) {
-            root = initialize(fxml);
+            InitResult ir = initialize(fxml);
+            root = ir.root;
+            controller = ir.controller;
         }
         // Menüleiste setzen
         if (menuBar != null) {
@@ -84,6 +89,19 @@ public static Parent start(Stage primaryStage, URL fxml, Parent root,
             primaryStage.setScene(new Scene(root));
         }
         primaryStage.setTitle(title);
-        return root;
+        return new InitResult(root, controller);
+    }
+
+    /**
+     * root und controller des Lade-Vorgangs.
+     */
+    public static class InitResult {
+        public final Parent root;
+        public final AbsSceneController controller;
+
+        protected InitResult(Parent root, AbsSceneController controller) {
+            this.root = root;
+            this.controller = controller;
+        }
     }
 }

From fbfc2f7e7d5c560ab5d0b06ce983dbffede0dc87 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 20:29:38 +0100
Subject: [PATCH 29/87] =?UTF-8?q?[feat]=20=C3=84nderung=20HeatmapConfig=20?=
 =?UTF-8?q?(Color)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analyse/config/HeatmapConfig.java         | 129 +++------------
 .../analyse/config/HeatmapConfigTest.java     | 149 ++++--------------
 2 files changed, 50 insertions(+), 228 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
index a810078..274843f 100644
--- a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
+++ b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
@@ -1,82 +1,47 @@
 package github.weichware10.analyse.config;
 
+import javafx.scene.paint.Color;
+
 /**
  * Speicherung der Konfiguration der Heatmap-Analysemethoden.
  */
 public class HeatmapConfig {
-    private float[] minColor;
-    private float[] maxColor;
+    private Color minColorDiff;
+    private Color maxColorDiff;
     private boolean grid;
     private boolean image;
-    private float[] minDiff;
-    private float[] maxDiff;
 
     /**
      * Speicherung der Konfiguration der Heatmap-Analysemethoden.
      */
     public HeatmapConfig() {
-        this.minColor = new float[] { 0, 0, 1 };
-        this.maxColor = new float[] { 1, 0, 0 };
+        this.minColorDiff = new Color(0.0f, 0.0f, 1.0f, 1.0f);
+        this.maxColorDiff = new Color(1.0f, 0.0f, 0.0f, 1.0f);
         this.grid = true;
         this.image = true;
-        this.minDiff = new float[] { 1, 0, 1 };
-        this.maxDiff = new float[] { 1, 1, 0 };
     }
 
-    /**
-     * setzt neue minimale Farbe.
-     *
-     * @param minColor - neue minimale Farbe
-     * @return
-     *         true, falls neue minimale Farbe erfolgreich gesetzt wird;
-     *         false, falls neue minimale Farbe nicht gesetzt wird
-     */
-    public boolean setMinColor(float[] minColor) {
-        if (minColor[0] > 1 || minColor[0] < 0 || minColor[1] > 1
-                || minColor[1] < 0 || minColor[2] > 1 || minColor[2] < 0) {
-            return false;
-        } else {
-            this.minColor = minColor;
-            return true;
-        }
+
+    public Color getMinColorDiff() {
+        return minColorDiff;
     }
 
-    /**
-     * gibt minimale Farbe zurück.
-     *
-     * @return minimale Farbe
-     */
-    public float[] getMinColor() {
-        return minColor;
+
+    public void setMinColorDiff(Color minColorDiff) {
+        this.minColorDiff = minColorDiff;
     }
 
-    /**
-     * setzt neue maximale Farbe.
-     *
-     * @param maxColor - neue maximale Farbe
-     * @return
-     *         true, falls neue maximale Farbe erfolgreich gesetzt wird;
-     *         false, falls neue maximale Farbe nicht gesetzt wird
-     */
-    public boolean setMaxColor(float[] maxColor) {
-        if (maxColor[0] > 1 || maxColor[0] < 0 || maxColor[1] > 1
-                || maxColor[1] < 0 || maxColor[2] > 1 || maxColor[2] < 0) {
-            return false;
-        } else {
-            this.maxColor = maxColor;
-            return true;
-        }
+
+    public Color getMaxColorDiff() {
+        return maxColorDiff;
     }
 
-    /**
-     * gibt maximale Farbe zurück.
-     *
-     * @return maximale Farbe
-     */
-    public float[] getMaxColor() {
-        return maxColor;
+
+    public void setMaxColorDiff(Color maxColorDiff) {
+        this.maxColorDiff = maxColorDiff;
     }
 
+
     /**
      * aktiviert bzw. deaktiviert die Anzeige des Rasters.
      *
@@ -112,60 +77,4 @@ public void setImage(boolean image) {
     public boolean isImage() {
         return image;
     }
-
-    /**
-     * setzt neue minimale Farbe für Vergleich.
-     *
-     * @param minDiff - neue minimale Farbe für Vergleich
-     * @return
-     *         true, falls neue minimale Farbe für Vergleich erfolgreich gesetzt
-     *         wird;
-     *         false, falls neue minimale Farbe für Vergleich nicht gesetzt wird
-     */
-    public boolean setMinDiff(float[] minDiff) {
-        if (minDiff[0] > 1 || minDiff[0] < 0 || minDiff[1] > 1
-                || minDiff[1] < 0 || minDiff[2] > 1 || minDiff[2] < 0) {
-            return false;
-        } else {
-            this.minDiff = minDiff;
-            return true;
-        }
-    }
-
-    /**
-     * gibt minimale Farbe für Vergleich zurück.
-     *
-     * @return minimale Farbe für Vergleich
-     */
-    public float[] getMinDiff() {
-        return minDiff;
-    }
-
-    /**
-     * setzt neue maximale Farbe für Vergleich.
-     *
-     * @param maxDiff - neue maximale Farbe für Vergleich
-     * @return
-     *         true, falls neue maximale Farbe für Vergleich erfolgreich gesetzt
-     *         wird;
-     *         false, falls neue maximale Farbe für Vergleich nicht gesetzt wird
-     */
-    public boolean setMaxDiff(float[] maxDiff) {
-        if (maxDiff[0] > 1 || maxDiff[0] < 0 || maxDiff[1] > 1
-                || maxDiff[1] < 0 || maxDiff[2] > 1 || maxDiff[2] < 0) {
-            return false;
-        } else {
-            this.maxDiff = maxDiff;
-            return true;
-        }
-    }
-
-    /**
-     * gibt maximale Farbe für Vergleich zurück.
-     *
-     * @return maximale Farbe für Vergleich
-     */
-    public float[] getMaxDiff() {
-        return maxDiff;
-    }
 }
diff --git a/src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java b/src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java
index 1293c0c..8eba5e5 100644
--- a/src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java
+++ b/src/test/java/github/weichware10/analyse/config/HeatmapConfigTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import javafx.scene.paint.Color;
 import org.junit.Test;
 
 /**
@@ -16,35 +17,27 @@ public class HeatmapConfigTest {
     @Test
     public void minColorShouldBeSet() {
         HeatmapConfig confHm1 = new HeatmapConfig();
-        // assertEquals(new float[] { 1, 0, 0 }, confHm1.getMinColor());
-        assertEquals("getMinColor[0] sollte 0 zurückgeben", 0, confHm1.getMinColor()[0], 0.0001f);
-        assertEquals("getMinColor[1] sollte 0 zurückgeben", 0, confHm1.getMinColor()[1], 0.0001f);
-        assertEquals("getMinColor[2] sollte 1 zurückgeben", 1, confHm1.getMinColor()[2], 0.0001f);
+        assertEquals("getMinColorDiff sollte 0 zurückgeben", 0,
+                confHm1.getMinColorDiff().getRed(), 0.0001f);
+        assertEquals("getMinColorDiff sollte 0 zurückgeben", 0,
+                confHm1.getMinColorDiff().getGreen(), 0.0001f);
+        assertEquals("getMinColorDiff sollte 1 zurückgeben", 1,
+                confHm1.getMinColorDiff().getBlue(), 0.0001f);
 
         HeatmapConfig confHm2 = new HeatmapConfig();
-        assertTrue("setMinColor sollte True zurückgeben",
-            confHm2.setMinColor(new float[] { 0, 1, 0.5f }));
-
-        HeatmapConfig confHm3 = new HeatmapConfig();
-        confHm3.setMinColor(new float[] { 0.25f, 0.1f, 1 });
+        confHm2.setMinColorDiff(new Color(0.25f, 0.1f, 1.0f, 1.0f));
         assertEquals("getMinColor[0] sollte 0.25 zurückgeben",
-            0.25f, confHm3.getMinColor()[0], 0.0001f);
+                0.25f, confHm2.getMinColorDiff().getRed(), 0.0001f);
         assertEquals("getMinColor[1] sollte 0.1 zurückgeben",
-            0.1f, confHm3.getMinColor()[1], 0.0001f);
+                0.1f, confHm2.getMinColorDiff().getGreen(), 0.0001f);
         assertEquals("getMinColor[2] sollte 1 zurückgeben",
-            1, confHm3.getMinColor()[2], 0.0001f);
-
-        HeatmapConfig confHm4 = new HeatmapConfig();
-        assertFalse("setMinColor sollte False zurückgeben",
-            confHm4.setMinColor(new float[] { -1, 0, 1 }));
-
-        HeatmapConfig confHm5 = new HeatmapConfig();
-        assertFalse("setMinColor sollte False zurückgeben",
-            confHm5.setMinColor(new float[] { 0.5f, 1.3f, 1 }));
+                1.0f, confHm2.getMinColorDiff().getBlue(), 0.0001f);
+    }
 
-        HeatmapConfig confHm6 = new HeatmapConfig();
-        assertFalse("setMinColor sollte False zurückgeben",
-            confHm6.setMinColor(new float[] { 0.5f, 1.3f, -1 }));
+    @Test(expected = IllegalArgumentException.class) // erwartet, dass Fehler auftritt
+    public void shouldThrowAtWrongMinColorDiff() throws IllegalArgumentException {
+        HeatmapConfig confHm1 = new HeatmapConfig();
+        confHm1.setMinColorDiff(new Color(2.0f, -1.0f, 0.0f, 1.0f));
     }
 
     /**
@@ -53,34 +46,27 @@ public void minColorShouldBeSet() {
     @Test
     public void maxColorShouldBeSet() {
         HeatmapConfig confHm1 = new HeatmapConfig();
-        assertEquals("getMaxColor[0] sollte 1 zurückgeben", 1, confHm1.getMaxColor()[0], 0.0001f);
-        assertEquals("getMaxColor[1] sollte 0 zurückgeben", 0, confHm1.getMaxColor()[1], 0.0001f);
-        assertEquals("getMaxColor[2] sollte 0 zurückgeben", 0, confHm1.getMaxColor()[2], 0.0001f);
+        assertEquals("getMaxColor[0] sollte 1 zurückgeben", 1,
+                confHm1.getMaxColorDiff().getRed(), 0.0001f);
+        assertEquals("getMaxColor[1] sollte 0 zurückgeben", 0,
+                confHm1.getMaxColorDiff().getGreen(), 0.0001f);
+        assertEquals("getMaxColor[2] sollte 0 zurückgeben", 0,
+                confHm1.getMaxColorDiff().getBlue(), 0.0001f);
 
         HeatmapConfig confHm2 = new HeatmapConfig();
-        assertTrue("setMaxColor sollte True zurückgeben",
-            confHm2.setMaxColor(new float[] { 0.6f, 0.15f, 1.0f }));
-
-        HeatmapConfig confHm3 = new HeatmapConfig();
-        confHm3.setMaxColor(new float[] { 0.1f, 1.0f, 0.45f });
+        confHm2.setMaxColorDiff(new Color(0.1f, 1.0f, 0.45f, 1.0f));
         assertEquals("getMaxColor[0] sollte 0.1 zurückgeben",
-            0.1f, confHm3.getMaxColor()[0], 0.0001f);
+                0.1f, confHm2.getMaxColorDiff().getRed(), 0.0001f);
         assertEquals("getMaxColor[1] sollte 1.0 zurückgeben",
-            1.0f, confHm3.getMaxColor()[1], 0.0001f);
+                1.0f, confHm2.getMaxColorDiff().getGreen(), 0.0001f);
         assertEquals("getMaxColor[2] sollte 0.45 zurückgeben",
-            0.45f, confHm3.getMaxColor()[2], 0.0001f);
-
-        HeatmapConfig confHm4 = new HeatmapConfig();
-        assertFalse("setMaxColor sollte False zurückgeben",
-            confHm4.setMaxColor(new float[] { 0.2f, -0.85f, 0.0f }));
-
-        HeatmapConfig confHm5 = new HeatmapConfig();
-        assertFalse("setMaxColor sollte False zurückgeben",
-            confHm5.setMaxColor(new float[] { 0.2f, 0.16f, 3.0f }));
+                0.45f, confHm2.getMaxColorDiff().getBlue(), 0.0001f);
+    }
 
-        HeatmapConfig confHm6 = new HeatmapConfig();
-        assertFalse("setMaxColor sollte False zurückgeben",
-            confHm6.setMaxColor(new float[] { 1.2f, 0.16f, -3.0f }));
+    @Test(expected = IllegalArgumentException.class) // erwartet, dass Fehler auftritt
+    public void shouldThrowAtWrongMaxColorDiff() throws IllegalArgumentException {
+        HeatmapConfig confHm1 = new HeatmapConfig();
+        confHm1.setMaxColorDiff(new Color(2.0f, -1.0f, 0.0f, 1.0f));
     }
 
     /**
@@ -116,77 +102,4 @@ public void imageShouldBeSet() {
         confHm3.setImage(true);
         assertTrue("isImage sollte true zurückgeben", confHm3.isImage());
     }
-
-    /**
-     * Testet, ob minimale Farbe für Vergleich gesetzt wird.
-     */
-    @Test
-    public void minDiffShouldBeSet() {
-        HeatmapConfig confHm1 = new HeatmapConfig();
-        assertEquals("getMinDiff[0] sollte 1 zurückgeben", 1, confHm1.getMinDiff()[0], 0.0001f);
-        assertEquals("getMinDiff[1] sollte 0 zurückgeben", 0, confHm1.getMinDiff()[1], 0.0001f);
-        assertEquals("getMinDiff[2] sollte 1 zurückgeben", 1, confHm1.getMinDiff()[2], 0.0001f);
-
-        HeatmapConfig confHm2 = new HeatmapConfig();
-        assertTrue("setMinDiff sollte True zurückgeben",
-            confHm2.setMinDiff(new float[] { 0.5f, 0.3f, 1.0f }));
-
-        HeatmapConfig confHm3 = new HeatmapConfig();
-        confHm3.setMinDiff(new float[] { 0.75f, 0.2f, 0.5f });
-        assertEquals("getMinDiff[0] sollte 0.75 zurückgeben",
-            0.75f, confHm3.getMinDiff()[0], 0.0001f);
-        assertEquals("getMinDiff[1] sollte 0.2 zurückgeben",
-            0.2f, confHm3.getMinDiff()[1], 0.0001f);
-        assertEquals("getMinDiff[2] sollte 0.5 zurückgeben",
-            0.5f, confHm3.getMinDiff()[2], 0.0001f);
-
-        HeatmapConfig confHm4 = new HeatmapConfig();
-        assertFalse("setMinDiff sollte False zurückgeben",
-            confHm4.setMinDiff(new float[] { -1, 0, 1 }));
-
-        HeatmapConfig confHm5 = new HeatmapConfig();
-        assertFalse("setMinDiff sollte False zurückgeben",
-            confHm5.setMinDiff(new float[] { 0.5f, 1.3f, 1 }));
-
-        HeatmapConfig confHm6 = new HeatmapConfig();
-        assertFalse("setMinDiff sollte False zurückgeben",
-            confHm6.setMinDiff(new float[] { 0.5f, 1.3f, -1 }));
-    }
-
-    /**
-     * Testet, ob maximale Farbe für Vergleich gesetzt wird.
-     */
-    @Test
-    public void maxDiffShouldBeSet() {
-        HeatmapConfig confHm1 = new HeatmapConfig();
-        assertEquals("getMaxDiff[0] sollte 1 zurückgeben", 1, confHm1.getMaxDiff()[0], 0.0001f);
-        assertEquals("getMaxDiff[1] sollte 1 zurückgeben", 1, confHm1.getMaxDiff()[1], 0.0001f);
-        assertEquals("getMaxDiff[2] sollte 0 zurückgeben", 0, confHm1.getMaxDiff()[2], 0.0001f);
-
-        HeatmapConfig confHm2 = new HeatmapConfig();
-        assertTrue("setMaxDiff sollte True zurückgeben",
-            confHm2.setMaxDiff(new float[] { 0.0f, 0.65f, 0.2f }));
-
-        HeatmapConfig confHm3 = new HeatmapConfig();
-        confHm3.setMaxDiff(new float[] { 0.2f, 1.0f, 0.5f });
-        assertEquals("getMaxDiff[0] sollte 0.2 zurückgeben",
-            0.2f, confHm3.getMaxDiff()[0], 0.0001f);
-        assertEquals("getMaxDiff[1] sollte 1 zurückgeben",
-            1.0f, confHm3.getMaxDiff()[1], 0.0001f);
-        assertEquals("getMaxDiff[2] sollte 0.5 zurückgeben",
-            0.5f, confHm3.getMaxDiff()[2], 0.0001f);
-
-        HeatmapConfig confHm4 = new HeatmapConfig();
-        assertFalse("setMaxDiff sollte False zurückgeben",
-            confHm4.setMaxDiff(new float[] { -1, 0, 1 }));
-
-        HeatmapConfig confHm5 = new HeatmapConfig();
-        assertFalse("setMaxDiff sollte False zurückgeben",
-            confHm5.setMaxDiff(new float[] { 0.5f, 1.3f, 1 }));
-
-        HeatmapConfig confHm6 = new HeatmapConfig();
-        assertFalse("setMaxDiff sollte False zurückgeben",
-            confHm6.setMaxDiff(new float[] { 0.5f, 1.3f, -1 }));
-    }
-
 }

From 85cc0cfcdff449563dbaf9e137514a4851c48f82 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 20:30:00 +0100
Subject: [PATCH 30/87] [feat] Konfiguration Heatmap Versuche

---
 .../weichware10/analyse/gui/Analyzer.java     | 43 +++++++++++-
 .../analyse/gui/AnalyzerController.java       | 24 ++++---
 .../analyse/gui/HeatmapConfigurator.java      | 52 ++++++++++++++
 .../gui/HeatmapConfiguratorController.java    | 68 +++++++++++++++++++
 .../weichware10/analyse/gui/Analyzer.fxml     | 32 ---------
 .../analyse/gui/HeatmapConfigurator.fxml      | 52 ++++++++++++++
 6 files changed, 227 insertions(+), 44 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/HeatmapConfigurator.fxml

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index a999460..d137d69 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -1,6 +1,8 @@
 package github.weichware10.analyse.gui;
 
 import github.weichware10.analyse.Main;
+import github.weichware10.analyse.config.DiagramConfig;
+import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
@@ -20,6 +22,8 @@ public class Analyzer extends AbsScene {
     private static AnalyseType analyseType;
     private static TrialData trial;
     private static TrialData trialComp;
+    private static HeatmapConfig hmConfig = new HeatmapConfig();
+    private static DiagramConfig diaConfig = new DiagramConfig();
 
     /**
      * Startet die App.
@@ -45,6 +49,10 @@ public static void start() {
     public static void setAnalyseType(AnalyseType analyseType) {
         Analyzer.analyseType = analyseType;
 
+        // Zurücksetzen bei Änderung des Analyse-Typs
+        hmConfig = new HeatmapConfig();
+        diaConfig = new DiagramConfig();
+
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
             trialComp = null;
         }
@@ -57,8 +65,24 @@ public static void setAnalyseType(AnalyseType analyseType) {
      *
      * @param analyseTypMenuButton - MenuButton für Analyse-Typ
      */
-    public static void setTrialId(MenuButton analyseTypMenuButton) {
+    public static void setTrialId(MenuButton analyseTypMenuButton,
+            Button configButton, Button analyseButton, Button selectCompTrialButton) {
+        String oldTrialId = "null";
+        if (trial != null) {
+            oldTrialId = trial.getTrialId();
+        }
         trial = TrialSelector.getTrialData();
+
+        if (oldTrialId != trial.getTrialId()) {
+            // Zurücksetzen bei Änderung des Trials
+            analyseTypMenuButton.setDisable(true);
+            configButton.setDisable(true);
+            analyseButton.setDisable(true);
+            selectCompTrialButton.setVisible(false);
+            hmConfig = new HeatmapConfig();
+            diaConfig = new DiagramConfig();
+        }
+
         if (trial != null) {
             analyseTypMenuButton.setDisable(false);
         }
@@ -80,4 +104,21 @@ public static void setTrialIdComp(Button analyseButton) {
         Logger.info("trialIdComp set to " + trialComp.trialId);
     }
 
+    /**
+     * setzt die Konfiguration für Heatmap bzw. Diagramm Analyse
+     */
+    public static void setConfig() {
+        if (analyseType == AnalyseType.COMPHEATMAP
+                || analyseType == AnalyseType.HEATPMAP) {
+            HeatmapConfigurator.start(hmConfig);
+        } else if (analyseType == AnalyseType.RELFRQIMGAREA
+                || analyseType == AnalyseType.VIEWTIMEDISTR) {
+            // TODO: DiagrammConfigurator
+        }
+    }
+
+    public static void analyse() {
+        Logger.info("Analyzer");
+    }
+
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
index 3b43a00..f29995a 100644
--- a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
@@ -24,15 +24,17 @@ public class AnalyzerController extends AbsSceneController {
     @FXML
     void analyze(ActionEvent event) {
         // TODO: Start Analyse
+        Analyzer.analyse();
     }
 
     @FXML
     void selectTrial(ActionEvent event) {
-        analyseTypMenuButton.setDisable(true);
-        configButton.setDisable(true);
-        analyseButton.setDisable(true);
-        selectCompTrialButton.setVisible(false);
-        Analyzer.setTrialId(analyseTypMenuButton);
+        // analyseTypMenuButton.setDisable(true);
+        // configButton.setDisable(true);
+        // analyseButton.setDisable(true);
+        // selectCompTrialButton.setVisible(false);
+        Analyzer.setTrialId(analyseTypMenuButton, configButton,
+                analyseButton, selectCompTrialButton);
     }
 
     @FXML
@@ -50,7 +52,7 @@ void setCompHeatmap(ActionEvent event) {
 
     @FXML
     void setConfig(ActionEvent event) {
-        // TODO: KonfigDialog erstellen
+        Analyzer.setConfig();
     }
 
     @FXML
@@ -71,7 +73,7 @@ void setRelFrqImgArea(ActionEvent event) {
 
     @FXML
     void setVerlauf(ActionEvent event) {
-        configButton.setDisable(false);
+        configButton.setDisable(true);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
         Analyzer.setAnalyseType(AnalyseType.VERLAUF);
@@ -88,13 +90,13 @@ void setViewTimeDistr(ActionEvent event) {
     @FXML
     protected void initialize() {
         assert analyseButton != null :
-            "fx:id=\"analyseButton\" not injected: check  'Analyzer.fxml'.";
+            "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
         assert analyseTypMenuButton != null :
-            "fx:id=\"analyseTypMenuButton\" not injected: check  'Analyzer.fxml'.";
+            "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
         assert configButton != null :
-            "fx:id=\"configButton\" not injected: check  'Analyzer.fxml'.";
+            "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
         assert selectCompTrialButton != null :
-            "fx:id=\"selectCompTrialButton\" not injected: check  'Analyzer.fxml'.";
+            "fx:id=\"selectCompTrialButton\" not injected: check 'Analyzer.fxml'.";
     }
 
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java b/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
new file mode 100644
index 0000000..964555c
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
@@ -0,0 +1,52 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.config.HeatmapConfig;
+import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.layout.VBox;
+
+/**
+ * Konfiguratorfenster für Heatmap-Analysen der App.
+ */
+public class HeatmapConfigurator extends AbsScene {
+
+    private static VBox root;
+    private static HeatmapConfiguratorController controller;
+
+    /**
+     * Startet die App.
+     *
+     * @return - Erstellte Konfiguration
+     */
+    public static void start(HeatmapConfig hmConfig) {
+        Dialog<String> configDialog = new Dialog<>();
+        ButtonType applyButtonType = new ButtonType("Übernehmen", ButtonData.APPLY);
+        configDialog.getDialogPane().getButtonTypes().addAll(applyButtonType, ButtonType.CANCEL);
+
+        configDialog.setTitle("Konfiguration Heatmap");
+
+        InitResult ir = initialize(HeatmapConfigurator.class.getResource("HeatmapConfigurator.fxml"));
+        root = (VBox) ir.root;
+        controller = (HeatmapConfiguratorController) ir.controller;
+
+        // Beim erneueten Aufrufen bereits gesetzte Konfiguration wieder setzten
+        controller.setMinColorDiff(hmConfig.getMinColorDiff());
+        controller.setMaxColorDiff(hmConfig.getMaxColorDiff());
+        controller.setShowGrid(hmConfig.isGrid());
+        controller.setShowImage(hmConfig.isImage());
+
+        final Button ok = (Button) configDialog.getDialogPane().lookupButton(applyButtonType);
+        ok.addEventFilter(ActionEvent.ACTION, applyEvent -> {
+            hmConfig.setMinColorDiff(controller.getMinColorDiff());
+            hmConfig.setMaxColorDiff(controller.getMaxColorDiff());
+            hmConfig.setGrid(controller.getShowGrid());
+            hmConfig.setImage(controller.getShowImage());
+        });
+        configDialog.getDialogPane().setContent(root);
+        configDialog.showAndWait();
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
new file mode 100644
index 0000000..96b0391
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
@@ -0,0 +1,68 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ColorPicker;
+import javafx.scene.paint.Color;
+
+/**
+ * Konfigurator für {@link HeatmapConfigurator}.
+ */
+public class HeatmapConfiguratorController extends AbsSceneController {
+
+    @FXML
+    private ColorPicker maxColorDiff;
+    @FXML
+    private ColorPicker minColorDiff;
+    @FXML
+    private CheckBox showGrid;
+    @FXML
+    private CheckBox showImage;
+
+    protected Color getMaxColorDiff() {
+        return maxColorDiff.getValue();
+    }
+
+    protected Color getMinColorDiff() {
+        return minColorDiff.getValue();
+    }
+
+    protected boolean getShowGrid() {
+        return showGrid.isSelected();
+    }
+
+    protected boolean getShowImage() {
+        return showImage.isSelected();
+    }
+
+    public void setMaxColorDiff(Color maxColorDiff) {
+        this.maxColorDiff.setValue(maxColorDiff);
+    }
+
+    public void setMinColorDiff(Color minColorDiff) {
+        this.minColorDiff.setValue(minColorDiff);
+    }
+
+    public void setShowGrid(boolean showGrid) {
+        this.showGrid.setSelected(showGrid);
+    }
+
+    public void setShowImage(boolean showImage) {
+        this.showImage.setSelected(showImage);
+    }
+
+    @Override
+    protected void initialize() {
+        assert maxColorDiff != null :
+            "fx:id=\"maxColorDIff\" not injected: check 'HeatmapConfig.fxml'.";
+        assert minColorDiff != null :
+            "fx:id=\"minColorDiff\" not injected: check 'HeatmapConfig.fxml'.";
+        assert showGrid != null :
+            "fx:id=\"showGrid\" not injected: check 'HeatmapConfig.fxml'.";
+        assert showImage != null :
+            "fx:id=\"showImage\" not injected: check 'HeatmapConfig.fxml'.";
+
+    }
+
+}
diff --git a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
index 1f96f20..ccabc36 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
@@ -1,37 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-  Copyright (c) 2015, 2019, Gluon and/or its affiliates.
-  All rights reserved. Use is subject to license terms.
-
-  This file is available and licensed under the following license:
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  - Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the distribution.
-  - Neither the name of Oracle Corporation nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.BarChart?>
 <?import javafx.scene.chart.CategoryAxis?>
diff --git a/src/main/resources/github/weichware10/analyse/gui/HeatmapConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/HeatmapConfigurator.fxml
new file mode 100644
index 0000000..a802a8f
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/HeatmapConfigurator.fxml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ColorPicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.paint.Color?>
+<?import javafx.scene.text.Font?>
+
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="225.0" prefWidth="275.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.HeatmapConfiguratorController">
+   <children>
+      <Label alignment="CENTER" text="Konfiguration Heatmap" textAlignment="CENTER">
+         <font>
+            <Font size="16.0" />
+         </font>
+      </Label>
+      <HBox alignment="CENTER" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
+         <children>
+            <Label alignment="CENTER" text="Minimale Farbe" />
+            <ColorPicker fx:id="minColorDiff" promptText="minimale Farbe">
+               <value>
+                  <Color blue="1.0" />
+               </value>
+            </ColorPicker>
+         </children>
+      </HBox>
+      <HBox alignment="CENTER" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
+         <children>
+            <Label text="Maximale Farbe" />
+            <ColorPicker fx:id="maxColorDiff" promptText="maximale Farbe">
+               <value>
+                  <Color red="1.0" />
+               </value>
+            </ColorPicker>
+         </children>
+      </HBox>
+      <HBox alignment="CENTER" prefHeight="30.0" prefWidth="200.0" spacing="20.0">
+         <children>
+            <CheckBox fx:id="showGrid" alignment="TOP_LEFT" mnemonicParsing="false" selected="true" text="Raster anzeigen" />
+            <CheckBox fx:id="showImage" mnemonicParsing="false" selected="true" text="Bild anzeigen" />
+         </children>
+         <padding>
+            <Insets bottom="10.0" right="10.0" top="10.0" />
+         </padding>
+      </HBox>
+   </children>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" />
+   </padding>
+</VBox>

From 99f02cc9dbd780af91756736b0c13ae773669233 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 21:02:36 +0100
Subject: [PATCH 31/87] [style] checkstyle

---
 .../github/weichware10/analyse/gui/HeatmapConfigurator.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java b/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
index 964555c..289c965 100644
--- a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
@@ -20,7 +20,7 @@ public class HeatmapConfigurator extends AbsScene {
     /**
      * Startet die App.
      *
-     * @return - Erstellte Konfiguration
+     * @param hmConfig - aktuelle Konfiguration
      */
     public static void start(HeatmapConfig hmConfig) {
         Dialog<String> configDialog = new Dialog<>();
@@ -29,7 +29,8 @@ public static void start(HeatmapConfig hmConfig) {
 
         configDialog.setTitle("Konfiguration Heatmap");
 
-        InitResult ir = initialize(HeatmapConfigurator.class.getResource("HeatmapConfigurator.fxml"));
+        InitResult ir =
+                initialize(HeatmapConfigurator.class.getResource("HeatmapConfigurator.fxml"));
         root = (VBox) ir.root;
         controller = (HeatmapConfiguratorController) ir.controller;
 

From 86fbe493b60ae08a487e3ba7f5064ae0d79da9c4 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 23:21:52 +0100
Subject: [PATCH 32/87] [feat] added controller

---
 .../weichware10/analyse/gui/Analyzer.java     | 36 +++++++++----------
 .../analyse/gui/AnalyzerController.java       | 35 ++++++++----------
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index d137d69..eb80bbc 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -9,8 +9,6 @@
 import github.weichware10.util.data.TrialData;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
-import javafx.scene.control.Button;
-import javafx.scene.control.MenuButton;
 import javafx.stage.Screen;
 
 /**
@@ -19,6 +17,7 @@
 public class Analyzer extends AbsScene {
 
     private static Parent root;
+    private static AnalyzerController controller;
     private static AnalyseType analyseType;
     private static TrialData trial;
     private static TrialData trialComp;
@@ -30,14 +29,16 @@ public class Analyzer extends AbsScene {
      */
     public static void start() {
         Rectangle2D screenBounds = Screen.getPrimary().getBounds();
-        root = start(Main.primaryStage,
+        InitResult ir = start(Main.primaryStage,
                 Login.class.getResource("Analyzer.fxml"),
                 root,
                 null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2).root;
+                (int) screenBounds.getHeight() / 2);
+        root = ir.root;
+        controller = (AnalyzerController) ir.controller;
     }
 
     /**
@@ -62,11 +63,8 @@ public static void setAnalyseType(AnalyseType analyseType) {
 
     /**
      * Setzt das ausgewählte Trial.
-     *
-     * @param analyseTypMenuButton - MenuButton für Analyse-Typ
      */
-    public static void setTrialId(MenuButton analyseTypMenuButton,
-            Button configButton, Button analyseButton, Button selectCompTrialButton) {
+    public static void setTrialId() {
         String oldTrialId = "null";
         if (trial != null) {
             oldTrialId = trial.getTrialId();
@@ -75,31 +73,29 @@ public static void setTrialId(MenuButton analyseTypMenuButton,
 
         if (oldTrialId != trial.getTrialId()) {
             // Zurücksetzen bei Änderung des Trials
-            analyseTypMenuButton.setDisable(true);
-            configButton.setDisable(true);
-            analyseButton.setDisable(true);
-            selectCompTrialButton.setVisible(false);
+            controller.analyseTypMenuButton.setDisable(true);
+            controller.configButton.setDisable(true);
+            controller.analyseButton.setDisable(true);
+            controller.selectCompTrialButton.setVisible(false);
             hmConfig = new HeatmapConfig();
             diaConfig = new DiagramConfig();
         }
 
         if (trial != null) {
-            analyseTypMenuButton.setDisable(false);
+            controller.analyseTypMenuButton.setDisable(false);
         }
         Logger.info("trialId set to " + trial.trialId);
     }
 
     /**
      *  Setzt das ausgewählte Vergleichs Trial.
-     *
-     * @param analyseButton - MenuButton für Analyse-Typ
      */
-    public static void setTrialIdComp(Button analyseButton) {
+    public static void setTrialIdComp() {
         trialComp = TrialSelector.getTrialData();
         if (trialComp != null) {
-            analyseButton.setDisable(false);
+            controller.analyseButton.setDisable(false);
         } else {
-            analyseButton.setDisable(true);
+            controller.analyseButton.setDisable(true);
         }
         Logger.info("trialIdComp set to " + trialComp.trialId);
     }
@@ -111,9 +107,11 @@ public static void setConfig() {
         if (analyseType == AnalyseType.COMPHEATMAP
                 || analyseType == AnalyseType.HEATPMAP) {
             HeatmapConfigurator.start(hmConfig);
+            Logger.info("Start Heatmap Configurator");
         } else if (analyseType == AnalyseType.RELFRQIMGAREA
                 || analyseType == AnalyseType.VIEWTIMEDISTR) {
-            // TODO: DiagrammConfigurator
+            DiagramConfigurator.start(diaConfig, analyseType);
+            Logger.info("Start Diagram Configurator");
         }
     }
 
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
index f29995a..c447bc6 100644
--- a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
@@ -13,37 +13,32 @@
 public class AnalyzerController extends AbsSceneController {
 
     @FXML
-    private Button analyseButton;
+    protected Button analyseButton;
     @FXML
-    private MenuButton analyseTypMenuButton;
+    protected MenuButton analyseTypMenuButton;
     @FXML
-    private Button configButton;
+    protected Button configButton;
     @FXML
-    private Button selectCompTrialButton;
+    protected Button selectCompTrialButton;
 
     @FXML
-    void analyze(ActionEvent event) {
+    protected void analyze(ActionEvent event) {
         // TODO: Start Analyse
         Analyzer.analyse();
     }
 
     @FXML
-    void selectTrial(ActionEvent event) {
-        // analyseTypMenuButton.setDisable(true);
-        // configButton.setDisable(true);
-        // analyseButton.setDisable(true);
-        // selectCompTrialButton.setVisible(false);
-        Analyzer.setTrialId(analyseTypMenuButton, configButton,
-                analyseButton, selectCompTrialButton);
+    protected void selectTrial(ActionEvent event) {
+        Analyzer.setTrialId();
     }
 
     @FXML
-    void selectTrialForComp(ActionEvent event) {
-        Analyzer.setTrialIdComp(analyseButton);
+    protected void selectTrialForComp(ActionEvent event) {
+        Analyzer.setTrialIdComp();
     }
 
     @FXML
-    void setCompHeatmap(ActionEvent event) {
+    protected void setCompHeatmap(ActionEvent event) {
         configButton.setDisable(false);
         analyseButton.setDisable(true);
         selectCompTrialButton.setVisible(true);
@@ -51,12 +46,12 @@ void setCompHeatmap(ActionEvent event) {
     }
 
     @FXML
-    void setConfig(ActionEvent event) {
+    protected void setConfig(ActionEvent event) {
         Analyzer.setConfig();
     }
 
     @FXML
-    void setHeapmap(ActionEvent event) {
+    protected void setHeapmap(ActionEvent event) {
         configButton.setDisable(false);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
@@ -64,7 +59,7 @@ void setHeapmap(ActionEvent event) {
     }
 
     @FXML
-    void setRelFrqImgArea(ActionEvent event) {
+    protected void setRelFrqImgArea(ActionEvent event) {
         configButton.setDisable(false);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
@@ -72,7 +67,7 @@ void setRelFrqImgArea(ActionEvent event) {
     }
 
     @FXML
-    void setVerlauf(ActionEvent event) {
+    protected void setVerlauf(ActionEvent event) {
         configButton.setDisable(true);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
@@ -80,7 +75,7 @@ void setVerlauf(ActionEvent event) {
     }
 
     @FXML
-    void setViewTimeDistr(ActionEvent event) {
+    protected void setViewTimeDistr(ActionEvent event) {
         configButton.setDisable(false);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);

From 22a8b4b6bdbcb5188897054c358688d26cf71215 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 23:22:07 +0100
Subject: [PATCH 33/87] [fix] private -> protected

---
 .../gui/HeatmapConfiguratorController.java       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
index 96b0391..23bc964 100644
--- a/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
@@ -12,13 +12,13 @@
 public class HeatmapConfiguratorController extends AbsSceneController {
 
     @FXML
-    private ColorPicker maxColorDiff;
+    protected ColorPicker maxColorDiff;
     @FXML
-    private ColorPicker minColorDiff;
+    protected ColorPicker minColorDiff;
     @FXML
-    private CheckBox showGrid;
+    protected CheckBox showGrid;
     @FXML
-    private CheckBox showImage;
+    protected CheckBox showImage;
 
     protected Color getMaxColorDiff() {
         return maxColorDiff.getValue();
@@ -36,19 +36,19 @@ protected boolean getShowImage() {
         return showImage.isSelected();
     }
 
-    public void setMaxColorDiff(Color maxColorDiff) {
+    protected void setMaxColorDiff(Color maxColorDiff) {
         this.maxColorDiff.setValue(maxColorDiff);
     }
 
-    public void setMinColorDiff(Color minColorDiff) {
+    protected void setMinColorDiff(Color minColorDiff) {
         this.minColorDiff.setValue(minColorDiff);
     }
 
-    public void setShowGrid(boolean showGrid) {
+    protected void setShowGrid(boolean showGrid) {
         this.showGrid.setSelected(showGrid);
     }
 
-    public void setShowImage(boolean showImage) {
+    protected void setShowImage(boolean showImage) {
         this.showImage.setSelected(showImage);
     }
 

From cd742552a6d6067a17b239b4bc230b7ab8e767d9 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 23:23:53 +0100
Subject: [PATCH 34/87] [feat] Konfiguration Diagramm Versuche

---
 .../analyse/config/DiagramConfig.java         |  14 +-
 .../analyse/gui/DiagramConfigurator.java      |  76 ++++++++++
 .../gui/DiagramConfiguratorController.java    | 134 ++++++++++++++++++
 .../analyse/gui/DiagramConfigurator.fxml      |  49 +++++++
 4 files changed, 266 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/DiagramConfigurator.fxml

diff --git a/src/main/java/github/weichware10/analyse/config/DiagramConfig.java b/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
index edd3b0b..899f5f2 100644
--- a/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
+++ b/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
@@ -5,8 +5,8 @@
  */
 public class DiagramConfig {
     private int amountAreas; // * 2,4,6,8
-    private float minTime; // * >= 0 Länge | Zoomstufe
-    private float maxTime; // * <= 10 Länge | Zoomstufe
+    private double minTime; // * >= 0 Länge | Zoomstufe
+    private double maxTime; // * <= 10 Länge | Zoomstufe
     private int stepsBetween; // * [1,10], minTime=maxTime: steps = 0
 
     /**
@@ -14,8 +14,8 @@ public class DiagramConfig {
      */
     public DiagramConfig() {
         this.amountAreas = 4;
-        this.minTime = 0.5f;
-        this.maxTime = 2.5f;
+        this.minTime = 0.0f;
+        this.maxTime = 10.0f;
         this.stepsBetween = 4;
     }
 
@@ -54,7 +54,7 @@ public int getAmountAreas() {
      *         true, falls neue min. und max. Zeit erfolgreich gesetzt wurden;
      *         false, falls neue min. und max. Zeit nicht gesetzt wurden
      */
-    public boolean setNewTime(float minTime, float maxTime) {
+    public boolean setNewTime(double minTime, double maxTime) {
         if (minTime >= 0.0f && maxTime <= 10.0f && minTime <= maxTime) {
             this.minTime = minTime;
             this.maxTime = maxTime;
@@ -72,7 +72,7 @@ public boolean setNewTime(float minTime, float maxTime) {
      *
      * @return minimale Zeit
      */
-    public float getMinTime() {
+    public double getMinTime() {
         return minTime;
     }
 
@@ -81,7 +81,7 @@ public float getMinTime() {
      *
      * @return maximale Zeit
      */
-    public float getMaxTime() {
+    public double getMaxTime() {
         return maxTime;
     }
 
diff --git a/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java b/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
new file mode 100644
index 0000000..3c36cae
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
@@ -0,0 +1,76 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.config.DiagramConfig;
+import github.weichware10.analyse.enums.AnalyseType;
+import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.layout.VBox;
+
+/**
+ * Konfiguratorfenster für Diagramm-Analysen der App.
+ */
+public class DiagramConfigurator extends AbsScene {
+
+    private static VBox root;
+    private static DiagramConfiguratorController controller;
+
+    /**
+     * Startet die App.
+     *
+     * @param diaConfig - aktuelle Konfiguration
+     */
+    public static void start(DiagramConfig diaConfig, AnalyseType analyseType) {
+        Dialog<String> configDialog = new Dialog<>();
+        ButtonType applyButtonType = new ButtonType("Übernehmen", ButtonData.APPLY);
+        configDialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, applyButtonType);
+
+        configDialog.setTitle("Konfiguration Diagramm");
+
+        InitResult ir =
+                initialize(DiagramConfigurator.class.getResource("DiagramConfigurator.fxml"));
+        root = (VBox) ir.root;
+        controller = (DiagramConfiguratorController) ir.controller;
+
+        // Sichtbarkeitseinstellungen
+        if (analyseType == AnalyseType.RELFRQIMGAREA) {
+            controller.amountAreas.setDisable(false);
+            controller.minTimeSlider.setDisable(true);
+            controller.maxTimeSlider.setDisable(true);
+            controller.stepsSlider.setDisable(true);
+            controller.minTimeLabel.setVisible(false);
+            controller.maxTimeLabel.setVisible(false);
+            controller.stepsLabel.setVisible(false);
+        } else if (analyseType == AnalyseType.VIEWTIMEDISTR) {
+            controller.amountAreas.setDisable(true);
+            controller.minTimeSlider.setDisable(false);
+            controller.maxTimeSlider.setDisable(false);
+            controller.stepsSlider.setDisable(false);
+            controller.minTimeLabel.setVisible(true);
+            controller.maxTimeLabel.setVisible(true);
+            controller.stepsLabel.setVisible(true);
+        }
+
+        // Beim erneueten Aufrufen bereits gesetzte Konfiguration wieder setzten
+        controller.initAmountBox(diaConfig.getAmountAreas());
+        controller.initMinTimeSlider(diaConfig.getMinTime());
+        controller.initMaxTimeSlider(diaConfig.getMaxTime());
+        controller.initStepsSlider(diaConfig.getStepsBetween());
+
+
+        final Button ok = (Button) configDialog.getDialogPane().lookupButton(applyButtonType);
+        ok.addEventFilter(ActionEvent.ACTION, applyEvent -> {
+            if (analyseType == AnalyseType.RELFRQIMGAREA) {
+                diaConfig.setAmountAreas(controller.getAmountAreas());
+            } else if (analyseType == AnalyseType.VIEWTIMEDISTR) {
+                diaConfig.setNewTime(controller.getMinTime(), controller.getMaxTime());
+                diaConfig.setStepsBetween(controller.getSteps());
+            }
+        });
+        configDialog.getDialogPane().setContent(root);
+        configDialog.showAndWait();
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java
new file mode 100644
index 0000000..070670b
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java
@@ -0,0 +1,134 @@
+package github.weichware10.analyse.gui;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import java.text.DecimalFormat;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.Slider;
+
+/**
+ * Kontroller für {@link  DiagramConfigurator}.
+ */
+public class DiagramConfiguratorController extends AbsSceneController {
+
+    private double maxTime;
+    private double minTime;
+    private int steps;
+    @FXML
+    protected ComboBox<Integer> amountAreas;
+    @FXML
+    protected Slider maxTimeSlider;
+    @FXML
+    protected Label maxTimeLabel;
+    @FXML
+    protected Slider minTimeSlider;
+    @FXML
+    protected Label minTimeLabel;
+    @FXML
+    protected Slider stepsSlider;
+    @FXML
+    protected Label stepsLabel;
+
+    protected void initAmountBox(int current) {
+        for (Integer i = 2; i <= 8; i += 2) {
+            amountAreas.getItems().add(i);
+        }
+        amountAreas.setValue(current);
+    }
+
+    protected void initMaxTimeSlider(double current) {
+        maxTimeSlider.adjustValue(current);
+    }
+
+    protected void initMinTimeSlider(double current) {
+        minTimeSlider.adjustValue(current);
+    }
+
+    protected void initStepsSlider(int current) {
+        stepsSlider.adjustValue(current);
+    }
+
+    public int getAmountAreas() {
+        return amountAreas.getValue();
+    }
+
+    public double getMaxTime() {
+        return maxTime;
+    }
+
+    public double getMinTime() {
+        return minTime;
+    }
+
+    public int getSteps() {
+        return steps;
+    }
+
+    @FXML
+    protected void initialize() {
+        assert amountAreas != null
+                : "fx:id=\"amountAreas\" not injected: check 'DiagramConfigurator.fxml'.";
+        assert maxTimeSlider != null
+                : "fx:id=\"maxTime\" not injected: check 'DiagramConfigurator.fxml'.";
+        assert maxTimeLabel != null
+                : "fx:id=\"maxTimeLabel\" not injected: check 'DiagramConfigurator.fxml'.";
+        assert minTimeSlider != null
+                : "fx:id=\"minTime\" not injected: check 'DiagramConfigurator.fxml'.";
+        assert minTimeLabel != null
+                : "fx:id=\"minTimeLabel\" not injected: check 'DiagramConfigurator.fxml'.";
+        assert stepsSlider != null
+                : "fx:id=\"steps\" not injected: check 'DiagramConfigurator.fxml'.";
+        assert stepsLabel != null
+                : "fx:id=\"stepsLabel\" not injected: check 'DiagramConfigurator.fxml'.";
+
+        DecimalFormat df = new DecimalFormat("0.00");
+
+        maxTimeSlider.valueProperty().addListener(new ChangeListener<Number>() {
+
+            @Override
+            public void changed(ObservableValue<? extends Number> observable,
+                    Number oldValue, Number newValue) {
+                maxTime = maxTimeSlider.getValue();
+                maxTimeLabel.setText(df.format(maxTime));
+                minTimeSlider.setMax(maxTime);
+                if (maxTime == 0.0f) {
+                    minTimeSlider.setDisable(true);
+                } else {
+                    minTimeSlider.setDisable(false);
+                }
+            }
+
+        });
+
+        minTimeSlider.valueProperty().addListener(new ChangeListener<Number>() {
+
+            @Override
+            public void changed(ObservableValue<? extends Number> observable,
+                    Number oldValue, Number newValue) {
+                minTime = minTimeSlider.getValue();
+                minTimeLabel.setText(df.format(minTime));
+                maxTimeSlider.setMin(minTime);
+                if (minTime == 10.0f) {
+                    maxTimeSlider.setDisable(true);
+                } else {
+                    maxTimeSlider.setDisable(false);
+                }
+            }
+
+        });
+
+        stepsSlider.valueProperty().addListener(new ChangeListener<Number>() {
+
+            @Override
+            public void changed(ObservableValue<? extends Number> observable,
+                    Number oldValue, Number newValue) {
+                steps = (int) stepsSlider.getValue();
+                stepsLabel.setText(Integer.toString(steps));
+            }
+
+        });
+    }
+}
diff --git a/src/main/resources/github/weichware10/analyse/gui/DiagramConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/DiagramConfigurator.fxml
new file mode 100644
index 0000000..59a6b3d
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/DiagramConfigurator.fxml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="250.0" prefWidth="300.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.DiagramConfiguratorController">
+   <children>
+      <Label alignment="CENTER" text="Konfiguration Diagramm" textAlignment="CENTER">
+         <font>
+            <Font size="16.0" />
+         </font>
+      </Label>
+      <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
+         <children>
+            <Label alignment="CENTER" text="Anzahl Bereiche" />
+            <ComboBox fx:id="amountAreas" prefWidth="75.0" />
+         </children>
+      </HBox>
+      <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
+         <children>
+            <Label text="Minimale Zeit" />
+            <Slider fx:id="minTimeSlider" blockIncrement="0.1" majorTickUnit="1.0" max="10.0" minorTickCount="10" showTickLabels="true" showTickMarks="true" snapToTicks="true" />
+            <Label fx:id="minTimeLabel" text="0.00" />
+         </children>
+      </HBox>
+      <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
+         <children>
+            <Label text="Maximale Zeit" />
+            <Slider fx:id="maxTimeSlider" blockIncrement="0.1" majorTickUnit="1.0" max="10.0" minorTickCount="10" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="10.0" />
+            <Label fx:id="maxTimeLabel" text="10.0" />
+         </children>
+      </HBox>
+      <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
+         <children>
+            <Label text="Schritte" />
+            <Slider fx:id="stepsSlider" blockIncrement="1.0" majorTickUnit="1.0" max="10.0" min="1.0" minorTickCount="0" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="1.0" />
+            <Label fx:id="stepsLabel" text="1" />
+         </children>
+      </HBox>
+   </children>
+   <padding>
+      <Insets bottom="10.0" left="10.0" right="10.0" />
+   </padding>
+</VBox>

From 2efa8848231676d6dc3a3661aafa3eb21f0df007 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 9 Jan 2022 23:24:14 +0100
Subject: [PATCH 35/87] [test] value change

---
 .../github/weichware10/analyse/config/DiagramConfigTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java b/src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java
index a8f0ef9..bdaabed 100644
--- a/src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java
+++ b/src/test/java/github/weichware10/analyse/config/DiagramConfigTest.java
@@ -38,7 +38,7 @@ public void amountAreasShouldBeSet() {
     @Test
     public void minTimeShouldBeSet() {
         DiagramConfig confDia1 = new DiagramConfig();
-        assertEquals("getMinTime sollte 0.5 zurückgeben", 0.5f, confDia1.getMinTime(), 0.00001f);
+        assertEquals("getMinTime sollte 0.0 zurückgeben", 0.0f, confDia1.getMinTime(), 0.00001f);
 
         DiagramConfig confDia2 = new DiagramConfig();
         assertTrue("setNewTime sollte True zurückgeben", confDia2.setNewTime(1.0f, 2.5f));
@@ -60,7 +60,7 @@ public void minTimeShouldBeSet() {
     @Test
     public void maxTimeShouldBeSet() {
         DiagramConfig confDia1 = new DiagramConfig();
-        assertEquals("getMaxTime sollte 2.5 zurückgeben", 2.5f, confDia1.getMaxTime(), 0.00001f);
+        assertEquals("getMaxTime sollte 10.0 zurückgeben", 10.0f, confDia1.getMaxTime(), 0.00001f);
 
         DiagramConfig confDia2 = new DiagramConfig();
         assertTrue("setNewTime sollte True zurückgeben", confDia2.setNewTime(0.5f, 3.0f));

From 128f3ee0c1f9820d365b5036825d92f8afc51c01 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Mon, 10 Jan 2022 14:52:56 +0100
Subject: [PATCH 36/87] [feat] database url stuff

---
 .../java/github/weichware10/analyse/Main.java  |  2 ++
 .../github/weichware10/analyse/gui/Login.java  |  7 +++----
 .../weichware10/analyse/gui/MainMenuBar.java   | 18 ++++++++++++++++++
 .../analyse/gui/MainMenuBarController.java     | 16 ++++------------
 .../weichware10/analyse/gui/MainMenuBar.fxml   |  6 +++---
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index b3e9f36..1761e80 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -20,6 +20,7 @@ public class Main extends Application {
 
     public static Stage primaryStage;
     public static DataBaseClient dataBaseClient;
+    public static String databaseUrl;
 
     /**
      * Einstiegspunkt der Analyse.
@@ -47,6 +48,7 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, e -> keyBindings(e));
     }
 
+    // TODO rausnehmen weil nicht mehr debuggen
     private void keyBindings(KeyEvent keyEvent) {
         if (keyEvent.getCode().equals(KeyCode.K) && keyEvent.isControlDown()) {
             TrialSelector.getTrialData();
diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/Login.java
index 0b4f6a0..1e52787 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/Login.java
@@ -22,7 +22,6 @@
 public class Login extends AbsScene {
     private static SimpleBooleanProperty connection = new SimpleBooleanProperty(false);
     public static ObservableBooleanValue hasConnection = connection;
-    public static String databaseUrl;
 
     private static Parent root;
 
@@ -61,13 +60,13 @@ public static void connectToDatabase(String username, String password, String sc
 
             @Override
             public void run() {
-                if (databaseUrl == null) {
+                if (Main.databaseUrl == null) {
                     Dotenv dotenv = Dotenv.load();
-                    databaseUrl = dotenv.get("DB_URL");
+                    Main.databaseUrl = dotenv.get("DB_URL");
                 }
                 try {
                     Main.dataBaseClient = new DataBaseClient(
-                            databaseUrl, username, password, schema);
+                            Main.databaseUrl, username, password, schema);
                     connection.set(true);
                     Platform.runLater(() -> setError(warnText, errorText, indicator, false, null));
                 } catch (IllegalArgumentException e) {
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
index e27151e..6f7040d 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
@@ -1,12 +1,15 @@
 package github.weichware10.analyse.gui;
 
+import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
 import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Optional;
 import javafx.scene.control.MenuBar;
+import javafx.scene.control.TextInputDialog;
 
 /**
  * Haupt-Menüleiste.
@@ -41,4 +44,19 @@ protected static void openDocs() {
             }
         }
     }
+
+    protected static void changeDataBaseUrl() {
+        TextInputDialog tid = new TextInputDialog();
+        tid.setTitle("DATABASE URL CHANGE");
+        tid.setHeaderText("DATABASE URL CHANGE");
+        tid.setContentText("Please input a new URL");
+        Optional<String> res = tid.showAndWait();
+        if (res.isPresent() && res.get().length() > 0) {
+            Main.databaseUrl = res.get();
+        }
+    }
+
+    protected static void resetDataBaseUrl() {
+        Main.databaseUrl = null;
+    }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
index 1812b5f..1bdb583 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
+++ b/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
@@ -11,10 +11,6 @@
  * Controller für {@link MainMenuBar}.
  */
 public class MainMenuBarController extends AbsSceneController {
-    @FXML
-    private MenuItem databaseChange;
-    @FXML
-    private MenuItem databaseUrlReset;
     @FXML
     private MenuItem logOutMenu;
     @FXML
@@ -37,13 +33,13 @@ public void openDocumentation() {
     }
 
     @FXML
-    protected static void resetDataBaseUrl() {
-        Login.databaseUrl = null;
+    protected void resetDataBaseUrl() {
+        MainMenuBar.resetDataBaseUrl();
     }
 
     @FXML
-    protected static void setDataBaseUrl() {
-        ;
+    protected void setDataBaseUrl() {
+        MainMenuBar.changeDataBaseUrl();
     }
 
     @FXML
@@ -66,10 +62,6 @@ void setLogText(ObservableBooleanValue visible) {
 
     @Override
     protected void initialize() {
-        assert databaseChange != null
-                : "fx:id=\"databaseChange\" not injected: check 'MainMenuBar.fxml'.";
-        assert databaseUrlReset != null
-                : "fx:id=\"databaseUrlReset\" not injected: check 'MainMenuBar.fxml'.";
         assert logOutMenu != null
                 : "fx:id=\"logOutMenu\" not injected: check 'MainMenuBar.fxml'.";
         assert logsMenu != null
diff --git a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
index 7b4f5f5..20fe1cb 100644
--- a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
@@ -9,10 +9,10 @@
   <menus>
     <Menu mnemonicParsing="false" text="File">
       <items>
-            <MenuItem fx:id="databaseChange" mnemonicParsing="false" text="Datenbank ändern" />
-            <MenuItem fx:id="databaseUrlReset" mnemonicParsing="false" text="Datenbank URL reset" />
+            <MenuItem mnemonicParsing="false" onAction="#setDataBaseUrl" text="Datenbank ändern" />
+            <MenuItem mnemonicParsing="false" onAction="#resetDataBaseUrl" text="Datenbank URL reset" />
             <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem fx:id="logsMenu" mnemonicParsing="false" onAction="#toggleLogs" text="show Logs" />
+            <MenuItem mnemonicParsing="false" onAction="#toggleLogs" text="show Logs" />
             <SeparatorMenuItem mnemonicParsing="false" />
         <MenuItem fx:id="logOutMenu" disable="true" mnemonicParsing="false" onAction="#logOut" text="Ausloggen" />
       </items>

From 18c41c19a38a118f26cbb5b70532417684ea8bcc Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Tue, 11 Jan 2022 15:58:53 +0100
Subject: [PATCH 37/87] [fix] debug stuff entfernt

---
 src/main/java/github/weichware10/analyse/Main.java | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 1761e80..f7b1c80 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,15 +1,12 @@
 package github.weichware10.analyse;
 
 import github.weichware10.analyse.gui.Login;
-import github.weichware10.analyse.gui.TrialSelector;
 import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.scene.image.Image;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
 import org.joda.time.DateTime;
 
@@ -45,13 +42,5 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.setMinHeight(300);
         primaryStage.setMinWidth(300);
         primaryStage.show();
-        primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, e -> keyBindings(e));
-    }
-
-    // TODO rausnehmen weil nicht mehr debuggen
-    private void keyBindings(KeyEvent keyEvent) {
-        if (keyEvent.getCode().equals(KeyCode.K) && keyEvent.isControlDown()) {
-            TrialSelector.getTrialData();
-        }
     }
 }

From a4d0b6cd98800db4cdc5554712959dd69e7508e6 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Tue, 11 Jan 2022 18:37:43 +0100
Subject: [PATCH 38/87] [feat] pom JVM update

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95c3b3f..17fd0a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,9 @@
     <app.version>${maven.build.timestamp}</app.version>
 
     <!-- modules for custom JVM image -->
-    <jvm.modules>javafx.media,javafx.controls,javafx.fxml,java.logging</jvm.modules>
+    <!-- JAVAFX: media, controls, fxml -->
+    <!-- UTIL: sql, management, security.sasl -->
+    <jvm.modules>javafx.media,javafx.controls,javafx.fxml,java.logging,java.sql,java.management,java.security.sasl,jdk.crypto.ec</jvm.modules>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>17</maven.compiler.source>

From 96bf9bcd6e0f2a190de8c17a0662d69bd0bc8902 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Tue, 11 Jan 2022 18:38:00 +0100
Subject: [PATCH 39/87] [feat] aktueller Stand TrialSelector

---
 .../weichware10/analyse/gui/Analyzer.java     |  4 +-
 .../analyse/gui/TrialSelector.java            | 46 +++++++++++++------
 .../analyse/gui/TrialSelectorController.java  | 18 +++++++-
 .../analyse/gui/TrialSelector.fxml            | 38 +++++++++------
 4 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index eb80bbc..b4f3ab3 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -69,7 +69,7 @@ public static void setTrialId() {
         if (trial != null) {
             oldTrialId = trial.getTrialId();
         }
-        trial = TrialSelector.getTrialData();
+        trial = TrialSelector.getTrialData(null);
 
         if (oldTrialId != trial.getTrialId()) {
             // Zurücksetzen bei Änderung des Trials
@@ -91,7 +91,7 @@ public static void setTrialId() {
      *  Setzt das ausgewählte Vergleichs Trial.
      */
     public static void setTrialIdComp() {
-        trialComp = TrialSelector.getTrialData();
+        trialComp = TrialSelector.getTrialData(trial.configId);
         if (trialComp != null) {
             controller.analyseButton.setDisable(false);
         } else {
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index 2cd8e12..0d817b1 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -24,30 +24,31 @@ public class TrialSelector extends AbsScene {
     private static BorderPane root;
     private static TrialSelectorController controller;
     private static String trialId;
+    private static String fixedConfigId = null;
 
     /**
      * Auswahldialog für Trial.
      */
-    public static TrialData getTrialData() {
-
+    public static TrialData getTrialData(String fixedConfigId) {
         Dialog<Void> selectorDialog = new Dialog<>();
         ButtonType select = new ButtonType("Trial auswählen", ButtonData.APPLY);
         selectorDialog.getDialogPane().getButtonTypes().addAll(select, ButtonType.CANCEL);
 
         selectorDialog.getDialogPane().setContent((root != null) ? root : initialize());
 
-        final Button selectButton = (Button) selectorDialog.getDialogPane().lookupButton(select);
+        TrialSelector.fixedConfigId = fixedConfigId;
+        if (fixedConfigId != null) {
+            controller.configIdField.setText(fixedConfigId);
+            controller.configIdField.setDisable(true);
+            search();
+        } else {
+            controller.configIdField.setText("");
+            controller.configIdField.setDisable(false);
+        }
 
-        selectButton.addEventFilter(ActionEvent.ACTION, selectEvent -> {
-            TrialData selected = controller.resultTable.getSelectionModel().getSelectedItem();
-            if (selected == null) {
-                controller.setWarn("Bitte wählen Sie ein Trial aus.");
-                selectEvent.consume();
-                return;
-            }
-            trialId = selected.trialId;
-        });
+        final Button selectButton = (Button) selectorDialog.getDialogPane().lookupButton(select);
 
+        selectButton.addEventFilter(ActionEvent.ACTION, e -> selectEventFilter(e));
 
         selectorDialog.showAndWait();
 
@@ -85,6 +86,16 @@ public void run() {
         searchThread.start();
     }
 
+    protected static void reset() {
+        controller.initResultTable();
+        controller.initAmountBox();
+        controller.initEndPicker();
+        if (fixedConfigId == null) {
+            controller.configIdField.setText("");
+            controller.configIdField.setDisable(true);
+        }
+    }
+
     private static DateTime localDateToDateTime(java.time.LocalDate localDate, boolean endOfDay) {
         if (localDate == null) {
             return null;
@@ -105,7 +116,16 @@ private static BorderPane initialize() {
         controller.initToolTypeBox();
         controller.initResultTable();
         controller.initEndPicker();
-
         return root;
     }
+
+    private static void selectEventFilter(ActionEvent selectEvent) {
+        TrialData selected = controller.resultTable.getSelectionModel().getSelectedItem();
+        if (selected == null) {
+            controller.setWarn("Bitte wählen Sie ein Trial aus.");
+            selectEvent.consume();
+            return;
+        }
+        trialId = selected.trialId;
+    }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
index 63f5d34..304d12e 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
@@ -43,6 +43,10 @@ public class TrialSelectorController extends AbsSceneController {
     protected Label warnLabel;
     @FXML
     protected ProgressIndicator indicator;
+    @FXML
+    protected Button resetButton;
+    @FXML
+    protected TextField trialIdField;
 
     @FXML
     protected Integer checkAmountInput() {
@@ -70,6 +74,11 @@ private void search() {
         TrialSelector.search();
     }
 
+    @FXML
+    private void reset() {
+        TrialSelector.reset();
+    }
+
     protected void setWarn(String warn) {
         warnLabel.setText(warn);
     }
@@ -103,6 +112,10 @@ protected void initAmountBox(int minAmount, int maxAmount, int defaultAmount) {
         for (Integer i = minAmount; i <= maxAmount; i++) {
             amountBox.getItems().add(i);
         }
+        initAmountBox();
+    }
+
+    protected void initAmountBox() {
         amountBox.setValue(defaultAmount);
     }
 
@@ -133,7 +146,10 @@ protected void initialize() {
                 : "fx:id=\"warnLabel\" not injected: check 'TrialSelector.fxml'.";
         assert indicator != null
                 : "fx:id=\"indicator\" not injected: check 'TrialSelector.fxml'.";
-
+        assert resetButton != null
+                : "fx:id=\"resetButton\" not injected: check 'TrialSelector.fxml'.";
+        assert trialIdField != null
+                : "fx:id=\"trialIdField\" not injected: check 'TrialSelector.fxml'.";
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
index dd01b78..6361f81 100644
--- a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
@@ -13,7 +13,6 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-
 <BorderPane prefHeight="700.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.TrialSelectorController">
    <center>
       <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
@@ -21,13 +20,6 @@
             <HBox alignment="CENTER_LEFT" spacing="10.0">
                <children>
                   <Label text="Bitte filtern Sie die Versuchsliste, um Ergebnisse zu finden." HBox.hgrow="ALWAYS" />
-                  <HBox alignment="CENTER_RIGHT" fillHeight="false" spacing="10.0" HBox.hgrow="ALWAYS">
-                     <children>
-                        <TextField prefWidth="174.0" promptText="Versuchs-ID" />
-                        <ComboBox fx:id="amountBox" editable="true" onAction="#checkAmountInput" onKeyPressed="#checkAmountInput" prefWidth="112.0" promptText="Anzahl" />
-                        <Button fx:id="searchButton" mnemonicParsing="false" onAction="#search" text="Suchen" />
-                     </children>
-                  </HBox>
                </children>
             </HBox>
             <HBox spacing="10.0">
@@ -38,6 +30,27 @@
                   <DatePicker fx:id="endPicker" promptText="End-Datum" />
                </children>
             </HBox>
+            <HBox alignment="CENTER_LEFT" spacing="10.0">
+               <children>
+                  <Label text="Bei Eingabe einer Versuchs-ID werden andere Parameter ignoriert." />
+                  <HBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
+                     <children>
+                        <TextField prefHeight="25.0" prefWidth="177.0" promptText="Versuchs-ID" />
+                     </children>
+                  </HBox>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER_RIGHT" spacing="10.0">
+               <children>
+                  <Button mnemonicParsing="false" text="zurücksetzen" />
+                  <HBox alignment="CENTER_RIGHT" spacing="10.0" HBox.hgrow="ALWAYS">
+                     <children>
+                        <ComboBox fx:id="amountBox" editable="true" onAction="#checkAmountInput" onKeyPressed="#checkAmountInput" prefHeight="25.0" prefWidth="112.0" promptText="Anzahl" />
+                        <Button fx:id="searchButton" mnemonicParsing="false" onAction="#search" text="Suchen" />
+                     </children>
+                  </HBox>
+               </children>
+            </HBox>
             <StackPane VBox.vgrow="ALWAYS">
                <children>
                   <TableView fx:id="resultTable" focusTraversable="false" prefHeight="200.0" prefWidth="200.0">
@@ -55,17 +68,12 @@
       </VBox>
    </center>
    <bottom>
-      <HBox BorderPane.alignment="CENTER_RIGHT">
+      <HBox alignment="CENTER_RIGHT" BorderPane.alignment="CENTER_RIGHT">
          <BorderPane.margin>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </BorderPane.margin>
          <children>
-            <Button mnemonicParsing="false" text="reset" />
-            <HBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
-               <children>
-                  <Label fx:id="warnLabel" textFill="#da3633" />
-               </children>
-            </HBox>
+            <Label fx:id="warnLabel" alignment="CENTER" textFill="#da3633" HBox.hgrow="ALWAYS" />
          </children>
       </HBox>
    </bottom>

From 98f5b5a8b67e8a76bca95faa426113e1f0ad3dfb Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Wed, 12 Jan 2022 15:43:27 +0100
Subject: [PATCH 40/87] [feat] show current analyse-type

---
 src/main/java/github/weichware10/analyse/gui/Analyzer.java   | 1 +
 .../github/weichware10/analyse/gui/AnalyzerController.java   | 5 +++++
 .../resources/github/weichware10/analyse/gui/Analyzer.fxml   | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index b4f3ab3..8c8eedb 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -77,6 +77,7 @@ public static void setTrialId() {
             controller.configButton.setDisable(true);
             controller.analyseButton.setDisable(true);
             controller.selectCompTrialButton.setVisible(false);
+            controller.analyseTypMenuButton.setText("Analyse-Typ");
             hmConfig = new HeatmapConfig();
             diaConfig = new DiagramConfig();
         }
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
index c447bc6..49f3642 100644
--- a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
@@ -43,6 +43,7 @@ protected void setCompHeatmap(ActionEvent event) {
         analyseButton.setDisable(true);
         selectCompTrialButton.setVisible(true);
         Analyzer.setAnalyseType(AnalyseType.COMPHEATMAP);
+        analyseTypMenuButton.setText("Heatmap Vergleich");
     }
 
     @FXML
@@ -56,6 +57,7 @@ protected void setHeapmap(ActionEvent event) {
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
         Analyzer.setAnalyseType(AnalyseType.HEATPMAP);
+        analyseTypMenuButton.setText("Heatmap");
     }
 
     @FXML
@@ -64,6 +66,7 @@ protected void setRelFrqImgArea(ActionEvent event) {
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
         Analyzer.setAnalyseType(AnalyseType.RELFRQIMGAREA);
+        analyseTypMenuButton.setText("Häufigkeitsverteilung Bildbereiche");
     }
 
     @FXML
@@ -72,6 +75,7 @@ protected void setVerlauf(ActionEvent event) {
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
         Analyzer.setAnalyseType(AnalyseType.VERLAUF);
+        analyseTypMenuButton.setText("Verlauf");
     }
 
     @FXML
@@ -80,6 +84,7 @@ protected void setViewTimeDistr(ActionEvent event) {
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
         Analyzer.setAnalyseType(AnalyseType.VIEWTIMEDISTR);
+        analyseTypMenuButton.setText("Verteilung Betrachtungszeit");
     }
 
     @FXML
diff --git a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
index ccabc36..b52ba1d 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
@@ -20,7 +20,7 @@
                 <MenuItem mnemonicParsing="false" onAction="#setHeapmap" text="Heatmap" />
                 <MenuItem mnemonicParsing="false" onAction="#setCompHeatmap" text="Heatmap Vergleich" />
                   <MenuItem mnemonicParsing="false" onAction="#setVerlauf" text="Verlauf" />
-                  <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsvertilung Bildbereiche" />
+                  <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsverteilung Bildbereiche" />
                   <MenuItem mnemonicParsing="false" onAction="#setViewTimeDistr" text="Verteilung Betrachtungszeit" />
               </items>
             </MenuButton>

From 739654b2de701469c2d29bfe39f0dc9e39e13ee1 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Wed, 12 Jan 2022 15:43:49 +0100
Subject: [PATCH 41/87] [fix] show icons in analyse-dialogs

---
 .../analyse/gui/DiagramConfigurator.java        |   6 ++++++
 .../analyse/gui/HeatmapConfigurator.java        |   6 ++++++
 .../weichware10/analyse/gui/TrialSelector.java  |   8 ++++++++
 .../github/weichware10/analyse/gui/app-icon.png | Bin 0 -> 21631 bytes
 4 files changed, 20 insertions(+)
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/app-icon.png

diff --git a/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java b/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
index 3c36cae..d73517f 100644
--- a/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
@@ -8,7 +8,9 @@
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
+import javafx.scene.image.Image;
 import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
 
 /**
  * Konfiguratorfenster für Diagramm-Analysen der App.
@@ -30,6 +32,10 @@ public static void start(DiagramConfig diaConfig, AnalyseType analyseType) {
 
         configDialog.setTitle("Konfiguration Diagramm");
 
+        Stage stage = (Stage) configDialog.getDialogPane().getScene().getWindow();
+        stage.getIcons().add(
+                new Image(DiagramConfigurator.class.getResource("app-icon.png").toString()));
+
         InitResult ir =
                 initialize(DiagramConfigurator.class.getResource("DiagramConfigurator.fxml"));
         root = (VBox) ir.root;
diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java b/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
index 289c965..24c194e 100644
--- a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
@@ -7,7 +7,9 @@
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
+import javafx.scene.image.Image;
 import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
 
 /**
  * Konfiguratorfenster für Heatmap-Analysen der App.
@@ -29,6 +31,10 @@ public static void start(HeatmapConfig hmConfig) {
 
         configDialog.setTitle("Konfiguration Heatmap");
 
+        Stage stage = (Stage) configDialog.getDialogPane().getScene().getWindow();
+        stage.getIcons().add(
+                new Image(HeatmapConfigurator.class.getResource("app-icon.png").toString()));
+
         InitResult ir =
                 initialize(HeatmapConfigurator.class.getResource("HeatmapConfigurator.fxml"));
         root = (VBox) ir.root;
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index 0d817b1..b8c5e19 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -13,7 +13,9 @@
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
+import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
+import javafx.stage.Stage;
 import org.joda.time.DateTime;
 
 /**
@@ -34,6 +36,12 @@ public static TrialData getTrialData(String fixedConfigId) {
         ButtonType select = new ButtonType("Trial auswählen", ButtonData.APPLY);
         selectorDialog.getDialogPane().getButtonTypes().addAll(select, ButtonType.CANCEL);
 
+        selectorDialog.setTitle("Auswahl Trial");
+
+        Stage stage = (Stage) selectorDialog.getDialogPane().getScene().getWindow();
+        stage.getIcons().add(
+                new Image(TrialSelector.class.getResource("app-icon.png").toString()));
+
         selectorDialog.getDialogPane().setContent((root != null) ? root : initialize());
 
         TrialSelector.fixedConfigId = fixedConfigId;
diff --git a/src/main/resources/github/weichware10/analyse/gui/app-icon.png b/src/main/resources/github/weichware10/analyse/gui/app-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6fdfa21f03822395833cf09ad77dd002b37cdc4
GIT binary patch
literal 21631
zcmagFbzGIvwgtK=>68Wm>DYvbigb5NcX#Ke8>B<&5)crO77&nbX%PYG?vn1e@SJ<j
zJ@4N8-XH$t+pBA?ImZ|)LP<dq6O9xN0)b#kONpsKAaLMMI0(uk@Sm>pCvyk{N!?0S
z(^XSmj>p8oj?Ku_!PtxqX6FdfArL-6n4^)2jhQQzv6+RHJwNq9Q!6!<l_@{9#tV54
zc}Gz*ODicaXR|k63aTbvHYTr4sRael_+UJs0y{HTBPy7kt-T8mjGy{%y*%LWho9N0
zss3hhwc)4Mlvkn>b#OMLdcpRBje}YMjf&6N)SO2}OyZw~!52TZrK_tW4?DYuhX<R-
zb2bNO3-)KPU%zJO;AH3IWCb}`T|DhwjbN<yE;J8S{G$#rGZzzQD@Ru=2YafAI*p7S
z++6vosX;o`KPxvi`B&YJZqBxUYc@4uH?uXfGqZPfVSmQ<jQzjoH-lOIyEpbO|C}x`
zaqJH%AUnr@WOubP|39)nr2LQUj+PFt4lb4sj{oY^e>Cy0<o{6+O!xm@1ZL#;zh#z}
z|NqWzXZIh&aB&rP2NU<tMfi_C{Z|7ns-BK!>?&q14sOmSX5#K(_Gtc2+{3)^C|SYG
zY&FHKz@)l>)!?V*eDU)Cm8$iBrHVS(Iyk=p+t7@k`q|$?4|B&OZD(X*reS63YWeTl
z{+%FaW^eI7QXYC|>-Ml6)a<RmcsT!Eo94gMKr38a?EkGLt^YmkU#r3Mw}<i$rl5n*
z|5o|$BxzAmC1(e7D_fA}q9Q3mB`q%c^4aT`FIhR+{?P<jIv!Bg%G^`T$Q9(`<lub9
z`iztH*(=p&+&s@;@I2#W;dsWw!ST1|zq!E)GBt8F`v1%Sa1N;WOig%Ptz2!*{(k-A
zTnO8`{^RQ(pSD&Hhk?h|$lijV8pdjBW^UwW>q;%)>fm5&>;U6qe>gj~R{yNv@7I6T
zz{ma{)$@Vw$;<OdS-H46ID7uL7T=gT{b!4Rk02G*-;Kp%Wb&{k{M3%l4yJA<W~P5f
z3i|$!R2K(xR}Uj+Ghqv`r}(Lb&CRXA>UmOu(`{v8Z{|z|&L{^P*MAoBurzzvW&h_~
zvj6wd{8#Vz*#AfW|1tRgW=KG}fBXgv6tHyc|1x#p<6p+o%pO=sXJ867=-y`oa~o&{
zw!!~ceh7py!7ZUl7C{&%yj6@YFG1`}B@PB&8D0c#&`UyGgAatyf-2}6zJ>6`HX)+c
z1(kiE`hCHC!ak~ANr)(p+oe#c{$<Q@m`+4&kge%>&%q*WTB|Z_Tt=eeT$ny%Qe;JV
z@}?ti;4C^zJx!sJI<j10BsR48wZML5>RFG?ddc4Tfn{vB8xl08qcgH(EtDaoNd35^
zf2Lzkh8gd%0Ku81%7??UVo8=8W9RA)1A3dKQ54Orj`CIZ*gIpo0<(~{wXe^&g8saT
zyTtS6<9)?ar=!lm^Rx$b**H;I0%de0ei!cB#n!vWFP44RE=Zj5O8d%H#7shInf}1U
zSf$RsPK9hbrCCLq-`}69DPml(Oz#O>!Z@SrDJt!Rt;RV7urc#p5#8b(6UurvunZ6N
zPKHX>=aGAPGWFDJH?cAugnENX$EeMU6_Q^h1WZ1*)C#DxvD7X(+1<!q@kXiW*U)R<
zr#OjhHMu0yPqA1QW43<*?le?KDJ>TWgplsxADpxb?I8q01(6mLR)uBmHfu!dYNdZT
z*LyrKY5MV%oG5*NUa4^!TW86B_Vm0K$|xER6&%7|i!3(!rhEsQiY%$H1KtOs<_dLU
z>9+4eqe4-7pUoRfOB;WyraX-j=j=D-e7Du%?UF??-295>9UDz^17$o(nvwnNSEsxC
zn+?I%1nywDAw606<FgSnLqaL|s+60H*ex!8g-4`H-u;Rsnh*+ZL0NQ<fnK-7@KD!T
zhDw9N^>Xn*-nNlIY#b3m*k^_{C-rGD#^8zoe}o$^t0nten4*<`CJz$F3y-1R<hFZq
z7`9T}=|{d{7M?@z5Kc$@Aop)YKPihO;6TgQkc-~7R&3MQOIJQVeF?Y=gFyefFOKJ>
zD*|bAj(G%aKWA&17AdC%Q~u_-T7o+q3B0$mTH62Nlrvb$oq%R&z5m;8F$ex0i{XTv
zpU*u4=_aSmzXsG1*Xzs4`&zl<#S4$U$03XN-A*}C;k{1}@8SJxLGr6!UurA{k-xoQ
zIy8XKp*Svv!N`&Pk#C$q{R<T55#*)tsp(BG(QeM$T0Js1mX@64ZXDYDzkPA^IQ^=y
zsEH4{_k!Spp^Y84otuJUBZ*W5>n^+?wCPH@^)i7apt!+?65*c4@%GcgOy>&XG5;YY
zMXmp0-`{db7Zri`tBebioh$f8aQCc-Iqa;nFJhN5<HT@^*2`ny{A1oO9v>dU_*>!c
z9(r`#=|^)}x$rPx1IWT6YHN6}{U!cIPjZ&%+9>p)F}y>KHh-_wgOw$xFsEe1`{^GY
zdOIBRLa(EPf1~o=V_d`?hAecNR7jx=c(SEY+_bWE%O7*hFA7zSyWArkMg<Ghh4;Q*
zH-Nw2|IsnmBTR83^mhf|79DVy8Yw6!kOvL|{B6J@-+jP>8UCGn#KQ_4q}P0Wd|2Vg
zZ3{ZuUz>bzka=;C3`cHqRv!AOd<eOKfg(n&$iL5DE`kL`IlTYdd*x@?H!-Z<*Tx2D
zZD(iq2W{8a{J7ZIaV;>)3!*xV{WN|Dgx}XU_ZZ4wIy*a8Hq#Ky-)*(u=c~-lj>Daq
zz}*lWrd-3C!^3;;E@j1Hhq9;MJs!nUzR75AnFslWssj8g!9p9HU3at~O)2bNJ|f;c
zuLZ*hm%#cu;oy|ek_>T|IWYL!O=%kRn_AZVra}YCHviC+iH#*El}mhO9hb>nFH}Q~
zKbLNT6-S4M+|JO&VS5(zJ(<)!Qa^*0q@zEF+?YPd-)b^SM4I&AZyxh4ogZ?u&I<MI
zl6mGM8G7Fytf(EF9&*e73>a|uO)wRMbhxneFfmp%Vexa5f3(pbR&)f%E{>m%Pk}+u
zTMs$!l@{c_yFEJ!3=Q{Ko5ZgG$?(<o&1qmxEciwFxWBXx$-n~cW?Ynq1k6|dT2l3m
z%HL}27O}(KdB6}QhxWieG&uNntVS5{>e?HY$*Rvh&aMf0<1$$o(4E4+4tBG3RlpX=
zCEM)LG6;Vm3F|mma{3h?aBsMgRiOd_wOGUvnR;hD9D*}A$E`kvUNEhUX*ualb!7nu
z3h0ZJluP|EaA^2vOlS3WX4XO{0|u3I5<n*tlpzwyg!|T&bMRk-8E!yTSr~^A$BGs3
z7nft;9ESHkTm0Tw1mWWwrY!#~`_QdCAylQfooKL?VlgnKz+oukC2V{0cRJZGDsLgN
z@P~u`*m1|*BSx}tK9120%U}p6J`f!=!#iTduD?43IUblNI$SIvFfGU8Dm@vu{J`)W
zXTyV)YaJYDTU!x82T3MN)fj^m=UNYaN3Y?G=i9G21UU#3IrV4QK}ngxH(>Z1M2c`Q
zSf&Xd(&Ca+>=AwdI2`o!G%5&Sp@u2%UezL>gF>A!w6@L_@)afscAQJ}-w{3g+g|Vg
znLrMEj-w?&nq{26p71TMce>Ey+xJAvWY+#_?^dYnnMw8a)J~;WPk~iLtNeJigZ#PE
zcy(R2N3_Xh8-4(Epf7P%pHC}!HtLKgGwP&gBW;E~HIK1v7~Q`4uyKA8mg(S*=6#^4
zhEJfCtVBQ{t`<*6BCe)H(0#k$$@WbbSF^A|eoB6zYZOy%yo&?FwNq%vTIXD6`7+kn
zvFAWJb^<{eQVq>#L<<xO5NcDT!f87=ZV+jFr=MFtxF^zd+?m14Rp^r7&2C>&IQOGc
z=lnHV{yBB)ZZqF7#lD<9`ZsIznvo4rWr7<4N`ag>Au7X#tGU+Tv$Bz*<>N~wHMfjv
zoZh6ls=}Q|$!2*wVK^|oUJeYNEH*v){PC?(>)I_>UQ0bp`Nx8K*S|(X6FFRO``)*=
z5CqWN<SNC(pb|V;)Cp4YZ+lS?;iVEopac8JRqj5ODX3q+`Zv+n+6ud~#oODq_ATe_
zl(&(EjUD?S%#GHwIgT9j6*!)45_pNL&1v!Bpx_*$!(oR8g>)KGCvYS<YTi7-dR%vp
z9Tp_kVI-1E1?LaRF<?ZqFn0M2*RTJQxaX{@*ostJBY&JgWWl=D>Se~yZMXCx`cto9
ziG1n&>5tR+^>){u>19w?Zwy|O6ONwsJAwdOTolB&y~fdTaZX0oiTx2yVd3F##q%$G
z1WdJl<5>=T5&Y>6=Rr~LesiD;kz8zIAIlu>-nS+V^F4CYlN@*D$%?($a<{70cIDB#
zZYhW9#~E|TKh{c&?Z!Wz5^NqAoll#?J+tHzp{8J<h)a;7m7;%4``GFFr7$%vL$(x7
zOb<%9=*0~j6dhVe&o*$oHvd&Ban7FXT0L?1p4C-8f7(`sDTOIz;5`dL$pq<|OsGng
zT$O5`O0g1~#-|CgpLXI)(UbZEi&VX9Ef2d-s#=a}k>OoG$8-K}!JF{=mnjwc-9=aN
zANNK)*uJBmHzQhY1Sf}@Y3+Zmu+n?lRcBZ~!`hg>Z>=ZUr&C7gb{+I<8?$7hWVEGj
z-LCfcm*1=!Pq_=Hl`Re8ZfjiX&M$pJM1)1!sm3gS670*-%fI9ma;K_s<K-6POcPV~
zUFMyCI+lK9o%3VB@qKq4FF8Ktl4g)2w0(0Gznb=`?5I^e6G0T8|6OLx5II>!#;UU?
zS}1k5N}6+nNG*NO=jVmkD!98d@Jec-N*sMc^h3LYTrNcHc_jimHZ7}26;3~!Nl;A*
zx-0T7f)QzWDQaI-B9>d3Ytd&ZgnQM>u;t`yLY0}588w*S52$@lLOb=!vaYQ&i+z#)
z<@cUla!}1@$OtDlDtAx?BU(wx;_>C%kk0Z^iytD3l40S*6com$u(uKY($&*YLOh8P
zX!*hW8_}NXwn`|5&>2!6Mojz@3gHC0?OIZnfdM`PJu^4AnA%g!Uz4w<2G^L9zW>~D
zBONN_)!Ng*-5r6C4-uusLw(o(F)clvmK>|~gLGV^9qE)B7hZ{=lrxo-vmuT+o(^xB
zd9ZP=5SzgVRj4u}Arql2zN{H@5?Z%Pgmc5PHg+u2uL&-Xv_+<%mG)<+zJ8Q&{sE4(
za(omfZG=}xRnK~QCDSsAExf$aPud`1Oy;oL)SmSW4pt7#C?W3evo{3m6}km;w$)!R
zLVDwJ4sAU{lQv3iZEX|T35(yeAm^c+*}+}-3UnCdLg?vx;^Z$pqKpEKG(QD$1m_!t
z_0TKPqC(%v6bxSdCbh94`&{NwS=G?LZXWBCD^;wTr(LF8lN5OPo8l&YaAg9_>nG;G
zfE-IM89oXcUXHe@O_UXrd^tsf#pUkT^b8Eo=tu^(7v2lnlb4ENhJAHiV=ZqvB^=3S
zJ=z?DkE3M&1G+ac@xu9%Z_U|F7T1z=G$*u#c09Osb|-?lM1~8`2xb}2lCt4>e|xT^
zdasY|VVg>rDs_SI^ap}gp@sQZKL3cSgr}TaToGcKnp`p*#9asHr!fCLej|vq^Am9j
z<S1}P5<~JB5rd8EncgWpfA;eG>@LQua)XsQ4|}JL;a=TVr+1co5vMW-Kejr*P!TF}
z^70N`Orca+zIWsfSvZhP>~5T_hC&ChxVBB8`&w{))zJ$FG^8;c0s=h~EXSbyN|z3#
zsl8e#kzl!>>-qENx|tbIvlQ^+df$f7?B7+=q8bF7Y40PY@QFKq;I3&ATx7tDjhCS#
zdGf^E-aX7_vi#5dp2x**jbd7>SCSB;GkwoODF-Wxr19Y3Acw$98IDDwBaG@G+CZz+
zI^eQ*WU%*S16w8ymNBs(@!jJU-PSw8$8U(vHdc58QwbRb1Vw3RbkkbJ=-*LOMB!l|
z9Tm5f^>NTbKexQ7>@9UNmJ4d90^@6MhY}UiH#nPR&m7Dy4>M3Yul$<12+Do_YF|HG
z2~l~SeK;Xn(ymk$>LEAK#U%%YdeeK~YR=ZcE19MVaR_myEq45*b<k@V96j9B7aT8c
zOEl#~Ko~S=l%h|f#YbB{N1lBv>9kb;%P<>nink>1!<A2n=u^;V6B8ORNlSY=lb4&F
zIfwlWl#gSIhEJmJ>E+NLRR_x%q_$Pqi_fPQhL-P8!-hHZOA*g%5m69B;8TgoR(_w>
zOJSRy-xw)8CdAtsgdC@=zx{3VtQW7XngbJ;ck%Mkm1MFRzE;o1Ic|g)ai8f|M<bPs
z)cK~N5&tui$3%tCMn*~f1vLY<vB6@C@-d%vXE~ZO$eg*!80H8-mLi7CpMzx$cBQY$
z8F9XfCy<bkOe3c3-gu*oFCN0GvtB1et%$mdWzkFtu9I$K3{11Mw3fD^oym(s21>_`
z;U_-redxHb-ay(w=yVlBo!|wxTB22Z+agtdr)aAC&(DQcmW{DS>BNn9Kb*c+*a?ke
zRWqfO+S}eL7a-)|%c0|KL0d1b{d3xPsrto&C_4nfRo%CS=8hqZ?Dgj<pZ-UUi<Kkd
z;NalFAqAJ)-#R{rcTI95dR^S`-Ui9LT~DP$3Zih1+4Oinew(oVVPC&x-I$eX-iTXO
zl81wGf%+&|EdQCv5=XmIpMFLwu@!7olMn*~>p05b=5?-;6gLV%sG3y_=Ub<~GrJC7
zCdg2%!~E3jYR>)fecJRi34M=*bb$)E7_JfPsOxB@CDcu6ciDB-L)PEZnrhK%ax41`
zixcSBb4F6<_n}3WP_snt+0_ej*G-P!ZE%~TbS8ei9OgCUw8|SpX*a~laY#5l#Vk?d
zqdO!eU&0O(=~{Uv5f+}>%GEnWHhFn6t|;{p8B6|x4i#ToWXH8{!)5i@^OZvDoc(xR
zzA$fAY{o~E%}09jo!kA^Nwm{3Qus@KPpOyU$x7qpXr+qAF)%T4V<qO=J_h%|2PJR|
z-d~OY_e(E5Jz2aKZBN~1h8yf?4pwx%SC(8Ez*6SzJPI{V2*-ZR-@%T>KA@sFSO-00
zGn(;j_Wad+G}rulqJPA_x;hhsb;F<G$!lV?cW=AjcCTCn3s;ReXor^*%c1uavK>Zg
zMk_I{dRfqE6{?iOWESam@$ag}aM?x-md|+WFHXjJ5j(~ZP7kB{CE>@Zaz-Ko(si?S
z*%XUat3^A>sO=_WZ+`C5K2HeFGfF26%SABOJ&n~<Q&z&CkY~Yq1Rvs!FU*rf{Z9Hh
z7kA&(6k{h%CsiqO`69l5e9rAnk^LO}tF(Tu`k2mU7Kk^F2an!&^CX3O*<2+m9Fz|w
zkvOJSl4=CkrXQc2p9|ETl5d4xXK~3%l5iKNl`#KWXpW>Juc~P^eumeNxTP8y7zmeG
zjNh)bIr=`xOc<K9G;+VY;r=<`7AdvR0(IB0X!-!<9{FHyeSAbf{0JF)w;5ln<7X38
z@Uhd`&JNisx;R=W{F-y9bHVm{Aa_mkJDGjcN*@1C^~OfC^qI(D?oh`r(}GBCct2j2
zXN)S*D@WYLs)>Pe=}SvbdwP3Qv(k(V9dYKk+nyC)Ty7}}c5=AB68&|Fk)=R1Re{~c
zH5acbKR%1i-p`KqwR4zRnEjYUidVmWTqS-tkY?srkg0~VQ{)Ta=H2*F3SS3FQX4H-
zrAi^x)^v(VOhFz$Uioyl7|0NE(W&frR+9tY!D4fU&pFmentf3te*s(t-KBfbs^}ji
ztW|zhtvp@m;o%rfa*77be&nJ+B`q?G<hOObW&Q6NG?!gD>F_zVoNZQ?M_(WRI>R>;
zT#`x!R}*uRt7sYnLr+>phLO2BA;OknGD>6|ugCrrp?p0<!;r}Mm)i~a)WV4V4E8>I
z&o@K0S+&2rylp3Jywe^L$_AHxJ505UMSTMu*xW>UK0Y2D6K6v4GZgu!&|5{pW*TcE
z*H98GZTbo8z1a<%zB6?LE>bf`$M{QGmyX^0-Ejn5Kec4W^_LAE_X2S_(CTVx^V__v
z@iFV#P1mOVbU%wL5B6Ih#r@})2wKT{4&R{CUvyZPIuq%92y!u~$&A$VN}&RJ#+Dod
zx5(IO4IJG`;OhIvrFahcLkypbLg{xAn1yFhzk|MctpmTiszy|N@YKF&cE1bPXN4fH
zX=Fxus!HSO*A@g`3qI1A#)f5@I;NK|Ui2445uu9bAsZ7Qb|~-r{5h(FD{`wPVy4bw
zFx7g$iWc5!T0^pKUSt=(kmZ|kTaB1y9xUj0{^XpJ&(z5&0ytyN4c{_kX0}|PVd%X-
z<muA(Y3_BobDo#ou?D_z&Gbj$u`uFKPfeMwT{4d(Yrq=648CJfZ1CK96f8<}O&UcQ
z|AcgD&SN20yKL-B%Ih%uU3QX9MknKpg%cAV!NP{JfVbsau1%zS3X=G!R$Rre3AAMB
zoG;-sGG71s^-D`nCttY~H!ke0*cqh(1xBbe{qj%i7c=cY@d(>l&df(RW7!$V(VoRu
zh2F2b`JIg`M$rAZ=BYDCfH~d^wBFskx>?#0Ji48`hO)6$HP%T~Y36B{f>jxNF;u=_
zVKlX}`l%&&-U;n1p@_z~W$g?XDQ3Nj5(o)2p~l;!EBQ3nGLF>&?d`(9_vn+XW3<Z@
zY9@I2(G1zYeIWLFAC$Y}`Xa`@UbJQ+Praha4dU#%L@>N@?8^Hj47o<Cg3+;2Couvs
z(M+jWeXr4xRXKK$V>kxhk^iopYRfgUxER%5*E>q_z-MstVl_L<AQ3T3B4)woj?C|R
z;^1<9=D_pIVJdLofKz`O_O7FhGHSFna=yw+D|t_L+)jMdwb!&(Jzu}{8Q1%E%BiMM
zQ*91TF5pLg)GZ&i<QlGnhmr6S1X-nTrn8aL?qLm?M`@Qy^t1J<GU797d>88!PVE1g
zUH=hkXzLmxQMS&L!?TB#Uf#6f_RC4c=kXD7em>1Nw^L3^|C7h%x=k$>EV2o7*@E8R
z7jCy*?hbnek2>S9VOP5(mp*}BWeQE>!sB)Ld(zFryaa*vn_s-qB6vcreiS2CY5I(O
zS5fx8Pz&|R6)Mo?_eV2iXkJe(-?40Dr2TDO7xG%YRJm9cIMAt$!@$Y)#=PQ6==+F=
zkA}qT&Qxt*6lFzRv1jE-7;iSMu#ftj>;2mDEcBq&J0ni8p;P}>S3rDu{(Rx+lBjiU
zN6>d5Ka}Bfd6_bEl2!eTYop%LZ8o)_?7=E+3HpxfZ#$2u>S;@yIB}_>=ib@Tk7^L!
z%ZmTG3@U<<>khP4p<x8u7wwb}SfBDFStpt2w=Wuo32}U7U?oQjufoU@sS+#DE|{=y
zD%_IJ%EE&0R-llzP|;0IU;R}^cC%ZQllw@-n<v{K;o?@KbtQ`3f1rM0ZmoZrI-`N_
zR69$dX)ifcux#?@YX{NEG1sc7pY~CBD|-qVFj_HlLqkQGwl7p4m_JuIko(wF)&!8P
zu39dYOO#I34RII|_?(O>5|fhb%(%W_{pz>!C`vI!(_rC)ZZUun#67D-FQ5!?TFJ_)
zNt#?8ql;8E&&R*{9zUvDo&Vu^8`+g&;M1OBaGOoJFKB4C_8Qn#i5kzs?_bgiQLCeW
zO?;Z%aW~SgGJQ{%5dG?<r;*~MqpfjJLc-G#co;#mO?6hGX6Z!X%vSu+$G7`N{Pav{
zk){bFM7kD(TD9<Xp0^Kn!~%9d=W%hEk9}@>#oKY;ozl88k1hCTce?sh@{HwMsrom3
zJFU_4bb&^3o#kwKS8|<(wx+3ujI;NFbZO4*I`H2TQqqh;@af(ZT)q<>gMo{2evf2|
z%(?pVRsTll^TN4(TN_k2^>|v;)&)t<1VdxvOr2L1$J0d~hvC!?en(iUTFY_%7yJf(
zr{4SXO(TE)JOqB`rEBRo76cZ~9CB}LZFZ<*;RcMotnsu?PyOX+72$Rt4KS7c%n!{P
z7KPM|zo9yBN>7Y`rlqs+K@&P=$+hWTTXxQiz+K}{Oa3(DiKD15`>?_OjI|0aurU-l
z{zn8J2e)lMesFfHNJDdmzaH{xx+jn%q!>n83Ji#-nVMS^URQtGo<O_5GPtz?%@KOk
zx1qBA==$&uk~7j9ivG^GqWecNE!ob_>L1UNB<48<jrYzxG-yJJv_b9@pZX(E0f*63
zl;an<yHnx(g|@wC+r{tplE~+J?wrr}Dq5x3ht2#hi`!(>NmVB~lvY}-<7rq}*!(9=
zGt|gS`Mb0GYn_%>?~yl<+aK3R#9>cmIE$I5<s!v6Cng8!S<uQPf`NkwY>a$U%e9u)
zqfaF=+~nqt90NB6uLWQSdi3ma=ls`XS%j@uryD-EMGl@frU@b~QZ*BJJBu!~H*ATt
zC3h#TJ?g&9k4<P0^;fVD`yKD+_56;zQ_hC_-+&>b^7>42$ybWO4Ja{o-4sOmPL$LH
zXwnXTKi*h%@noJz*Rxzc;YG-*K8k>4f&t_1_-{O36}XnTz>i>Wxd;-xIkKVP(={|P
zd1qcDUC)rS{A~#;okic2M<2+T{`|QwoV)p~j1ueG<;^RD!!>a7=9{mf0=_bADd+fY
z`i@a7nubQx1*Hfd6Hz&*@6htYI*tBhWbhg26sfX}Th|SDaSA1vbv%7`ZP3Ww>wVBN
ze!j~teR$GuvUJqykpn{fpEhodb8J1Y3H-v#?7Nd^xQQU+rnbiL{rhsCJ+x<U_j$o^
z9WGZU7Y-MfXp)mt`Zv&ilDV;C8CIma=XR@?%C{&PdU}Q;V^co!zvT3yR1YxHmQ#p*
z_k@^=Fh+$rdCR)U+uh~twljgFSTz!0XXUyLKl}&9>O1Qf{6;!DOkTcpp?3a*!J2Ru
zWi<)?JV9n_zYaTegd6{&<Rh@ornkK0TlMB4;x8z$0Jwq@bJC~jtT4>ZL;N;B4pwE=
zTz!Bwq^)fIcupaxzt}O@tvBLI$nor1|EN+jz!|A<K1|rt<Sds6SJN&XU+%W$Ktbp$
zwi40uU7xACi?a1L78#oe*3u}^pi(ss8%Y^IkWWoEBU&$`>c;~|c4$bRIsv7z{7u=f
zJ|Z+~rtfTiKW5~9zJXkSm_%bFl>PjfZ)2$wiB138PmQPHQd~X2LiK<ARHRukIVTZU
zgjw{+m=T{gL5kxgPsi-6+`@~4?Fmjn0T?)0&zGp|rj-4%4;?xiD9YT)YLq_CS-)Y#
zKf3fKZWJyW&mFUEB#3jb`wG@tz%z~D(8nxox9_4n&PbDxrc?Bz3RA}tM`X!c!qsrt
ze0W3&b4ZZzk7E3l6_aR1xwDC6odmjlKmRy}C|O%udzIR({OqlJ=gc2I!**r!jx6S{
zCt~#psP~uxe3!N1_6Q49BEXfL4HYnR^)a5bE0#wG@vBr(q8PQ2vYcwNf!32PS{hkA
zIR7?#;^%D_Q<e*QK42(uId2DB04`TFb0l~FYEhT0lOw)>b>~QaB9;%y5yGu5R5t%X
ziLtu+4|&=6Be(O~J<c?^`l5h^4Hxw6>_XuK?)%JSComj<TAZxiyfKYH78F?B`cbXd
zQ~FdypMU<Xj(K_9WM;)nf$$KkNPSzdCe8&NJ?60!wY4p=xmPzI-!SEkF$M}P77!#U
zB2d#)O92ZCgS}PF*;~da>s%f$au-cXe|1gCnGMfPCDs|r2Jk+W;;waxSU=OLFHn_Y
z{3^>3p|-fZPre$e0`{iTBFY3oxgT^aYbiH!5TU;be2zomW6Z}hZm~%e;mC0c=^DEM
zk_(X51|Nz7Y)nJ#coM0{aoyrBNxr|R_^@c3HYK5?bRfohId9O6sFtAVRX6zisxkGp
z*{)Tz_YDO3tyLudv`no;l`5X^)D>0M_7=<Ld2^Lyhjho07Kk^NtB8ZA;i{+GTVj<f
z)HU_=@->;8JaH+)2ewFz7|4s>YfjpyYBMJ@5u*D(p&^aJjgdeN6>&G|Efa_+f>Xnt
z@$WYc+HHd*R(n&{(6)o?qQNIy#vzH;;Y?6fVPumBN%Ks=7TkN<rPU2-`8j6atR+W6
zgM^!~m$#1KxX1hzAft<m0W;b*uNV`%0E{P+E0yn5S52+>Fo!~N10AE7+Ixf()-f^-
zK|jJDJ-|*Ki12<sehcWn_==o~&_?#qP9p%>bav9*7TjvnUy8KrUwe!y8ew!<t)4_z
zz6lz?sTs3XDO11xjamtfQsM|1@n{TL&?*7&6gBP`5>vL+iCeTxgIul>e)CSFo`>|B
z)7Q*wWp^1IJ&kVrhg~(Zw|iAf2#|@RYhU}Q)A1l^6rE649b{GD*F9usX9u9+OE){#
zGdxFL<P=2~AzAR5TCyhw2cy>YTVFgXAe9d>E#r1Eo*zUU7dJqmbHeY}L1c){UA?y5
zSn;IJJtb<9&HF5P=s2KRFhs>3)$!hHK?It-tGpsJ0{~DxkhtkhiS<s7{`&WQidlq8
z6?{pG!GCE1R?F|RexFl>#}z@a;KsSO++T3Xi|)8zd)ZOpOnpa+Uwwm%$=J_XVh7ii
zhx@}f?7l7?GqQm5w9#_8ct`(mM0trRK(y_P98}g8wQlAX2>~ex4qvUR9!~LYawRi=
zWP=7D120A*qT9sxNq+pun{rjlsdmBntNTsvOPbyHRTGv!g(fk7-(Elh0tBg&AtjNt
zvPB(4R5LmOfD@9Um8*;+{8f$EZER(8c0PDdv$h&n{^qTfwlS~L<ADIbXjsld_`(M7
z3qr`-7vD-ykZ`cV4L-?S|DKe=o6wGt$Y=U>-?#zclTqkJ;We{;4eyo<xr%tC>YW)-
zN0sF&P9+<Q1Q1KCbG^&@3B0mzn4OM0v)<&GMI}^y(l{Y=JVlwLaJLd)UN=Di)H8rr
z4Q+CpRp2bi1DF*`SdecDmqWc+uFTkGXU1(@;^Sh7J6a>ut}N8-Tz%Wq=la-ta;SO4
zdv4JyZKXdg#>-%XF<^e<JpFUCzV~<?BCWJ>eatL@IBuZO_bpV!L@ysmu3;rRdK;%a
z&s;gtwZ9yB6Z|H@nZB@wnh|^yD}A>c*Xy9CXW3>=Xk}l9bd&8irUyE#yyXY&L~QLV
zvdpy=CJCC5GprhIuFGPfg}1GA6!meenXpLjOg|q;B5lLY{dgtPW*6jBBsDa^(6PP|
z3o^I=6^f>j?IXMK*=ZH6Evwzm$OBPbSyffMDpVK1f_mYpU=;y}g@S_JutMw7VWwtg
zGb5))Kr2n|u>rL{Me(R;)8W1Ih*aVZRvG7V75!rJ5~Fh;<MXtCRIT5ENlD4W1`z8&
zylJXHM+u;9$dS~o82^B1%8NIu$Vk4uQ#)LXPZ&US@BfoL0)C3=q@?5nBeP$QqG?M5
z{5}Id8ZO2oR6w2u2?O$M$uU)m8_KzM11FOEfp-8cJZ)PWdH8A?ms*X0a;&=PDzbHN
zdX@`F%e;3QjYh6S4qtey|KN&IC<-pL0^y=Ukqz>N<-UpDb=~;hk1CpbV8lS6Wy-nL
zQl4ZMXq<B_edxLSNHU@{GIC+T;GorBL$_&OA}1S<n+Hn`j@#U}ViXzP53okLN^dQ>
zsNp5^l$Vb*NA7W#kGRJyLtsz^z=oyC0BlyQ0jgF@<{EikC3GU0f9|i}M3^*dz<+-(
zV1KUe^4W1b?Q-wbx@jEv)uYyRmi0PZ>GIlTbvpg@#2B0ae+Ld=qj#mPV$`AR8J?V4
zX!rW@<&{_S^J}uOKr{9NzSvj<4ajhto7{<hZk$+$SiUm2RspgkM?WM)FHisOX_ic)
zLXot^4}gaT<>DmMk=r)6@S=~(ZB#UyG_-o%Eu4j9o%czVP_}OOVvBiEIN^svrTg%R
z!`P}<R43G-w^=(@9M>My4YDbBVefwt5WXk6^X4N@1#5KiK-`F>?jOOTU75w{-_Zkp
z1b8w4(W39^C82oolo+FxYO~3%#0jsmO-&shsS~k`g*>2W<K1oytHtM8k7wiVI=lBe
z$y?nJas=c&2>F|Zjq_<eBWl`rsNkv-4b}<^dqhI^#K_e&<S61<Pft$*{sb#YS<X`P
zLd|u*`|jemuB}G0#<^IsmzXe}K*>Qs8PZ(jkwq^IAyJZk=j7q+SY72NqGw1;OEdB@
zmfe*9aG*a%!9d7hGlr`Bn>Eq&pyR~0$cvoSTLsb_)T)L=ui$PNaCGzxgbWSbuLg7`
z=cx%54K-mR{t`}zeik2o*;nz^+-q*>z@4OD8+rTYJRvqT_KDs?e*;K?zM+iCh$2qn
z!fqz*@80Ckl0$d6-qT&G@(3#O0+1O5hP$6DV0=A*2HfmJ86SV6+u##H_Nx3jCr_-s
zw(oiHIrp3<zxT!MS2$k*+|DJGdn@}WKho)1c*n*T?ifnI<))@(FaNorv!DAmyvCw2
zHdwPadJMyLk>qx3jS#Y@O3BMEk?FGt)nkH4UeGLYq{*cp9RZp{e|3Gx#^<md8IeZW
z+hKl%&nTTfG7kkg+iW^1{^|`Ra8X@#!wS`pNA{aC9Crt0j6|O~@>h=6{S&1ro*<%x
zU7y*xx=cpcBL_WpTtQrrI#FGD(e0jSMeGhA_gI(O&P6?97C~I>TDm&R6)}-^<~)Kj
zbLPp31eJDj=xNxe&f|c0mzKmlw_Wg8zImvTd5k&)@e0CM$68CZXdgV*N6e8^8yo{O
zUR4|&g$o+l-~Gu=zjjtM)hn9I)vr)4e_uSg{c{Ig<iFH)Tj-tpvsRxlcsp3IwY(GF
zWQ6NoRoxxr@5NnvRCi)ZzK>z0PS73WjS?D!7z~#;Mw|=G1#R@mh6h5(@Kv>?EL?`~
zB%5O?RcVO@963UTDr6>9urst@dcMUinAbzV*xKu?Ez1Y*Lmyt_FC!O|ce(=XGUAig
zKet6TGh*mt3K^f!;kmlHiq;QEMTAfcC>)NtDeII^(z=-+&lhI!+F;tg&R?Y{HS%t(
z%44=?=bMNP1k!<W&bPfL(Qz?Or`vqN(@?K-TNcQG{`CP}!Q{sA%6Tz$M$HDPw^6%f
zrz}BRa{YoLbCRjEaS++$!g79`U&qgr-9WpIfkd1u?b<=$CE3{Q*xJ5*lmHlXujYOF
zX_Q<*@41gQre{>oWQ=VTp0qqIbM?jyN+H6YR#*Kf>BL<hs{+(;@A7tc<K+~h$1Pu8
z0ygBbUH9|j$d%hkx7@ccnp>0S6`tZw%%gI%62uRqv1>pQLl!n@(xf<ecskZDWp7r4
z&(qSHU{oCyeRy-~!IFyE5Bw_tDPO*HelJ7!Jt=bLY2k$ZG(deUyfz5+KmVzjOk0s(
z-xxUilodobyrQ7(%tb0Z&IPPgsg2D?WXUsEg(9ThlSyEmn_2}>6gbkn(3+lRA?Ygt
zQOL^i^;?O2(;5W8rL6%@;j7o}Rm+f{c=9KWf!Wr3ny4s6&$@5G!?w>TUf6P-yYZGB
z&6>R}3!<nHjGJQ))X!ZQ`8=-EAgQc|G53L(B})4|hW=I!kz0>@-e2$4rZwr1dCh?d
zcc^}*qj6lmNd~;5yuW{dDo=lCv2=N}Tj;qU%-^7cUG_t*j?eL}9tEFQ*YYx6X{ikW
z{7Y(?ha?6Fyyjl+Wz~M`H2RE+y`9=D`HWRolf^xWN`7aARv;#|Fw|(%UHLth?|Y%H
z>dL5&PxeQIprt1GO8I+W3i=LlTwH3tozL4rJr4}zgp$5`oKu|peI3b{jN8-le+R;q
znrUb6cCyBOv>PiA2x`>Y4Su~NGqY8?MAO7JFA@(v#<aXL0Xy;LTPM1iX$thPAP{Y_
z$wf~48#=-icl=N}YO(yUFExCw_w*<PwN@{;Nkc^f&1=L<=bU#o+qa0Wj-#zkUB&Ec
zuS<e#wF!YWS7Ky*AJE*n921rgv`<qt{!mggpd*-`wz8l7R`qHr<%2%c(dCB0;hx9B
z@x>AK$mFk2>Na0=>>Axs84nTfKT|~(ZG($UnZPQg;yEjjh=6+u9!}6Yhai;iEF4Xz
z#-9p@%E<d}V}pGOJ>)9(&pSGR++R#o_;=>CT*me)5(4bU(Yy7v&2kOf#qej?FF}U4
zbaDG%L>=n)3P$#`JktPQ6M>lENSrgWA&x-tw7gMGE!2^_3z*i`F7D&wV_)=ET4AR8
z_P;>s#px?PZP;Ls#4zDq>>+UuLZBnga8-?9y!^N;3+?2#n|2vtiy>^X0y~uE;~VL`
zu}^y#s<YhKah>9iW<S+g%GuuPrKWdHN``A7=g+JUEZoIb+@G+<5mMCDwFuX$^LunS
zylx_9N0k(?;pTlAW)J*!tC#6NOD67Ojf9!As7YgR&_ekn7jdc2)9;Toqrn|nXu)>U
ze0I)+XW)Cv+tTD62Sz=YX0T(uA#?F0a~k}?xM66cQ(q5fbNZ-2rMO~}w6I%<UX(M<
z(OV!htX#?hjwIyrVD%Ck)0~82pWRtL*>GtI;Q@17>5T$mG-|7#f_y{SD)DUrNvH*C
z?jkGDJPnzHEhX1_#0RKV+Q+DXCXe*;x}wf@H|@Q_mh1olYLA3u<<+)1a`M>Pb(3JF
zVa9E<jbGex0`u+{k%~zWsU)>n9Ex#D1634Z3?2$%9i6QwIYqUp#cg+<vhq(C<8Ku_
zev#0l&gScfIX|9wQBq5qrEspBe%s8ApsD<`CCW5YA_Qp^U<N8|8XTC-6_W#zfIXt6
zh?|}Xygem4oFc29t+^X9f9{)cpZe&5%xP>?C{`_;u#WoF;sU*C7MBF!TUtFNb4>wo
z23+ayS=36BWDI&api#TAdqN}Fju(9;S!ZN%y~L#CV(QmBdv(<}(Md^aK!;K5bvt|R
z>4B#`8&>3Z-=K-W%?l?#13xu2yL)g-7(G3tnm@)U&^oe5vF8Nqi!8xG3j>DRv>L&e
z?v}B7wdYKuRE;NVzai%quBo|U#4gGmYn2i*$6;CfTeVc}<*Qf9S0{*A7+BA^Xfp$I
z4RO>?li|W+J~Qj+`BtaN`B%Jj1L_*ar0-m$@))9mlQn`U#|Fv-W4GLdPt)X{oHIQ^
zEv!w#)ht%+U;ATtMud=?L6}cN18g8Q*A(R;s4M#Or$}BM@w~AX{mhZIKB7p~5;YJh
z%q;AEqn>$zfZ!(xTu|VUaS`(FkMnT4&V3l)Qz=&OUqi=_3T@GM(B|NMJ_PK}mg)}$
ztUuOB6!g_lR0cy1d|KjJ-;*5Lr!pQ%EL<7#U&_}dTC+4BFa}kTTpU2t%hCJV^U%D;
z4SWzMH4En|8D36v-YP6^*(L+DYzFNuY`9HS!hL%hX|Dv@Bo43q3D8sHTaf{jBR9Pc
zDM}-zKcb^Ca!SKe3e6f~+l-3=)bL0qr=v83@cDBh;wMjls00@ciJxT=#|a@YsNK+D
zOrx51x?@53)rrfSn`Jfbb$@Ph>MWUOoP1pu7Z(jq5FYN>HkGQbo^_y$^Y?^HMtWXT
z1E>H~OO73_hp8$l`Q$)}a*}k*ApJHki@)}I_&M+662Q0~B8&9;YD-31Vo{R^f++E{
z7BgEwYuB5^P#P_TZJ1Nwr3B9!s3HQ|kEZ|?60Au=wA70!FU;C;6SO5zi3#b%_&5%(
zbLXSw*)#`~Kb&#{BI8_uvH<W!fyKZlUwh<qLf!P%!QIb}C_N_6M$ou{bO0|@XhJ|#
zopm6u)Jn5(jXpS2(hI$~XN5Y$+1))o*N=vI1gFtx)b<Nl*3WzfW-h+X2PT@;9Z3Vn
za`N(tLs&Rb5{H+**#wSlefEQmCFE9dtu;Y!WLSY(hnu@^@C2z`w<X$7fA*f&F&VDR
zJqqAYS64jf=yBIrXw}fvR-ZJM;}l{_GP(pgoWq$=QGPl{L)+FwUmr<@1-`MT8$Q2W
zh$7$65u+vcn||eZ(LceGLc$+D+^U~xCe*BMVM5b8USQ$+`}Q1t6eB95-rn(O8EQg9
z<DRF~ws*8y<!}1RLGRU-41669<`dO5A07+xaY1~HM1_J>V#>AeYqGPAZjbjehwqv<
z8-;6_lHnc*%Zo*$`(Ys}UapQ98;1z9iP6PhDs9Ke<R~RpcC~KXMVT%RqR7hMFK-y(
zigYT+ksV!KLu6Cf{tWZhqlC~P|KdIRvdkSSuIc!ov?3&=a5>#pQ@WCU`CKlle!(+b
zS3t2rH+RB%Y=Udsd}X#MlM=DSOv820T6=*|h>wr~4|T<Zxgi@tpZ*5uY`)%}v6`E2
z=<{5&ByK)|%|nCBo5>y&V$0)ne&76aN+++`UpP=7w|gHnC>K$0*_QrzUxauTTe8EW
zJ-NU67h#Gr<y7Dzr6b13WwvO|?NnHzB%xRabeY3KBPiB-E(3R7%9+^JpaLnhqL#(m
zQ_oN-9;~ro;e%bgy}b0KHTY0rq9w$awG@25P%viuK$h+W(O@<a<${*Ntcf3G*@vq)
z#aI#Vo}jm&4Fu&b8F8j@Js^WrRIyGHL)BRwf_!|m=64SQuy=~1`bP<L5iL6_Sp;(4
zrBhY#gcR(5ZqFB7cFvk^b>Il)h6a!PnuVJtoJ(0VlBG*02!Srg$z$qMUan}0L=E_%
zgEDgWsyjj~F}Gc~KHX-H4aNDF<N1}hxnD1!-fMU(vc|43gI>#W!%y4SGT}!;*()6H
z+eO**8^st&53XThR!+C;^1t_n>zsEAjMLPcSR=<^G9TFA=O#oL^z0r^G&E>+jLj8Q
zXbTlhn7Y{o=jlBb8V|K{SKnUjcOU99<Pc&`GX=~3pp-iR1lKOmme5qR>cgoO>Q_8Q
zx$qz$qmspoBO=s<ed{x4ldPHU;)s6Z%}*!YQ4OV~rA74-NHU~qJ2^SY&MYWI0<d~O
zC?LIGjM;tXz`z*C_k&*Z^Up^oKB2fa<Hn~4GCCg4uF<}Inkgt1NnCYZokEr7NA=RN
zJ=bR=LgpW!1B}(tK;=e`_8^8#CEh42O}SjWo$)!_dIG<+X>)#UhKiO!_SwM}+#c~B
z33i^p@B>`t2??p5%2Hb~zf*{pJJ$;6>8Uhyc7|6=7PGMGbQ~BV3ww$;&PP|tqB=Gv
zE@rpp><Q#R2P+++)X&!0hpN7uL<8=&bk6-vuwwq}^)4=Mdf=EnO_GUlw>nF|zr_}4
z6Y_JZjI%m4b&3ES4IhOC6|q1)oQSr@dkh1eg~g+H;&&%Q9vGN$I4I{DAwB%rMn}U<
z2e??_v%?*JIdQrQx#|w1TduPk**#7$RmS4LC4(!~BulREz^f{dCAwzDu-4|_j?YzP
zRxVeqpFj>6uf=!#b>-I@C&ewoOec3IOSJLT^O%Ry_X5sgp(Vz?*;9{Q_HeQHn$PC~
zIPyTwLz_eb%ZKN-A%sks2qjiRm%h|M(WMiQn9yo!o_ogvnP(psR)RF$Y#Y@8-mfq-
z?YfCE7c2_)4<8?e`4=;y0Y$bdXZO@5PK2s|VOm~E2)v(lEoqFzJNF{Hih+=I{(d5Z
zWHVZ6=OJHZsu#nDhg5IgyaNn6+QFP(#skgY_4B0s`HglAbL;&rrDx*_Mkf~uDXA$8
zcA?7*X*)xJ5Y8lrS4pL|=jQV3NF>vxN9v|#3Mrea*48(F4KYj8B+PbLBw#Ea9A&4|
zqF+3J93@WDXPTOww#D+S4;~!DYUmgMay)qW-QYhz_B_&SueZ2yWRwFgG*yO?k8SkB
z9J#IVQ2HHGQ2O2AwiudDPKqVbwOnnpv|Qh@?T}?$s3rj!RS!M=0xY_w1OkbtmFsNl
z=-|M#t%pnpa#e{LkA&AkCMXwyNl9=-X<djbVP=eMOnPOA+`wa^%wx22^i?UVD@LMb
ztH<sYnH#*XEpm|NyXM=o8FyKZ#}6v~B;(@MUl?M^ac=zUpAXEWod-N#pW*<;-E<(_
zgEB3<r41lYfb^80O%^*?c~7_4-vKW;>;FKqmZ?W+a)}g;^GC<ImH=_M>2x`<>Ux?(
znjxbUE&2M$Jye7*X*wnDqm8C+vtMw3F>1@D`Fl!#pFVJP08s#-jUJ)}Z9AShtVa8{
zZ7+0CGtC9thjqy<UjHP^vPoN)6)dfUkUyR}paE**=w6a1WP8^G9MIJC%(jEawMboL
zS~@$`CZlc5^ewg{XYGdZK#$IuMwRgdu+h;CX(Z)(%^iS2>}1IC=>jN;vQK+Ug>a4f
z(t+RU-#G@6C(tC|MIaKf$#FhEUO(MWtAk8wW2GmXrQp39<x*C$clN>P-dNZ;YTv--
z^j(6_rx6vS#s$!0yO0oVMKQBLQ)4`Bzdd0oRGML))3K-eIDcyTQyzI%<VX>kg=L!}
zBR(}T#?-KK>r9#T23ExHjIYXU8h{<ySjq=ibVIa1HpTC9qocFEnJ!~xKt7y<>8V*G
z0PdqfX`qq6_Jx`D=oU1e8HfwNW_jgRF@m5WP%bRD9lEmeSAP8GhA(ZGs?ln%EIlsw
zXf4IS`F!3tSwkJjtwThfHl8{6i7x)c0FnZr_j|2Rptd&Rcjsd2@1NVjF8YeKy3^#w
z*fujM$&5k(*7dIFfg5B<8F|B;RIFYKJkwWi`$p^Q9%qrJu+Iz&VAw3Fk<>QVG}xk7
zLHninSG3i{M6wq)YIs#Hk1l;al|));Sle@D<h^we{dwg2*=f?`2e@oc9|1u;pC7fz
z%Z2;H{1zUh*Op=3C$n?_#sbRVrCv(PKc+`aJ3G{dpY$uDqUI-d)s5*J?LRPnw_(58
zVT*Oa6;~8+YZ{#y=C}Ao+4qrzoZQsd_I*S@D$qH+?ZWdW@)1f}(rCR361?5wCCp(<
z7}&6?|NW_C8|(Ajx^~~$AZ<sSI0|QlbRAF3dZ|6}D1b_audW`Ilr%2P6y^9vE-&~-
zTuqL>fQCu*kdS38s#k$?W|GayUenk(417wU(2%K>X`TnX?AVs;mMhP`2fdudcp1zr
zeZ9_UdsK0DU|4m1{)olCK4kWC2G_A@;bV=D8-1-3qp3qg7z$D_qNp%<mI7Xys1#RL
zC79Ux29tZr4Y;O!Wd4v=xP@SZgdath&067jaED-SZXu0{vA@-kL5N80B+%dzp0<U~
zSNY;_dz-XDH`}>@8eh0nz6eNs0QTg89?e7Kvk|(lH+iC;nPS!M$Sp^UM^6!zAV=Rf
z_52P<=-$119335NluB6G-LidNT-|lxcTMMib45nMr)_9wm*v$QYZYl0f1%rSkW7Yw
zgc{zt%z!76xJJ>vY1(E-8P8iWF%0L4mlR?Z5!*4r3|<Gg986*c=lGp5-6^dKEz?7V
zp0nlw1?Gb6@$jC9rk4Kt<*}Oj<S+1ap!=nJgUG~mzjc(;^j;MPbbPl8r_1BIv1+^W
z`5Ske=_<9D0p%-&ZW;@@Yp<Rfn%Sq`K4R3y(STn91nHRNdl;VtxZ4QhR?d;Tre0$B
zolhKGyt-d^0BayJ-$+XDs`la0N24Z!%F4skiq^aI*7GO>!+lQSO*62^7B{)`S02wY
zqhNk(tOKYqeW*x+b(ut&K2f1`y=;9iGc0X-SC>y*d5%6)foAx_-e^=vr&#_2dfzXW
zY3m*!N8bqqrw9mIQ0X3yGKBu&V<x=T+hz2Yo9*-2rhA%Fe%2pmTF%I_4!c(w#9(KV
zP~@pHuN+?j0DrU2_=|3V@rXj98FmK|vf06|+2&P*3+%Oma4w?t{%u%pz7?s5z-20o
z$K^x8HU@e;z61k1hm#ShT(GYFyV_be=LSB2&^Q;!H0vLveGvOvrSz!r>kACmIh?&i
zxq)UkL86%<FN;~3I<=w_v_#q)`^da0`lhd^=h0Rk)ac<668T-bPETSaq-d9E9|&h+
zpn{IAsnp-LX!JaO6i30T1Wf`DN|yPcrR&U)Nutp`B_<6Rz|rQs&-<}VJ+II9eBHiQ
zL32^aF>hL+2{W^XzP_TaL?x=9)JuPEWBx9CsV85vg5v5y=*G4=Am<~=!lTVW7!xl=
z+h<+_n#7+7H$r9jXkWFH$KW8+zItrn-+pj^SgU!?UIE$$k+ShiCAC-7KQNW&#3w?5
zFQ3Scj~XTd#Ae`u(_Hy_*f;C_1)fIxuT_VQ<ql-2!zNh@ldMaAc<v@%PVa@9COWDo
z=Nrq%_pDuco(NnWGDJr!lFK9zRDDa5wg@L7CYMN{!_X^IVS585WK0sfg=0`2Rz`f{
zoiX#IsBwuoG;4B#q$ZKpfwHx(k~e6-{t2vER^5U#s@H@zQ5q-}1iaPj-BGSG=xY*|
zjCv%(wS2Br->bbNBMw_)h6wqPfLB@SK*~|opC8&Q^2u0voo$G+FU3&PkeD!Hkg7jW
z7&vapA116-N`G0tB;(3BGXyVQ!h*|ctMUM8+`)$?Nev!-1?5(jBC!s1bVZ=e<apjQ
zpV&tk+^(bF0krDoVntLvyP~nfVXCGXzI^%<uim?YS03LmkwkB%NBqA70S_=7uNr@l
zxDG>HADL*3>n-j3Dm2X%s#gFb&O{ix?(oBPu=R1LyQ~n@feXBJ+fylh1v@{Rnf>Or
zqqM^WUYUd;C5k|ko+f|iV4WT|m5yctdbls;rI}ysB~=->-Mc+TCu~{db@eRjJZ@gc
zdLDqsbasK*k3{RnhvUGr5%s#r<Fi<k@MisBM_Li^Zi*I)b}>cR?~X*p7P6LZ%ED5L
zcq2lC1P@1F$VUE&p741!_lITd1ag#wFO=^-mNoofQd|F4Yj*$JlUY*PQ8f8O{LJD2
zd+TzBL+b|cRn;{n!7eR7%qZMS_cxF0w<mt|gG^ihoQHZmn8x&xr0zy8t+dqQodfBk
zM*2quN{D)3V*=;Iy-B`S8(7*bivboszv{Q&sH09l+f(IK>c;5P8ESVp<XMs0HO;}Q
zlvbP17wCv1o@kv~yGZ_|u8t&CQbxd;Pe9y`p3E|tXm|E+=C*%=(X|RAPE8i)Ou$hO
z8QFM$=p6xHi7Z~q>im^J&1ooU1V1g|=#^y66GZijfSh<=tsLs3+xms0q56eCowvw*
zT0Y-_1jM?Qp6~w&-VGu0$2&|w=Woj{x@s5(+agtW!L}943)ewL^7--m{4Z?TI*LNq
zb*j}G|I1(hHLX^gdc97k+i|UwlZ2xLw63W6XPH|CMXJ>rxqP16@4U^-+{F{ubj2O7
zCuFSd#Ihh7jS>n4@%enh@hHo66)5j~vT2%bbYL!*cef-g)8x)4A2V@bZ@Jv36<LBt
zt-`N<{|D~gyU(MAye?>r000dtNkl<Z$E>WZQYaLKKy^AVWIsCIdD9XRSh``@6_<_%
zM{&rCN-~vVW_p^%#iwj+Zlcs1z{!kEG))r|F=N&0b$dC}rP*v!DwWCQ@?3qk%-iqW
zB9=&<t8us=ENlf347nD7BuQlzc>J;#IKdjtW|NK0P1h^m)pXu_x5kZ|XTSWl1W1;_
z-S6-6{oQ*!e7L~VrDtqxZc-^%g=4L&y*BmPw4GXpuA>_U`-^kiJ41t65{ZQE0Fq98
z{l=|oLM;qK^c!q6nv^RQHa2stJb%vR`FXD2xQ;In^c2A^2!+E00wPaBmSudZx~Kv_
zzUl=|utpPM30SseP_0%e<O{s}-fcqB_(`>T_JvQ8c)ak4AMV}f!J`Eh7nfLDU#Czg
z(&%x@?PeWq*%m-Qu>c26BoeXvIK0^jc~aQ9B+xXCR$KT4a=AP!E2}I%eaig&C9Yh#
zg6#93$+37)IPoG*Lmx#|9;m>B*S*M%*xIost5hm%Y;JPv=5;P#ed|nE0}`Mr5>KBz
z=EnyQdGzQBPoF(wb#+a|EL3Z|n)My5p1pa)-jeg^kKQGL@WMNe!5aBOk>_h`JXu`g
z!Gnj)&P;P@{t{6;s?%dTx-RN}I^#AJ3_X0K0s!0!Kec)t-O$}NS+Q7VV>8FIXDi&i
zb(6uN;Zu3xWeH4OV_{)|g~v}=TwLPW@-l07oI<r$b0ZcV=h<#O=wb;VgumTxALhq+
zEsch#lG9H>(n(@#m!NA8WD(!)gt@Lff6k+Y$NX^rM<ypGn46nnbbJECI<bDaBd62V
zwzjHugYl`+AJwIWyXC35Yn#ApV}6|h-)uD9{pVV}F4klln><~5#_a4gmoCmRJ~?&b
zFT5m)5Z*#A$HL>sEG<1_Wo4D;c9fz>7OBx_Htk>!eNSc1Ol!-bS}vCvojjxu^aeII
zb9RJc$BwNy!C%fR=)LwG)1+%#10vR;#QORMPnVV%8eHJ+y&o7KA7gxMlnc`r$YcgE
zEY6j$K(^x;N~IEy9zEi#-~NuZ^$k(ITh}-LuYd8^6=zfG0dG(Muw4tArbVaIwHrT(
zi@*4Ei64J_$oTjeQ&W@7&d!`Db4->*m!4vwz|ztZ&sW!2U0q{seS^)-9Qi`Q&QWO4
zYPI(z_~4kWVzw$*Dm;I_%GDdU4&jq+A-TWAji%`|8V#O4U7}DZ(r&dejN|h~90bm?
zK(?%HilAO^kS`QjUtj0x(lgQz7szG@7#hsl6`6(@9T{e5cm$t6;6{g@1tceE35!O(
zPCl0-m&=pO=UH3dU}fbw&z4tMU*Di!Z(y3nL%?(tz*oSX-Mo<_2##<VhEAi|q*|@9
zv6*9e<v9ZjPZ%1^GCVTG*vJT@qa%!rj*?6!krnlo@yZ8@gp(`;^;(VG<_2qP8|3nN
zHa0fN<@4ln1&XB-)oP7uwMwhK75BX#!SBViOgE<D;lg7+>vT|65en+mMsUuz=U>1s
z;$WJXrh#ENw}zXXqU)NyF4oa?4NcSCaN$m;L%m)nm&@~Pd4<KrC33mE=&Ex@Qj>cX
zLCbD$*J`(@*XtBZW!Bd>h%So+nPehCI-MkyN|7BHU?7twlSz{u%#ulG2uGuUbR=VQ
zFF0`>k{vl~nI`Ran`WaywN|BEDpM|3C|B&Ca)oNOMx|1rV&9g_6*ueAFwCzcNirpX
zskv+a0Qj4|oS4%wM^RNbV$h9WP9#XDlB829Qt6Z^jF}R*nM{UsCQUdTK~;TX-<sYs
z(yv}ZIJ2C@R`iu5f!6KNXf&wRY7`1ZD&>ls{7@>E-M_2Vnw{(+W_l-1Ue}%U&x47Q
zbHYC(;V{|k0Fx8rOixcSJ~qZcCQTp^K$4{wvdx?=L&FUr7Re@hkMJAz{kpLg|L-LK
z{QvEpO=uit7{`CfW;dHQNn<P(^e_jP>R|<`SdkW#f}c>qlL}VwsNligq<$4_j~={u
z@MLYZ^-{q@TZB^k1y=l^4rpXN3`N1z#Kvy2`PgJVyze_ZJNq@8ot>Gq&kssB*_qiV
z@4nCfoq6Z|KU2|*j+6+@b7O9<wiH-bXWFQ90qtm3@u`(xWPE&#@v$)_4ij5E$LRRj
zxYu_#k8UQP&oh+GF~ERcmRswe%~qrO@%Pi(&+P@@EGDZ|DpV>J%H=ZUg$2);WV{Ir
z3k%H8*S{{6N-QjtJ?}z!agjwmcV%qOrtb_44nFJr`qL>R0HeUaK$q*(>Koq(!H{-0
zjf~_yLxZv{jxwsPi(~prFt)~#yejQ%3=-K~mZ3~WkCv*!P^Gd;wYus}s`-sB<?^Cx
z4BaTD(mbV7$$PCVo@M5>>(H#5_mZhkPPrlN-`=!olOBccU}DP_@*{cgmfV^a9nan8
z>j*(NU)_6p`)alJ+N?!4;-LP{N}U;Kqn2#%hM*Yu%{Ts1a7q|PbRQj2)r0ctXVZVp
zHfDe`$H-(do~tjD$#}QfR<(GWvoTN5E32O6T?u@}6K=oYSM<}mO&>LV+$3@B|0R}|
z%`$M~Pf#8TV^FHMFnfdB3NYz9cFEHpt5CcQJQ`KQ8{>l!gKVzW`1z4M!?|Ivp8N1{
z&a*&fbkdu~HLDPTdV8zS?PeNj(KO1^GE2)f-}8z#%Peb$p?{=@{@P=WFlKXE?W-6j
zn^mGV;CpPCxm{@DF|nCs20YuZ*}k@IeT@LKUu~as+JWODC<gv2QKpVWO&D@@F1>6v
zOWqrphP+BU#?|L9-r=V%@$^}ldR<j#bz1P7*}RR&8+WHUJ5>XgPe1~K5=?fW)pvf`
zb?jYGKjNPy0s-)M;=#c|?~Z}L;Y~RsGs>H!AJC2IStzxes_yu{5zch}W({I~Z%&Cj
zG)UhF-o7d?E_$8D|2H-6*S?@fv*Hu&X7+Elr1#_XNr2T=uU`hsZJEAl3fh`N9ZD!N
zb&kHEzaP-`AABY5e0|l#VZQ55f*+>FgWqeSJ}-26y|d;;Pyh~uZ`RI)ZFql$6ho~{
z(m>#ttw%ZYnd@kfz7iD0UXLU6MqR%|O(L3+78>jD0S$e$Rh6IGXEgRx@4XI!@Bg0L
zRe1_-+XYPp-~uoMtnYzsAqX}+x8OunCnSl}NANqj#rx+BaMAqW$(ZZdE5L~)A`%24
zHje9D2WTkvcO>Ru1VM<Gx*TsPP-hj2Q^5Av!Vv@^E~Z?^zTf|gW;0Ts#T1Mn2=UU8
z+pPp3g^M8tLFj=ha5VVK1_5v#+XcRgBO*Z%V&kOF?K)cBls?qwU<5&km!>)0Q~+GZ
z{sB1M*Kh<uh>KIMWB=Ifjdsh@KIl_0f*{08%Uo_L0Ip+S0>14_ID#O=#W~lpFSmNL
z)57%kqm4xngqS(l?#;FW;5zm>;L9kZ5d<MNPUswNNf>L|n*<&oCI~|6xe4s=v{A>W
zM9j@j-<+7-wgfyCMO1<y#KK#yV}H|Wqp;@mkAPo#i$@TIn7E3{*^Yz~0N1fAz-!17
zVL?bcYryNSV}~kc5c)xJbF<UeCMLJ#2w6T{5QIcH>^k<RVK?r!KGnOZ%0Yr4q>uB!
zd)@5NP!FIJR-t$g@H4Qr+kFK==o{C82VKYhtDBv=u2AVZ_MgB$WIjL;(n1y3*KP7c
z7jpo9=4PiInGX<z)Nt5!>`&IS<N9k<!`r~;J?t+CLhl>{-dXR?UC#mdu?od3@HMhX
zNDz|XH1M3i%5S&yBme+bp|~0Kpn;ve9!n5}&|CrbxQ;#F%Rzb;0065{+=_bGz<p61
zPY{H*{08iH9ebwN1NAZo;Nd#<Kfn{fR20V(1feBUz>`rVKSU$|0Ip+S19qcMO$0%R
zo-4pEookU0nE-%yCa?!M6XkIQLEsGPnm>|}-w>$)0O(1Hy~r&>L5PZDz}{Xb{F<?@
zg+QH{o1I>pnA~;}$f7O_BAILygxicNa2R+ath=vU`kt6pq4+fFX+z>25QOktM=kH|
z>*aJTBeOOTeSs_;7KAXI2VPpw+Wv0o%OyY%T~_P}FoawZ2tq5?P^bK_x{m!{93L2a
zB3gywF5qL}fw(_g5K_!lR3)EFaeipzcL6$~|G*uniltI*Sh(FW)q5X`JNY5uQ*o<M
zyc_rscp=F+1R)_#0Q=*()^9~BuEniF@p05sh#pHe5<!TCbHKq)5ABG9R0x1U&kq~`
zo=G|uLFfagfI~@~>bD|Q0${KT#T_Uic%GETC<q~`0w+<4-}DjPNs{X1vI<2Dco|iL
zP^`wnMq&!J0Pd*k*lyCnv?A34;KwQycLJ{fF9LTa9F8C~V+J@59C00cL%3o$i~tyP
z8M56d*Wn)EVU*`U5aMP9_#Rae>nw1wm-1Xmu;BzCh*c<#QWJznP?rjKB^s1)tMWJM
z)c!kE!e8izLoZG?yZ|)ADikMx?ZEvgLAV!~0LGg9%Ow=1kPenni*bVgZUBFv%5O~p
hzq^ioBdH+!#sB)Wl{9U9pIQI_002ovPDHLkV1mO0P67Y`

literal 0
HcmV?d00001


From a3f0f6b694235f4eacfee3e1135edf646b5773dc Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Wed, 12 Jan 2022 16:34:54 +0100
Subject: [PATCH 42/87] [feat] error trial == comptrial

---
 .../weichware10/analyse/gui/Analyzer.java     | 38 ++++++++++++-------
 .../analyse/gui/AnalyzerController.java       | 13 +++++--
 .../weichware10/analyse/gui/Analyzer.fxml     | 13 ++++++-
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index 8c8eedb..5689bb2 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -54,6 +54,8 @@ public static void setAnalyseType(AnalyseType analyseType) {
         hmConfig = new HeatmapConfig();
         diaConfig = new DiagramConfig();
 
+        controller.errorLabel.setVisible(false);
+
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
             trialComp = null;
         }
@@ -69,23 +71,27 @@ public static void setTrialId() {
         if (trial != null) {
             oldTrialId = trial.getTrialId();
         }
-        trial = TrialSelector.getTrialData(null);
-
-        if (oldTrialId != trial.getTrialId()) {
-            // Zurücksetzen bei Änderung des Trials
-            controller.analyseTypMenuButton.setDisable(true);
-            controller.configButton.setDisable(true);
-            controller.analyseButton.setDisable(true);
-            controller.selectCompTrialButton.setVisible(false);
-            controller.analyseTypMenuButton.setText("Analyse-Typ");
-            hmConfig = new HeatmapConfig();
-            diaConfig = new DiagramConfig();
+        try {
+            trial = TrialSelector.getTrialData(null);
+        } catch (NullPointerException e) {
+            Logger.error("Null Trial returned", e, true);
         }
 
         if (trial != null) {
+            if (oldTrialId != trial.getTrialId()) {
+                // Zurücksetzen bei Änderung des Trials
+                controller.analyseTypMenuButton.setDisable(true);
+                controller.configButton.setDisable(true);
+                controller.analyseButton.setDisable(true);
+                controller.selectCompTrialButton.setVisible(false);
+                controller.analyseTypMenuButton.setText("Analyse-Typ");
+                hmConfig = new HeatmapConfig();
+                diaConfig = new DiagramConfig();
+                controller.errorLabel.setVisible(false);
+            }
             controller.analyseTypMenuButton.setDisable(false);
+            Logger.info("trialId set to " + trial.trialId);
         }
-        Logger.info("trialId set to " + trial.trialId);
     }
 
     /**
@@ -93,12 +99,16 @@ public static void setTrialId() {
      */
     public static void setTrialIdComp() {
         trialComp = TrialSelector.getTrialData(trial.configId);
-        if (trialComp != null) {
+        if (!trialComp.getTrialId().equals(trial.getTrialId())) {
             controller.analyseButton.setDisable(false);
+            controller.errorLabel.setVisible(false);
+            Logger.info("trialIdComp set to " + trialComp.trialId);
         } else {
             controller.analyseButton.setDisable(true);
+            controller.errorLabel.setText(
+                "Trial und Vergleichs-Trial sind identisch. Wähle ein anderes Vergleichs-Trial!");
+            controller.errorLabel.setVisible(true);
         }
-        Logger.info("trialIdComp set to " + trialComp.trialId);
     }
 
     /**
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
index 49f3642..4ab0886 100644
--- a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
@@ -5,6 +5,7 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.control.MenuButton;
 
 /**
@@ -20,6 +21,8 @@ public class AnalyzerController extends AbsSceneController {
     protected Button configButton;
     @FXML
     protected Button selectCompTrialButton;
+    @FXML
+    protected Label errorLabel;
 
     @FXML
     protected void analyze(ActionEvent event) {
@@ -90,13 +93,15 @@ protected void setViewTimeDistr(ActionEvent event) {
     @FXML
     protected void initialize() {
         assert analyseButton != null :
-            "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
+                "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
         assert analyseTypMenuButton != null :
-            "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
+                "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
         assert configButton != null :
-            "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
+                "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
+        assert errorLabel != null :
+                "fx:id=\"errorLabel\" not injected: check 'Analyzer.fxml'.";
         assert selectCompTrialButton != null :
-            "fx:id=\"selectCompTrialButton\" not injected: check 'Analyzer.fxml'.";
+                "fx:id=\"selectCompTrialButton\" not injected: check 'Analyzer.fxml'.";
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
index b52ba1d..e6244ba 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
@@ -5,14 +5,16 @@
 <?import javafx.scene.chart.CategoryAxis?>
 <?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.AnalyzerController">
    <children>
-      <HBox alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0" spacing="15.0">
+      <HBox alignment="TOP_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
          <children>
             <Button mnemonicParsing="false" onAction="#selectTrial" text="Auswahl Trial" />
             <MenuButton fx:id="analyseTypMenuButton" disable="true" mnemonicParsing="false" text="Analyse-Typ">
@@ -32,6 +34,15 @@
             <Insets />
          </VBox.margin>
       </HBox>
+      <HBox alignment="TOP_CENTER" prefHeight="80.0" prefWidth="200.0">
+         <children>
+            <Label fx:id="errorLabel" alignment="CENTER" text="error" textAlignment="CENTER" textFill="RED" visible="false">
+               <font>
+                  <Font name="Monospaced Regular" size="12.0" />
+               </font>
+            </Label>
+         </children>
+      </HBox>
       <BarChart title="Beispiel">
         <xAxis>
           <CategoryAxis side="BOTTOM" />

From 05ed8390dc5dffa3eca7d52dcb9093c8062e1655 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Wed, 12 Jan 2022 18:46:13 +0100
Subject: [PATCH 43/87] [feat] toString Heatmap & Diagram Config

---
 .../analyse/config/DiagramConfig.java            | 15 +++++++++++++++
 .../analyse/config/HeatmapConfig.java            | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/main/java/github/weichware10/analyse/config/DiagramConfig.java b/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
index 899f5f2..425a1a2 100644
--- a/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
+++ b/src/main/java/github/weichware10/analyse/config/DiagramConfig.java
@@ -116,4 +116,19 @@ public int getStepsBetween() {
         return stepsBetween;
     }
 
+    @Override
+    public String toString() {
+        return String.format("""
+                DiagramConfig: {
+                    amountAreas: %d
+                    minTime: %f
+                    maxTime: %f
+                    stepsBetween: %d
+                }
+                """,
+                amountAreas,
+                minTime,
+                maxTime,
+                stepsBetween);
+    }
 }
diff --git a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
index 274843f..abd3e39 100644
--- a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
+++ b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
@@ -77,4 +77,20 @@ public void setImage(boolean image) {
     public boolean isImage() {
         return image;
     }
+
+    @Override
+    public String toString() {
+        return String.format("""
+                HeatmapConfig: {
+                    minColorDiff: (%f,%f,%f)
+                    maxColorDiff: (%f,%f,%f)
+                    isGrid: %b
+                    isImage: %b
+                }
+                """,
+                minColorDiff.getRed(), minColorDiff.getGreen(), minColorDiff.getBlue(),
+                maxColorDiff.getRed(), maxColorDiff.getGreen(), maxColorDiff.getBlue(),
+                isGrid(),
+                isImage());
+    }
 }

From 42ce1d70d2460274d5e8abbf5095ee9c85bc5adb Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Wed, 12 Jan 2022 18:46:28 +0100
Subject: [PATCH 44/87] [feat] back, export, rawexport buttons

---
 .../weichware10/analyse/gui/Analyzer.java     | 16 ++++--
 .../analyse/gui/AnalyzerController.java       | 55 ++++++++++++++-----
 .../weichware10/analyse/gui/Analyzer.fxml     | 17 +++++-
 3 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
index 5689bb2..2d77353 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/Analyzer.java
@@ -42,7 +42,6 @@ public static void start() {
     }
 
     /**
-     * /**
      * Setzt den Analyse-Typ.
      *
      * @param analyseType - Analyse-Typ
@@ -112,7 +111,7 @@ public static void setTrialIdComp() {
     }
 
     /**
-     * setzt die Konfiguration für Heatmap bzw. Diagramm Analyse
+     * Setzt die Konfiguration für Heatmap bzw. Diagramm Analyse
      */
     public static void setConfig() {
         if (analyseType == AnalyseType.COMPHEATMAP
@@ -126,8 +125,17 @@ public static void setConfig() {
         }
     }
 
+    /**
+     * Start Analyse.
+     */
     public static void analyse() {
-        Logger.info("Analyzer");
+        String output = String.format(
+                "analyseType: %s \ntrial: %s \ntrialComp: %s \nhmConfig: %s \ndiaConfig: %s",
+                analyseType != null ? analyseType : "null",
+                trial != null ? trial.toString() : "null",
+                trialComp != null ? trialComp.toString() : "null",
+                hmConfig.toString(),
+                diaConfig.toString());
+        Logger.info(output);
     }
-
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
index 4ab0886..d082604 100644
--- a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
@@ -18,18 +18,39 @@ public class AnalyzerController extends AbsSceneController {
     @FXML
     protected MenuButton analyseTypMenuButton;
     @FXML
-    protected Button configButton;
+    protected Button backButton;
     @FXML
-    protected Button selectCompTrialButton;
+    protected Button configButton;
     @FXML
     protected Label errorLabel;
+    @FXML
+    protected Button exportButton;
+    @FXML
+    protected Button exportRawButton;
+    @FXML
+    protected Button selectCompTrialButton;
 
     @FXML
     protected void analyze(ActionEvent event) {
-        // TODO: Start Analyse
+        // TODO: Analyse
         Analyzer.analyse();
     }
 
+    @FXML
+    void back(ActionEvent event) {
+        // TODO: back
+    }
+
+    @FXML
+    void export(ActionEvent event) {
+        // TODO: Export
+    }
+
+    @FXML
+    void exportRaw(ActionEvent event) {
+        // TODO: ExportRaw
+    }
+
     @FXML
     protected void selectTrial(ActionEvent event) {
         Analyzer.setTrialId();
@@ -55,7 +76,7 @@ protected void setConfig(ActionEvent event) {
     }
 
     @FXML
-    protected void setHeapmap(ActionEvent event) {
+    protected void setHeatmap(ActionEvent event) {
         configButton.setDisable(false);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
@@ -92,16 +113,22 @@ protected void setViewTimeDistr(ActionEvent event) {
 
     @FXML
     protected void initialize() {
-        assert analyseButton != null :
-                "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
-        assert analyseTypMenuButton != null :
-                "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
-        assert configButton != null :
-                "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
-        assert errorLabel != null :
-                "fx:id=\"errorLabel\" not injected: check 'Analyzer.fxml'.";
-        assert selectCompTrialButton != null :
-                "fx:id=\"selectCompTrialButton\" not injected: check 'Analyzer.fxml'.";
+        assert analyseButton != null
+                : "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
+        assert analyseTypMenuButton != null
+                : "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
+        assert backButton != null
+                : "fx:id=\"backButton\" was injected: check 'Analyzer.fxml'.";
+        assert configButton != null
+                : "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
+        assert errorLabel != null
+                : "fx:id=\"errorLabel\" not injected: check 'Analyzer.fxml'.";
+        assert exportButton != null
+                : "fx:id=\"exportButton\" not injected: check 'Analyzer.fxml'.";
+        assert exportRawButton != null
+                : "fx:id=\"exportRawButton\" not injected: check 'Analyzer.fxml'.";
+        assert selectCompTrialButton != null
+                : "fx:id=\"selectCompTrialButton\" not injected: check 'Analyzer.fxml'.";
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
index e6244ba..63a5365 100644
--- a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
@@ -19,7 +19,7 @@
             <Button mnemonicParsing="false" onAction="#selectTrial" text="Auswahl Trial" />
             <MenuButton fx:id="analyseTypMenuButton" disable="true" mnemonicParsing="false" text="Analyse-Typ">
               <items>
-                <MenuItem mnemonicParsing="false" onAction="#setHeapmap" text="Heatmap" />
+                <MenuItem mnemonicParsing="false" onAction="#setHeatmap" text="Heatmap" />
                 <MenuItem mnemonicParsing="false" onAction="#setCompHeatmap" text="Heatmap Vergleich" />
                   <MenuItem mnemonicParsing="false" onAction="#setVerlauf" text="Verlauf" />
                   <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsverteilung Bildbereiche" />
@@ -51,6 +51,21 @@
           <NumberAxis side="LEFT" />
         </yAxis>
       </BarChart>
+      <HBox alignment="BOTTOM_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
+         <children>
+            <HBox alignment="CENTER_LEFT" prefHeight="33.0" prefWidth="183.0" spacing="15.0">
+               <children>
+                  <Button fx:id="backButton" mnemonicParsing="false" onAction="#back" text="Zurück" />
+               </children>
+            </HBox>
+            <HBox alignment="CENTER_RIGHT" prefHeight="33.0" prefWidth="337.0" spacing="15.0">
+               <children>
+                  <Button fx:id="exportRawButton" disable="true" mnemonicParsing="false" onAction="#exportRaw" text="ExportRaw" />
+                  <Button fx:id="exportButton" disable="true" mnemonicParsing="false" onAction="#export" text="Export" />
+               </children>
+            </HBox>
+         </children>
+      </HBox>
    </children>
    <padding>
       <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />

From 92f5502b520cee212f986d1c196d58019e144fd2 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 13 Jan 2022 20:15:16 +0100
Subject: [PATCH 45/87] [chore] util upgrade

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 17fd0a7..be04d78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>87106a8</version>
+      <version>9534096</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <dependency>

From 87450ea254d09c630a60148108871907362f11e2 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 13 Jan 2022 20:15:30 +0100
Subject: [PATCH 46/87] [feat] TrialSelector fertig

---
 .../analyse/gui/TrialSelector.java            | 101 ++++++++++++++++--
 .../analyse/gui/TrialSelectorController.java  |   8 +-
 .../analyse/gui/TrialSelector.fxml            |  13 ++-
 3 files changed, 103 insertions(+), 19 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index b8c5e19..a6fb795 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -2,10 +2,13 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.Logger;
 import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
+import java.io.File;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.List;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
@@ -15,6 +18,8 @@
 import javafx.scene.control.Dialog;
 import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
+import javafx.stage.FileChooser;
+import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Stage;
 import org.joda.time.DateTime;
 
@@ -26,15 +31,20 @@ public class TrialSelector extends AbsScene {
     private static BorderPane root;
     private static TrialSelectorController controller;
     private static String trialId;
+    private static TrialData trialData;
     private static String fixedConfigId = null;
+    private static Dialog<Void> selectorDialog;
+    private static Button selectButton;
+    private static boolean secondTrial;
 
     /**
      * Auswahldialog für Trial.
      */
     public static TrialData getTrialData(String fixedConfigId) {
-        Dialog<Void> selectorDialog = new Dialog<>();
+        selectorDialog = new Dialog<>();
         ButtonType select = new ButtonType("Trial auswählen", ButtonData.APPLY);
-        selectorDialog.getDialogPane().getButtonTypes().addAll(select, ButtonType.CANCEL);
+        ButtonType json = new ButtonType("load from JSON", ButtonData.APPLY);
+        selectorDialog.getDialogPane().getButtonTypes().addAll(json, select, ButtonType.CANCEL);
 
         selectorDialog.setTitle("Auswahl Trial");
 
@@ -44,26 +54,41 @@ public static TrialData getTrialData(String fixedConfigId) {
 
         selectorDialog.getDialogPane().setContent((root != null) ? root : initialize());
 
-        TrialSelector.fixedConfigId = fixedConfigId;
         if (fixedConfigId != null) {
-            controller.configIdField.setText(fixedConfigId);
-            controller.configIdField.setDisable(true);
-            search();
+            controller.jsonLabel.setText("""
+                    Beim Laden von JSON-Dateien kann nicht überprüft werden,
+                    ob der Vergleich Sinn ergibt.""");
+            if (Main.dataBaseClient.configurations.getAvailability(fixedConfigId)) {
+                TrialSelector.fixedConfigId = fixedConfigId;
+            } else {
+                TrialSelector.fixedConfigId = null;
+            }
         } else {
-            controller.configIdField.setText("");
-            controller.configIdField.setDisable(false);
+            controller.jsonLabel.setText("");
         }
 
-        final Button selectButton = (Button) selectorDialog.getDialogPane().lookupButton(select);
+        reset();
+
+        selectButton = (Button) selectorDialog.getDialogPane().lookupButton(select);
+        Button jsonButton = (Button) selectorDialog.getDialogPane().lookupButton(json);
 
         selectButton.addEventFilter(ActionEvent.ACTION, e -> selectEventFilter(e));
+        jsonButton.addEventFilter(ActionEvent.ACTION, e -> loadFromJson(e));
 
         selectorDialog.showAndWait();
 
-        return (trialId != null) ? Main.dataBaseClient.trials.getTrial(trialId) : null;
+        return trialData;
     }
 
     protected static void search() {
+        if (controller.trialIdField.getText().length() == 0) {
+            searchForList();
+        } else {
+            searchForTrial();
+        }
+    }
+
+    protected static void searchForList() {
         String confContent = controller.configIdField.getText();
         final String configId = (confContent.length() > 0) ? confContent : null;
 
@@ -94,14 +119,67 @@ public void run() {
         searchThread.start();
     }
 
+    protected static void searchForTrial() {
+        final String trialId = controller.trialIdField.getText();
+
+        controller.indicator.setVisible(true);
+
+        Thread searchThread = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                List<TrialData> result = new ArrayList<>();
+                result.add(Main.dataBaseClient.trials.getTrial(trialId));
+
+                Platform.runLater(() -> {
+                    controller.indicator.setVisible(false);
+                    controller.resultTable.getItems().clear();
+                    controller.resultTable.getItems().addAll(result);
+                });
+            }
+        });
+
+        searchThread.start();
+    }
+
+    protected static void loadFromJson(ActionEvent jsonEvent) {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("JSON Config auswählen");
+        fileChooser.getExtensionFilters().add(
+                new ExtensionFilter("JSON Dateien", "*.json"));
+        File jsonFile = fileChooser.showOpenDialog(
+                selectorDialog.getDialogPane().getScene().getWindow());
+        String location = (jsonFile != null) ? jsonFile.getAbsolutePath() : null;
+
+        if (location != null) {
+            trialData = TrialData.fromJson(location);
+        } else {
+            jsonEvent.consume();
+        }
+        if (trialData == null) {
+            controller.warnLabel.setText("Could not load from JSON");
+            jsonEvent.consume();
+        }
+    }
+
     protected static void reset() {
-        controller.initResultTable();
+        controller.resultTable.getItems().clear();
+        controller.toolTypeBox.setValue(null);
         controller.initAmountBox();
+        controller.startPicker.setValue(null);
         controller.initEndPicker();
+        controller.trialIdField.setText("");
         if (fixedConfigId == null) {
             controller.configIdField.setText("");
+            controller.configIdField.setDisable(false);
+            controller.warnLabel.setText("");
+        } else {
+            controller.configIdField.setText(fixedConfigId);
             controller.configIdField.setDisable(true);
+            controller.warnLabel.setText("");
         }
+        controller.warnLabel.setText("");
+        search();
     }
 
     private static DateTime localDateToDateTime(java.time.LocalDate localDate, boolean endOfDay) {
@@ -135,5 +213,6 @@ private static void selectEventFilter(ActionEvent selectEvent) {
             return;
         }
         trialId = selected.trialId;
+        trialData = (trialId != null) ? Main.dataBaseClient.trials.getTrial(trialId) : null;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
index 304d12e..745a2b5 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
@@ -44,9 +44,9 @@ public class TrialSelectorController extends AbsSceneController {
     @FXML
     protected ProgressIndicator indicator;
     @FXML
-    protected Button resetButton;
-    @FXML
     protected TextField trialIdField;
+    @FXML
+    protected Label jsonLabel;
 
     @FXML
     protected Integer checkAmountInput() {
@@ -146,10 +146,10 @@ protected void initialize() {
                 : "fx:id=\"warnLabel\" not injected: check 'TrialSelector.fxml'.";
         assert indicator != null
                 : "fx:id=\"indicator\" not injected: check 'TrialSelector.fxml'.";
-        assert resetButton != null
-                : "fx:id=\"resetButton\" not injected: check 'TrialSelector.fxml'.";
         assert trialIdField != null
                 : "fx:id=\"trialIdField\" not injected: check 'TrialSelector.fxml'.";
+        assert jsonLabel != null
+                : "fx:id=\"jsonLabel\" not injected: check 'TrialSelector.fxml'.";
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
index 6361f81..8a97bd8 100644
--- a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
@@ -35,14 +35,14 @@
                   <Label text="Bei Eingabe einer Versuchs-ID werden andere Parameter ignoriert." />
                   <HBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
                      <children>
-                        <TextField prefHeight="25.0" prefWidth="177.0" promptText="Versuchs-ID" />
+                        <TextField fx:id="trialIdField" prefHeight="25.0" prefWidth="177.0" promptText="Versuchs-ID" />
                      </children>
                   </HBox>
                </children>
             </HBox>
             <HBox alignment="CENTER_RIGHT" spacing="10.0">
                <children>
-                  <Button mnemonicParsing="false" text="zurücksetzen" />
+                  <Button mnemonicParsing="false" onAction="#reset" text="zurücksetzen" />
                   <HBox alignment="CENTER_RIGHT" spacing="10.0" HBox.hgrow="ALWAYS">
                      <children>
                         <ComboBox fx:id="amountBox" editable="true" onAction="#checkAmountInput" onKeyPressed="#checkAmountInput" prefHeight="25.0" prefWidth="112.0" promptText="Anzahl" />
@@ -68,12 +68,17 @@
       </VBox>
    </center>
    <bottom>
-      <HBox alignment="CENTER_RIGHT" BorderPane.alignment="CENTER_RIGHT">
+      <HBox spacing="10.0" BorderPane.alignment="CENTER_RIGHT">
          <BorderPane.margin>
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </BorderPane.margin>
          <children>
-            <Label fx:id="warnLabel" alignment="CENTER" textFill="#da3633" HBox.hgrow="ALWAYS" />
+            <Label fx:id="jsonLabel" wrapText="true" />
+            <HBox alignment="CENTER_RIGHT" HBox.hgrow="ALWAYS">
+               <children>
+                  <Label fx:id="warnLabel" alignment="CENTER" textFill="#da3633" HBox.hgrow="ALWAYS" />
+               </children>
+            </HBox>
          </children>
       </HBox>
    </bottom>

From b126a24f759ab7654bd035312c8f516ff8ae4d70 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 13 Jan 2022 20:16:18 +0100
Subject: [PATCH 47/87] [style] unused variable

---
 src/main/java/github/weichware10/analyse/gui/TrialSelector.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
index a6fb795..f0ede78 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
@@ -2,7 +2,6 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
-import github.weichware10.util.Logger;
 import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
 import java.io.File;
@@ -35,7 +34,6 @@ public class TrialSelector extends AbsScene {
     private static String fixedConfigId = null;
     private static Dialog<Void> selectorDialog;
     private static Button selectButton;
-    private static boolean secondTrial;
 
     /**
      * Auswahldialog für Trial.

From 88ed7d51858f47eeeceec1e975cf12b5f9b24a56 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 13 Jan 2022 20:33:08 +0100
Subject: [PATCH 48/87] [refactor] Sortierung

---
 src/main/java/github/weichware10/analyse/Main.java            | 2 +-
 .../weichware10/analyse/gui/{ => analyse}/Analyzer.java       | 4 +++-
 .../analyse/gui/{ => analyse}/AnalyzerController.java         | 2 +-
 .../analyse/gui/{ => analyse}/DiagramConfigurator.java        | 2 +-
 .../gui/{ => analyse}/DiagramConfiguratorController.java      | 2 +-
 .../analyse/gui/{ => analyse}/HeatmapConfigurator.java        | 2 +-
 .../gui/{ => analyse}/HeatmapConfiguratorController.java      | 2 +-
 .../weichware10/analyse/gui/{ => analyse}/TrialSelector.java  | 2 +-
 .../analyse/gui/{ => analyse}/TrialSelectorController.java    | 2 +-
 .../analyse/gui/{ => general}/FunctionChooser.java            | 2 +-
 .../analyse/gui/{ => general}/FunctionChooserController.java  | 3 ++-
 .../github/weichware10/analyse/gui/{ => general}/Login.java   | 2 +-
 .../analyse/gui/{ => general}/LoginController.java            | 2 +-
 .../weichware10/analyse/gui/{ => general}/MainMenuBar.java    | 2 +-
 .../analyse/gui/{ => general}/MainMenuBarController.java      | 2 +-
 .../weichware10/analyse/gui/{ => analyse}/Analyzer.fxml       | 0
 .../analyse/gui/{ => analyse}/DiagramConfigurator.fxml        | 0
 .../analyse/gui/{ => analyse}/HeatmapConfigurator.fxml        | 0
 .../weichware10/analyse/gui/{ => analyse}/TrialSelector.fxml  | 0
 .../analyse/gui/{ => general}/FunctionChooser.fxml            | 0
 .../github/weichware10/analyse/gui/{ => general}/Login.fxml   | 0
 .../weichware10/analyse/gui/{ => general}/MainMenuBar.fxml    | 0
 22 files changed, 18 insertions(+), 15 deletions(-)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/Analyzer.java (96%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/AnalyzerController.java (98%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/DiagramConfigurator.java (98%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/DiagramConfiguratorController.java (98%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/HeatmapConfigurator.java (97%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/HeatmapConfiguratorController.java (97%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/TrialSelector.java (99%)
 rename src/main/java/github/weichware10/analyse/gui/{ => analyse}/TrialSelectorController.java (99%)
 rename src/main/java/github/weichware10/analyse/gui/{ => general}/FunctionChooser.java (94%)
 rename src/main/java/github/weichware10/analyse/gui/{ => general}/FunctionChooserController.java (89%)
 rename src/main/java/github/weichware10/analyse/gui/{ => general}/Login.java (98%)
 rename src/main/java/github/weichware10/analyse/gui/{ => general}/LoginController.java (97%)
 rename src/main/java/github/weichware10/analyse/gui/{ => general}/MainMenuBar.java (97%)
 rename src/main/java/github/weichware10/analyse/gui/{ => general}/MainMenuBarController.java (97%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => analyse}/Analyzer.fxml (100%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => analyse}/DiagramConfigurator.fxml (100%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => analyse}/HeatmapConfigurator.fxml (100%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => analyse}/TrialSelector.fxml (100%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => general}/FunctionChooser.fxml (100%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => general}/Login.fxml (100%)
 rename src/main/resources/github/weichware10/analyse/gui/{ => general}/MainMenuBar.fxml (100%)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index f7b1c80..d61d9db 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,6 +1,6 @@
 package github.weichware10.analyse;
 
-import github.weichware10.analyse.gui.Login;
+import github.weichware10.analyse.gui.general.Login;
 import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
diff --git a/src/main/java/github/weichware10/analyse/gui/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
similarity index 96%
rename from src/main/java/github/weichware10/analyse/gui/Analyzer.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index 2d77353..ee2f6fb 100644
--- a/src/main/java/github/weichware10/analyse/gui/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -1,9 +1,11 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.config.DiagramConfig;
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.enums.AnalyseType;
+import github.weichware10.analyse.gui.general.Login;
+import github.weichware10.analyse.gui.general.MainMenuBar;
 import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
diff --git a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
similarity index 98%
rename from src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index d082604..3e8c8e9 100644
--- a/src/main/java/github/weichware10/analyse/gui/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.util.AbsSceneController;
diff --git a/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
similarity index 98%
rename from src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
index d73517f..fae7e07 100644
--- a/src/main/java/github/weichware10/analyse/gui/DiagramConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.config.DiagramConfig;
 import github.weichware10.analyse.enums.AnalyseType;
diff --git a/src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
similarity index 98%
rename from src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
index 070670b..66c72c1 100644
--- a/src/main/java/github/weichware10/analyse/gui/DiagramConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import java.text.DecimalFormat;
diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
similarity index 97%
rename from src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
index 24c194e..c5334b1 100644
--- a/src/main/java/github/weichware10/analyse/gui/HeatmapConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.gui.util.AbsScene;
diff --git a/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java
similarity index 97%
rename from src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java
index 23bc964..511a010 100644
--- a/src/main/java/github/weichware10/analyse/gui/HeatmapConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import javafx.fxml.FXML;
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
similarity index 99%
rename from src/main/java/github/weichware10/analyse/gui/TrialSelector.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
index f0ede78..2ede310 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
diff --git a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java
similarity index 99%
rename from src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
rename to src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java
index 745a2b5..ce82f6c 100644
--- a/src/main/java/github/weichware10/analyse/gui/TrialSelectorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.ToolType;
diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
similarity index 94%
rename from src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
rename to src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
index 3f801c7..21eec1a 100644
--- a/src/main/java/github/weichware10/analyse/gui/FunctionChooser.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
diff --git a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
similarity index 89%
rename from src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
rename to src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
index e416f1b..49fc92a 100644
--- a/src/main/java/github/weichware10/analyse/gui/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
@@ -1,6 +1,7 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.analyse.Analyzer;
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
 import javafx.event.ActionEvent;
diff --git a/src/main/java/github/weichware10/analyse/gui/Login.java b/src/main/java/github/weichware10/analyse/gui/general/Login.java
similarity index 98%
rename from src/main/java/github/weichware10/analyse/gui/Login.java
rename to src/main/java/github/weichware10/analyse/gui/general/Login.java
index 1e52787..6de0f12 100644
--- a/src/main/java/github/weichware10/analyse/gui/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/Login.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
diff --git a/src/main/java/github/weichware10/analyse/gui/LoginController.java b/src/main/java/github/weichware10/analyse/gui/general/LoginController.java
similarity index 97%
rename from src/main/java/github/weichware10/analyse/gui/LoginController.java
rename to src/main/java/github/weichware10/analyse/gui/general/LoginController.java
index 73b042d..21c1660 100644
--- a/src/main/java/github/weichware10/analyse/gui/LoginController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/LoginController.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsSceneController;
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java
similarity index 97%
rename from src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
rename to src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java
index 6f7040d..5453330 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBar.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
diff --git a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java
similarity index 97%
rename from src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
rename to src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java
index 1bdb583..ff46d07 100644
--- a/src/main/java/github/weichware10/analyse/gui/MainMenuBarController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java
@@ -1,4 +1,4 @@
-package github.weichware10.analyse.gui;
+package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.analyse.gui.util.Log;
diff --git a/src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/Analyzer.fxml
rename to src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
diff --git a/src/main/resources/github/weichware10/analyse/gui/DiagramConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/DiagramConfigurator.fxml
rename to src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
diff --git a/src/main/resources/github/weichware10/analyse/gui/HeatmapConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/HeatmapConfigurator.fxml
rename to src/main/resources/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml
diff --git a/src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/TrialSelector.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/TrialSelector.fxml
rename to src/main/resources/github/weichware10/analyse/gui/analyse/TrialSelector.fxml
diff --git a/src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/FunctionChooser.fxml
rename to src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
diff --git a/src/main/resources/github/weichware10/analyse/gui/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/general/Login.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/Login.fxml
rename to src/main/resources/github/weichware10/analyse/gui/general/Login.fxml
diff --git a/src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/MainMenuBar.fxml
rename to src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml

From b6682e9a384ba905ca8e8051f94ec5d50b2ddfa6 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 13 Jan 2022 20:43:03 +0100
Subject: [PATCH 49/87] [fix] controller klassen

---
 .../github/weichware10/analyse/gui/analyse/Analyzer.fxml        | 2 +-
 .../weichware10/analyse/gui/analyse/DiagramConfigurator.fxml    | 2 +-
 .../weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml    | 2 +-
 .../github/weichware10/analyse/gui/analyse/TrialSelector.fxml   | 2 +-
 .../github/weichware10/analyse/gui/general/FunctionChooser.fxml | 2 +-
 .../resources/github/weichware10/analyse/gui/general/Login.fxml | 2 +-
 .../github/weichware10/analyse/gui/general/MainMenuBar.fxml     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
index 63a5365..e888e69 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.AnalyzerController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.AnalyzerController">
    <children>
       <HBox alignment="TOP_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
          <children>
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
index 59a6b3d..8bc677c 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="250.0" prefWidth="300.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.DiagramConfiguratorController">
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="250.0" prefWidth="300.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.DiagramConfiguratorController">
    <children>
       <Label alignment="CENTER" text="Konfiguration Diagramm" textAlignment="CENTER">
          <font>
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml
index a802a8f..13e3e0a 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.paint.Color?>
 <?import javafx.scene.text.Font?>
 
-<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="225.0" prefWidth="275.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.HeatmapConfiguratorController">
+<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="225.0" prefWidth="275.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.HeatmapConfiguratorController">
    <children>
       <Label alignment="CENTER" text="Konfiguration Heatmap" textAlignment="CENTER">
          <font>
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/TrialSelector.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/TrialSelector.fxml
index 8a97bd8..3b9bad1 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/TrialSelector.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/TrialSelector.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane prefHeight="700.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.TrialSelectorController">
+<BorderPane prefHeight="700.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.TrialSelectorController">
    <center>
       <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
          <children>
diff --git a/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
index 52dc22c..37f0aaa 100644
--- a/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.FunctionChooserController">
+<BorderPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.general.FunctionChooserController">
    <center>
       <VBox alignment="CENTER" BorderPane.alignment="CENTER">
          <children>
diff --git a/src/main/resources/github/weichware10/analyse/gui/general/Login.fxml b/src/main/resources/github/weichware10/analyse/gui/general/Login.fxml
index e57a912..d7ec5f8 100644
--- a/src/main/resources/github/weichware10/analyse/gui/general/Login.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/general/Login.fxml
@@ -16,7 +16,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<BorderPane prefHeight="500.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.LoginController">
+<BorderPane prefHeight="500.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.general.LoginController">
    <center>
       <VBox alignment="CENTER" prefHeight="200.0" prefWidth="200.0" spacing="10.0" BorderPane.alignment="CENTER">
          <children>
diff --git a/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
index 20fe1cb..eafd088 100644
--- a/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.SeparatorMenuItem?>
 
-<MenuBar xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.MainMenuBarController">
+<MenuBar xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.general.MainMenuBarController">
   <menus>
     <Menu mnemonicParsing="false" text="File">
       <items>

From f55c7aad0b5c4d07dd261c02c683b74c02856f7b Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Thu, 13 Jan 2022 20:52:40 +0100
Subject: [PATCH 50/87] [feat] TrialCreator-GUI

---
 .../analyse/gui/admin/TrialCreator.java       | 26 +++++++++
 .../gui/admin/TrialCreatorController.java     | 15 ++++++
 .../general/FunctionChooserController.java    | 20 ++++---
 .../analyse/gui/admin/TrialCreator.fxml       | 54 +++++++++++++++++++
 .../analyse/gui/general/FunctionChooser.fxml  | 34 +++++++++---
 5 files changed, 136 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml

diff --git a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
new file mode 100644
index 0000000..9024b28
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
@@ -0,0 +1,26 @@
+package github.weichware10.analyse.gui.admin;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.scene.Parent;
+
+/**
+ * Interface zum Erstellen von Trials (auf Basis von configIds).
+ */
+public class TrialCreator extends AbsScene {
+    private static Parent root;
+
+    /**
+     * Startet den TrialCreator.
+     */
+    public static void start() {
+        start(Main.primaryStage,
+                TrialCreator.class.getResource("TrialCreator.fxml"),
+                root,
+                null,
+                "Analyse - Trialerstellung",
+                null,
+                null,
+                null);
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
new file mode 100644
index 0000000..46d08cb
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
@@ -0,0 +1,15 @@
+package github.weichware10.analyse.gui.admin;
+
+import github.weichware10.analyse.gui.util.AbsSceneController;
+
+/**
+ * Controller für {@link TrialCreator}.
+ */
+public class TrialCreatorController extends AbsSceneController {
+
+    @Override
+    protected void initialize() {
+        // TODO Auto-generated method stub
+    }
+
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
index 49fc92a..7e0cf24 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
@@ -1,6 +1,7 @@
 package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.admin.TrialCreator;
 import github.weichware10.analyse.gui.analyse.Analyzer;
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
@@ -12,25 +13,32 @@
  * Controller für {@link FunctionChooser}.
  */
 public class FunctionChooserController extends AbsSceneController {
-    @FXML
-    private Button adminButton;
 
+    @FXML
+    private Button trialCreatorButton;
 
     @FXML
     void logOut() {
-        Logger.info(":FunctionChooser Logging out");
+        Logger.info("functionchooser:content Logging out");
         Login.logOut();
     }
 
     @FXML
     void startAnalyzer(ActionEvent event) {
+        Logger.info("functionchooser:content Logging out");
         Analyzer.start();
     }
 
+    @FXML
+    void startTrialCreator(ActionEvent event) {
+        Logger.info("functionchooser:content Starting TrialCreator");
+        TrialCreator.start();
+    }
+
     @Override
     protected void initialize() {
-        assert adminButton != null
-        : "fx:id=\"adminButton\" was not injected: check your FXML file 'FunctionChooser.fxml'.";
-        adminButton.setDisable(!Main.dataBaseClient.permissions.isAdmin);
+        assert trialCreatorButton != null
+                : "fx:id=\"adminButton\" not injected: check 'FunctionChooser.fxml'.";
+        trialCreatorButton.setDisable(!Main.dataBaseClient.permissions.isAuthor);
     }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml b/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml
new file mode 100644
index 0000000..89cd53e
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.admin.TrialCreatorController">
+   <center>
+      <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" BorderPane.alignment="CENTER">
+         <children>
+            <HBox alignment="CENTER" spacing="10.0">
+               <children>
+                  <Label text="Bitte config-ID und Anzahl angeben:" />
+                  <TextField prefWidth="150.0" promptText="Konfigurations-ID" />
+                  <ComboBox editable="true" prefWidth="100.0" promptText="Anzahl" />
+                  <Button mnemonicParsing="false" text="Trials erstellen" />
+               </children>
+            </HBox>
+            <GridPane VBox.vgrow="ALWAYS">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <TextArea prefHeight="200.0" prefWidth="200.0" promptText="hier werden die erzeugten TrialIDs erscheinen." GridPane.columnIndex="1" />
+               </children>
+            </GridPane>
+            <ButtonBar>
+              <buttons>
+                  <Button mnemonicParsing="false" text="zurück" ButtonBar.buttonData="LEFT" />
+                <Button defaultButton="true" mnemonicParsing="false" text="IDs als txt-Datei speichern" />
+              </buttons>
+            </ButtonBar>
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </VBox>
+   </center>
+</BorderPane>
diff --git a/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
index 37f0aaa..2fc70d6 100644
--- a/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
@@ -1,22 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
 <BorderPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.general.FunctionChooserController">
    <center>
-      <VBox alignment="CENTER" BorderPane.alignment="CENTER">
+      <VBox alignment="CENTER" spacing="10.0" BorderPane.alignment="CENTER">
          <children>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0">
+            <GridPane alignment="CENTER" vgap="10.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
+                  <RowConstraints minHeight="10.0" vgrow="ALWAYS" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+               </rowConstraints>
                <children>
-                  <Button mnemonicParsing="false" onAction="#startAnalyzer" text="Analyse" />
-                  <Button fx:id="adminButton" mnemonicParsing="false" text="Admin-Bereich" />
+                  <Button defaultButton="true" mnemonicParsing="false" onAction="#startAnalyzer" text="Analyse" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
+                  <Button fx:id="trialCreatorButton" mnemonicParsing="false" onAction="#startTrialCreator" text="Trials erstellen" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
+                  <Button mnemonicParsing="false" onAction="#logOut" text="LogOut" GridPane.halignment="CENTER" GridPane.rowIndex="5" GridPane.valignment="CENTER" />
+                  <Label text="Analyse Erklärung" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
+                  <Label text="Trials Erstellen Erklärung" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM" />
                </children>
-            </HBox>
-            <Button mnemonicParsing="false" onAction="#logOut" text="LogOut" />
+            </GridPane>
          </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
       </VBox>
    </center>
 </BorderPane>

From 1a6ae8ae50b787e3d310c1479a460c7b3e7fe111 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Fri, 14 Jan 2022 11:21:09 +0100
Subject: [PATCH 51/87] [fix] root persistence

---
 .../github/weichware10/analyse/gui/admin/TrialCreator.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
index 9024b28..b058e80 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
@@ -14,13 +14,13 @@ public class TrialCreator extends AbsScene {
      * Startet den TrialCreator.
      */
     public static void start() {
-        start(Main.primaryStage,
+        root = start(Main.primaryStage,
                 TrialCreator.class.getResource("TrialCreator.fxml"),
                 root,
                 null,
                 "Analyse - Trialerstellung",
                 null,
                 null,
-                null);
+                null).root;
     }
 }

From f23c42d40b3dcc3532e82079c308dc442bb19c99 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Fri, 14 Jan 2022 14:20:07 +0100
Subject: [PATCH 52/87] [feat] Configurator Grundstruktur

---
 .../java/github/weichware10/analyse/Main.java |   4 +-
 .../analyse/gui/admin/Configurator.java       |  26 ++
 .../gui/admin/ConfiguratorController.java     | 155 +++++++++
 .../general/FunctionChooserController.java    |  19 +-
 .../analyse/gui/admin/Configurator.fxml       | 295 ++++++++++++++++++
 .../analyse/gui/general/FunctionChooser.fxml  |  10 +-
 6 files changed, 500 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
 create mode 100644 src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
 create mode 100644 src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index d61d9db..41ff7eb 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -39,8 +39,8 @@ public void start(Stage primaryStage) throws Exception {
         Login.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
         // FENSTERGRÖẞE
-        primaryStage.setMinHeight(300);
-        primaryStage.setMinWidth(300);
+        primaryStage.setMinHeight(800);
+        primaryStage.setMinWidth(800);
         primaryStage.show();
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java b/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
new file mode 100644
index 0000000..f62f206
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
@@ -0,0 +1,26 @@
+package github.weichware10.analyse.gui.admin;
+
+import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.util.AbsScene;
+import javafx.scene.Parent;
+
+/**
+ * Konfigurator zum Anzeigen und Erstellen von Konfigurationen.
+ */
+public class Configurator extends AbsScene {
+    private static Parent root;
+
+    /**
+     * startet den Konfigurator.
+     */
+    public static void start() {
+        root = start(Main.primaryStage,
+                Configurator.class.getResource("Configurator.fxml"),
+                root,
+                null,
+                "Analyse - Konfigurator",
+                null,
+                null,
+                null).root;
+    }
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
new file mode 100644
index 0000000..b1a0932
--- /dev/null
+++ b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
@@ -0,0 +1,155 @@
+package github.weichware10.analyse.gui.admin;
+
+import github.weichware10.analyse.gui.general.FunctionChooser;
+import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.Logger;
+import github.weichware10.util.ToolType;
+import java.net.URL;
+import java.util.ResourceBundle;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.control.TitledPane;
+
+/**
+ * Controller für {@link Configurator}.
+ */
+public class ConfiguratorController extends AbsSceneController {
+
+    @FXML
+    private ResourceBundle resources;
+    @FXML
+    private URL location;
+    @FXML
+    protected TitledPane codeChartsConfigPane;
+    @FXML
+    protected TextField configIdField;
+    @FXML
+    protected Label configIdLabel;
+    @FXML
+    protected Button dataBaseSaveButton;
+    @FXML
+    protected TitledPane generalConfigPane;
+    @FXML
+    protected TextField horizontalSplitField;
+    @FXML
+    protected TextField imageViewHeightField;
+    @FXML
+    protected TextField imageViewWidthField;
+    @FXML
+    protected TextField imgUrlField;
+    @FXML
+    protected TextField initialSizeFieldX;
+    @FXML
+    protected TextField initialSizeFieldY;
+    @FXML
+    protected TextField introField;
+    @FXML
+    protected TextField iterationsField;
+    @FXML
+    protected Button jsonSaveButton;
+    @FXML
+    protected TextField maxDepthField;
+    @FXML
+    protected TextField outroField;
+    @FXML
+    protected CheckBox randomStringsBox;
+    @FXML
+    protected CheckBox relativeSizeBox;
+    @FXML
+    protected CheckBox shoGridBox;
+    @FXML
+    protected TextField speedField;
+    @FXML
+    protected Button stringIdButton;
+    @FXML
+    protected TextField stringIdField;
+    @FXML
+    protected TextField timingsGridField;
+    @FXML
+    protected TextField timingsImgField;
+    @FXML
+    protected ComboBox<ToolType> toolTypeBox;
+    @FXML
+    protected CheckBox tutorialBox;
+    @FXML
+    protected TextField verticalSplitField;
+    @FXML
+    protected TextField questionField;
+    @FXML
+    protected TitledPane zoomMapsConfigPane;
+
+    @FXML
+    private void startFunctionChooser() {
+        Logger.info("configurator:content Returning to FunctionChooser");
+        FunctionChooser.start();
+    }
+
+    @FXML
+    protected void initialize() {
+        assert codeChartsConfigPane != null
+                : "fx:id=\"codeChartsConfigPane\" not injected: check 'Configurator.fxml'.";
+        assert configIdField != null
+                : "fx:id=\"configIdField\" not injected: check 'Configurator.fxml'.";
+        assert configIdLabel != null
+                : "fx:id=\"configIdLabel\" not injected: check 'Configurator.fxml'.";
+        assert dataBaseSaveButton != null
+                : "fx:id=\"dataBaseSaveButton\" not injected: check 'Configurator.fxml'.";
+        assert generalConfigPane != null
+                : "fx:id=\"generalConfigPane\" not injected: check 'Configurator.fxml'.";
+        assert horizontalSplitField != null
+                : "fx:id=\"horizontalSplitField\" not injected: check 'Configurator.fxml'.";
+        assert imageViewHeightField != null
+                : "fx:id=\"imageViewHeightField\" not injected: check 'Configurator.fxml'.";
+        assert imageViewWidthField != null
+                : "fx:id=\"imageViewWidthField\" not injected: check 'Configurator.fxml'.";
+        assert imgUrlField != null
+                : "fx:id=\"imgUrlField\" not injected: check 'Configurator.fxml'.";
+        assert initialSizeFieldX != null
+                : "fx:id=\"initialSizeFieldX\" not injected: check 'Configurator.fxml'.";
+        assert initialSizeFieldY != null
+                : "fx:id=\"initialSizeFieldY\" not injected: check 'Configurator.fxml'.";
+        assert introField != null
+                : "fx:id=\"introField\" not injected: check 'Configurator.fxml'.";
+        assert iterationsField != null
+                : "fx:id=\"iterationsField\" not injected: check 'Configurator.fxml'.";
+        assert jsonSaveButton != null
+                : "fx:id=\"jsonSaveButton\" not injected: check 'Configurator.fxml'.";
+        assert maxDepthField != null
+                : "fx:id=\"maxDepthField\" not injected: check 'Configurator.fxml'.";
+        assert outroField != null
+                : "fx:id=\"outroField\" not injected: check 'Configurator.fxml'.";
+        assert randomStringsBox != null
+                : "fx:id=\"randomStringsBox\" not injected: check 'Configurator.fxml'.";
+        assert relativeSizeBox != null
+                : "fx:id=\"relativeSizeBox\" not injected: check 'Configurator.fxml'.";
+        assert shoGridBox != null
+                : "fx:id=\"shoGridBox\" not injected: check 'Configurator.fxml'.";
+        assert speedField != null
+                : "fx:id=\"speedField\" not injected: check 'Configurator.fxml'.";
+        assert stringIdButton != null
+                : "fx:id=\"stringIdButton\" not injected: check 'Configurator.fxml'.";
+        assert stringIdField != null
+                : "fx:id=\"stringIdField\" not injected: check 'Configurator.fxml'.";
+        assert timingsGridField != null
+                : "fx:id=\"timingsGridField\" not injected: check 'Configurator.fxml'.";
+        assert timingsImgField != null
+                : "fx:id=\"timingsImgField\" not injected: check 'Configurator.fxml'.";
+        assert toolTypeBox != null
+                : "fx:id=\"toolTypeBox\" not injected: check 'Configurator.fxml'.";
+        assert tutorialBox != null
+                : "fx:id=\"tutorialBox\" not injected: check 'Configurator.fxml'.";
+        assert verticalSplitField != null
+                : "fx:id=\"verticalSplitField\" not injected: check 'Configurator.fxml'.";
+        assert questionField != null
+                : "fx:id=\"questionField\" not injected: check 'Configurator.fxml'.";
+        assert zoomMapsConfigPane != null
+                : "fx:id=\"zoomMapsConfigPane\" not injected: check 'Configurator.fxml'.";
+
+        toolTypeBox.getItems().addAll(ToolType.CODECHARTS, ToolType.ZOOMMAPS);
+    }
+
+}
diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
index 7e0cf24..589db59 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
@@ -1,11 +1,11 @@
 package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.admin.Configurator;
 import github.weichware10.analyse.gui.admin.TrialCreator;
 import github.weichware10.analyse.gui.analyse.Analyzer;
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 
@@ -16,6 +16,8 @@ public class FunctionChooserController extends AbsSceneController {
 
     @FXML
     private Button trialCreatorButton;
+    @FXML
+    private Button configuratorButton;
 
     @FXML
     void logOut() {
@@ -24,13 +26,19 @@ void logOut() {
     }
 
     @FXML
-    void startAnalyzer(ActionEvent event) {
+    void startAnalyzer() {
         Logger.info("functionchooser:content Logging out");
         Analyzer.start();
     }
 
     @FXML
-    void startTrialCreator(ActionEvent event) {
+    void startConfigurator() {
+        Logger.info("functionchooser:content Starting Configurator");
+        Configurator.start();
+    }
+
+    @FXML
+    void startTrialCreator() {
         Logger.info("functionchooser:content Starting TrialCreator");
         TrialCreator.start();
     }
@@ -38,7 +46,10 @@ void startTrialCreator(ActionEvent event) {
     @Override
     protected void initialize() {
         assert trialCreatorButton != null
-                : "fx:id=\"adminButton\" not injected: check 'FunctionChooser.fxml'.";
+                : "fx:id=\"trialCreatorButton\" not injected: check 'FunctionChooser.fxml'.";
+        assert configuratorButton != null
+                : "fx:id=\"configuratorButton\" not injected: check 'FunctionChooser.fxml'.";
         trialCreatorButton.setDisable(!Main.dataBaseClient.permissions.isAuthor);
+        configuratorButton.setDisable(!Main.dataBaseClient.permissions.isAuthor);
     }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
new file mode 100644
index 0000000..3897790
--- /dev/null
+++ b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Accordion?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TitledPane?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.admin.ConfiguratorController">
+   <center>
+      <VBox alignment="CENTER" BorderPane.alignment="CENTER">
+         <children>
+            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+               <children>
+                  <GridPane alignment="CENTER" vgap="10.0" HBox.hgrow="ALWAYS">
+                     <columnConstraints>
+                        <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" percentWidth="80.0" />
+                     </columnConstraints>
+                     <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
+                        <RowConstraints minHeight="10.0" vgrow="NEVER" />
+                        <RowConstraints minHeight="10.0" vgrow="NEVER" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
+                     </rowConstraints>
+                     <children>
+                        <ButtonBar prefHeight="40.0" prefWidth="200.0">
+                           <buttons>
+                              <TextField fx:id="configIdField" promptText="Konfigurations-ID" />
+                              <Button layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="aus Datenbank laden" />
+                              <Button mnemonicParsing="false" text="aus JSON laden" />
+                           </buttons>
+                           <padding>
+                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                           </padding>
+                        </ButtonBar>
+                        <Label text="Bewegen Sie die Maus über Begriffe, um mehr über sie zu erfahren." GridPane.rowIndex="1" />
+                        <ScrollPane fitToWidth="true" GridPane.rowIndex="2">
+                           <content>
+                              <Accordion expandedPane="$generalConfigPane" >
+                                <panes>
+                                  <TitledPane fx:id="generalConfigPane" animated="false" text="allgemeine Konfiguration">
+                                       <content>
+                                          <GridPane hgap="10.0" vgap="10.0">
+                                            <columnConstraints>
+                                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                            </columnConstraints>
+                                            <rowConstraints>
+                                              <RowConstraints />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                            </rowConstraints>
+                                             <children>
+                                                <Label text="Konfigurations-ID:" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
+                                                   <tooltip>
+                                                      <Tooltip text="wird automatisch gesetzt." wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <Label fx:id="configIdLabel" text="noch nicht gesetzt" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                                <Label text="Tool-Typ" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                                                   <tooltip>
+                                                      <Tooltip text="Der Tool-Typ bestimmt, welcher Versuch durchgeführt wird." wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <ComboBox fx:id="toolTypeBox" prefWidth="150.0" promptText="Tool-Typ auswählen" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.valignment="BOTTOM" />
+                                                <Label text="Intro" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                                                   <tooltip>
+                                                      <Tooltip text="eine kleine Nachricht, welche vor dem Versuch angezeigt wird" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="introField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                                                <Label text="Outro" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+                                                   <tooltip>
+                                                      <Tooltip text="eine kleine Nachricht, die nach dem Versuch angezeigt wird" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="outroField" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                                                <Label text="Bild-URL" GridPane.halignment="RIGHT" GridPane.rowIndex="5">
+                                                   <tooltip>
+                                                      <Tooltip text="die URL des anzuzeigenden Bildes" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="imgUrlField" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                                                <Label text="Tutorial" GridPane.halignment="RIGHT" GridPane.rowIndex="6">
+                                                   <tooltip>
+                                                      <Tooltip text="definiert, ob das Tutorial gezeigt werden soll, oder nicht" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <CheckBox fx:id="tutorialBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+                                             </children>
+                                          </GridPane>
+                                       </content>
+                                  </TitledPane>
+                                  <TitledPane fx:id="codeChartsConfigPane" animated="false" text="CodeCharts-Konfiguration">
+                                       <content>
+                                          <GridPane hgap="10.0" vgap="10.0">
+                                            <columnConstraints>
+                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                            </columnConstraints>
+                                            <rowConstraints>
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                            </rowConstraints>
+                                             <children>
+                                                <Label text="String-ID" GridPane.halignment="RIGHT">
+                                                   <tooltip>
+                                                      <Tooltip text="die ID der String-Liste in der Datenbank" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <GridPane hgap="10.0" GridPane.columnIndex="1">
+                                                   <columnConstraints>
+                                                      <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" />
+                                                      <ColumnConstraints hgrow="ALWAYS" minWidth="70.0" />
+                                                   </columnConstraints>
+                                                   <rowConstraints>
+                                                      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                                                   </rowConstraints>
+                                                   <children>
+                                                      <TextField fx:id="stringIdField" />
+                                                      <Button fx:id="stringIdButton" mnemonicParsing="false" text="anzeigen" GridPane.columnIndex="1" />
+                                                   </children>
+                                                </GridPane>
+                                                <Label text="Ausgangsgröße" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
+                                                   <tooltip>
+                                                      <Tooltip text="Ausgangsunterteilung des Rasters" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                                                   <children>
+                                                      <Label text="X:" />
+                                                      <TextField fx:id="initialSizeFieldX" prefWidth="50.0" promptText="X" />
+                                                      <Label text="Y:" />
+                                                      <TextField fx:id="initialSizeFieldY" prefWidth="50.0" promptText="Y" />
+                                                   </children>
+                                                </HBox>
+                                                <Label text="Anzeigezeit Bild" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                                                   <tooltip>
+                                                      <Tooltip text="für wie ms das Bild angezeigt werden soll" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="timingsImgField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                                <Label layoutX="101.0" layoutY="87.0" text="Anzeigezeit Raster" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                                                   <tooltip>
+                                                      <Tooltip text="für wie ms das Raster angezeigt werden soll" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="timingsGridField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                                                <Label text="Sichtbarkeit Rasterlinien" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+                                                   <tooltip>
+                                                      <Tooltip text="ob die Linien des Rasters sichtbar sein sollen" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <CheckBox fx:id="shoGridBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                                                <Label text="relative Größenänderung" GridPane.halignment="RIGHT" GridPane.rowIndex="5">
+                                                   <tooltip>
+                                                      <Tooltip text="ob das Raster die Größe in betrachteten Bereichen anpassen soll" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <CheckBox fx:id="relativeSizeBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                                                <Label text="zufällige String-Anordnung" GridPane.halignment="RIGHT" GridPane.rowIndex="6">
+                                                   <tooltip>
+                                                      <Tooltip text="ob die Strings zufällig angeordnet werden sollen (wenn nicht werden sie so wie in der Liste angeordnet)" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <CheckBox fx:id="randomStringsBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+                                                <Label text="Durchläufe" GridPane.halignment="RIGHT" GridPane.rowIndex="7">
+                                                   <tooltip>
+                                                      <Tooltip text="wie viele Durchläufe mit korrekter Antwort absolviert werden müssen" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="iterationsField" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+                                                <Label text="maximale Tiefe" GridPane.halignment="RIGHT" GridPane.rowIndex="8">
+                                                   <tooltip>
+                                                      <Tooltip text="wie oft ein Raster maximal unterteilt werden sollte" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="maxDepthField" GridPane.columnIndex="1" GridPane.rowIndex="8" />
+                                                <Label text="horizontale Unterteilungen" GridPane.halignment="RIGHT" GridPane.rowIndex="9">
+                                                   <tooltip>
+                                                      <Tooltip text="wie oft ein Raster bei der relativen Größenänderung horizontal unterteilt werden soll (≤0 für dynamische Änderung)" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="horizontalSplitField" GridPane.columnIndex="1" GridPane.rowIndex="9" />
+                                                <Label text="vertikale Unterteilungen" GridPane.halignment="RIGHT" GridPane.rowIndex="10">
+                                                   <tooltip>
+                                                      <Tooltip text="wie oft ein Raster bei der relativen Größenänderung vertikal unterteilt werden soll (≤0 für dynamische Änderung)" wrapText="true" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="verticalSplitField" GridPane.columnIndex="1" GridPane.rowIndex="10" />
+                                             </children>
+                                          </GridPane>
+                                       </content>
+                                  </TitledPane>
+                                  <TitledPane fx:id="zoomMapsConfigPane" animated="false" text="ZoomMaps-Konfiguration">
+                                       <content>
+                                          <GridPane hgap="10.0" vgap="10.0">
+                                            <columnConstraints>
+                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                            </columnConstraints>
+                                            <rowConstraints>
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                                            </rowConstraints>
+                                             <children>
+                                                <Label layoutX="155.0" layoutY="27.0" text="Fragestellung" GridPane.halignment="RIGHT">
+                                                   <tooltip>
+                                                      <Tooltip text="die Frage, die beantwortet werden soll" />
+                                                   </tooltip>
+                                                </Label>
+                                                <Label text="Geschwindigkeit" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
+                                                   <tooltip>
+                                                      <Tooltip text="bestimmt die Zoom-Geschwindigkeit" />
+                                                   </tooltip>
+                                                </Label>
+                                                <Label layoutX="20.0" layoutY="27.0" text="Bild-Breite" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                                                   <tooltip>
+                                                      <Tooltip text="bestimmt die Höhe des anzuzeigenden Bildes in Pixeln" />
+                                                   </tooltip>
+                                                </Label>
+                                                <Label layoutX="20.0" layoutY="27.0" text="Bild-Höhe" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                                                   <tooltip>
+                                                      <Tooltip text="bestimmt die Breite des anzuzeigenden Bildes in Pixeln" />
+                                                   </tooltip>
+                                                </Label>
+                                                <TextField fx:id="speedField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                                <TextField fx:id="imageViewWidthField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                                <TextField fx:id="imageViewHeightField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                                                <TextField fx:id="questionField" GridPane.columnIndex="1" />
+                                             </children>
+                                          </GridPane>
+                                       </content></TitledPane>
+                                </panes>
+                              </Accordion>
+                           </content>
+                        </ScrollPane>
+                        <ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.rowIndex="4">
+                          <buttons>
+                              <Button layoutX="54.0" layoutY="10.0" mnemonicParsing="false" text="reset" ButtonBar.buttonData="LEFT" />
+                              <Button fx:id="dataBaseSaveButton" layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="in Datenbank speichern" />
+                            <Button fx:id="jsonSaveButton" mnemonicParsing="false" text="als JSON speichern" />
+                          </buttons>
+                           <padding>
+                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                           </padding>
+                        </ButtonBar>
+                        <TextArea editable="false" focusTraversable="false" maxHeight="40.0" minHeight="40.0" prefHeight="40.0" promptText="keine Probleme erkannt." wrapText="true" GridPane.hgrow="SOMETIMES" GridPane.rowIndex="3" GridPane.vgrow="SOMETIMES" />
+                     </children>
+                  </GridPane>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </center>
+   <bottom>
+      <ButtonBar prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+        <buttons>
+          <Button mnemonicParsing="false" onAction="#startFunctionChooser" text="zurück" ButtonBar.buttonData="LEFT" />
+        </buttons>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </ButtonBar>
+   </bottom>
+</BorderPane>
diff --git a/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
index 2fc70d6..c4bc311 100644
--- a/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/general/FunctionChooser.fxml
@@ -23,14 +23,18 @@
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                </rowConstraints>
                <children>
                   <Button defaultButton="true" mnemonicParsing="false" onAction="#startAnalyzer" text="Analyse" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-                  <Button fx:id="trialCreatorButton" mnemonicParsing="false" onAction="#startTrialCreator" text="Trials erstellen" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
-                  <Button mnemonicParsing="false" onAction="#logOut" text="LogOut" GridPane.halignment="CENTER" GridPane.rowIndex="5" GridPane.valignment="CENTER" />
+                  <Button fx:id="trialCreatorButton" mnemonicParsing="false" onAction="#startTrialCreator" text="Trials erstellen" GridPane.halignment="CENTER" GridPane.rowIndex="5" GridPane.valignment="CENTER" />
+                  <Button mnemonicParsing="false" onAction="#logOut" text="LogOut" GridPane.halignment="CENTER" GridPane.rowIndex="7" GridPane.valignment="CENTER" />
                   <Label text="Analyse Erklärung" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
-                  <Label text="Trials Erstellen Erklärung" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM" />
+                  <Label text="Trials Erstellen Erklärung" GridPane.halignment="CENTER" GridPane.rowIndex="4" GridPane.valignment="BOTTOM" />
+                  <Button fx:id="configuratorButton" mnemonicParsing="false" onAction="#startConfigurator" text="Konfigurator" GridPane.halignment="CENTER" GridPane.rowIndex="3" />
+                  <Label text="Konfigurator Erklärung" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM" />
                </children>
             </GridPane>
          </children>

From e0235347040ed4e0246bc678da4f30bb761837df Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Fri, 14 Jan 2022 16:08:35 +0100
Subject: [PATCH 53/87] [refactor] resources oopsies

---
 .../weichware10/analyse/gui/analyse/Analyzer.java   |  10 +++-------
 .../analyse/gui/analyse/DiagramConfigurator.java    |   3 ++-
 .../analyse/gui/analyse/HeatmapConfigurator.java    |   3 ++-
 .../analyse/gui/analyse/TrialSelector.java          |   2 +-
 .../gui/general/FunctionChooserController.java      |   2 +-
 .../weichware10/analyse/{gui => }/app-icon.png      | Bin
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename src/main/resources/github/weichware10/analyse/{gui => }/app-icon.png (100%)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index ee2f6fb..f5ad772 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -4,14 +4,11 @@
 import github.weichware10.analyse.config.DiagramConfig;
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.analyse.gui.general.Login;
 import github.weichware10.analyse.gui.general.MainMenuBar;
 import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
-import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
-import javafx.stage.Screen;
 
 /**
  * Analysefenster der App.
@@ -30,15 +27,14 @@ public class Analyzer extends AbsScene {
      * Startet die App.
      */
     public static void start() {
-        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
         InitResult ir = start(Main.primaryStage,
-                Login.class.getResource("Analyzer.fxml"),
+                Analyzer.class.getResource("Analyzer.fxml"),
                 root,
                 null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
-                (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2);
+                null,
+                null);
         root = ir.root;
         controller = (AnalyzerController) ir.controller;
     }
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
index fae7e07..6604cb3 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
@@ -1,5 +1,6 @@
 package github.weichware10.analyse.gui.analyse;
 
+import github.weichware10.analyse.Main;
 import github.weichware10.analyse.config.DiagramConfig;
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.util.AbsScene;
@@ -34,7 +35,7 @@ public static void start(DiagramConfig diaConfig, AnalyseType analyseType) {
 
         Stage stage = (Stage) configDialog.getDialogPane().getScene().getWindow();
         stage.getIcons().add(
-                new Image(DiagramConfigurator.class.getResource("app-icon.png").toString()));
+                new Image(Main.class.getResource("app-icon.png").toString()));
 
         InitResult ir =
                 initialize(DiagramConfigurator.class.getResource("DiagramConfigurator.fxml"));
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
index c5334b1..7960449 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
@@ -1,5 +1,6 @@
 package github.weichware10.analyse.gui.analyse;
 
+import github.weichware10.analyse.Main;
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.gui.util.AbsScene;
 import javafx.event.ActionEvent;
@@ -33,7 +34,7 @@ public static void start(HeatmapConfig hmConfig) {
 
         Stage stage = (Stage) configDialog.getDialogPane().getScene().getWindow();
         stage.getIcons().add(
-                new Image(HeatmapConfigurator.class.getResource("app-icon.png").toString()));
+                new Image(Main.class.getResource("app-icon.png").toString()));
 
         InitResult ir =
                 initialize(HeatmapConfigurator.class.getResource("HeatmapConfigurator.fxml"));
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
index 2ede310..ab83262 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
@@ -48,7 +48,7 @@ public static TrialData getTrialData(String fixedConfigId) {
 
         Stage stage = (Stage) selectorDialog.getDialogPane().getScene().getWindow();
         stage.getIcons().add(
-                new Image(TrialSelector.class.getResource("app-icon.png").toString()));
+                new Image(Main.class.getResource("app-icon.png").toString()));
 
         selectorDialog.getDialogPane().setContent((root != null) ? root : initialize());
 
diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
index 589db59..6adb09a 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
@@ -27,7 +27,7 @@ void logOut() {
 
     @FXML
     void startAnalyzer() {
-        Logger.info("functionchooser:content Logging out");
+        Logger.info("functionchooser:content Starting analzyzer");
         Analyzer.start();
     }
 
diff --git a/src/main/resources/github/weichware10/analyse/gui/app-icon.png b/src/main/resources/github/weichware10/analyse/app-icon.png
similarity index 100%
rename from src/main/resources/github/weichware10/analyse/gui/app-icon.png
rename to src/main/resources/github/weichware10/analyse/app-icon.png

From bf3eee06ee95d410bf7348d6864507c1e31723af Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Fri, 14 Jan 2022 16:27:44 +0100
Subject: [PATCH 54/87] [feat] tactical retreat

---
 .../analyse/gui/admin/TrialCreatorController.java        | 9 +++++++++
 .../github/weichware10/analyse/gui/analyse/Analyzer.java | 2 +-
 .../analyse/gui/analyse/AnalyzerController.java          | 3 ++-
 .../weichware10/analyse/gui/admin/TrialCreator.fxml      | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
index 46d08cb..59ef5aa 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
@@ -1,12 +1,21 @@
 package github.weichware10.analyse.gui.admin;
 
+import github.weichware10.analyse.gui.general.FunctionChooser;
 import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.Logger;
+import javafx.fxml.FXML;
 
 /**
  * Controller für {@link TrialCreator}.
  */
 public class TrialCreatorController extends AbsSceneController {
 
+    @FXML
+    private void startFunctionChooser() {
+        Logger.info("trialcreator:content Starting Function Chooser");
+        FunctionChooser.start();
+    }
+
     @Override
     protected void initialize() {
         // TODO Auto-generated method stub
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index f5ad772..5f0a9c0 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -30,7 +30,7 @@ public static void start() {
         InitResult ir = start(Main.primaryStage,
                 Analyzer.class.getResource("Analyzer.fxml"),
                 root,
-                null,
+                controller,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 null,
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index 3e8c8e9..cab4e4e 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -1,6 +1,7 @@
 package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.enums.AnalyseType;
+import github.weichware10.analyse.gui.general.FunctionChooser;
 import github.weichware10.analyse.gui.util.AbsSceneController;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -38,7 +39,7 @@ protected void analyze(ActionEvent event) {
 
     @FXML
     void back(ActionEvent event) {
-        // TODO: back
+        FunctionChooser.start();
     }
 
     @FXML
diff --git a/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml b/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml
index 89cd53e..7754011 100644
--- a/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/admin/TrialCreator.fxml
@@ -41,7 +41,7 @@
             </GridPane>
             <ButtonBar>
               <buttons>
-                  <Button mnemonicParsing="false" text="zurück" ButtonBar.buttonData="LEFT" />
+                  <Button mnemonicParsing="false" onAction="#startFunctionChooser" text="zurück" ButtonBar.buttonData="LEFT" />
                 <Button defaultButton="true" mnemonicParsing="false" text="IDs als txt-Datei speichern" />
               </buttons>
             </ButtonBar>

From 09f7a96de649b40109b8fabb8a431a650fad0f0b Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 12:56:54 +0100
Subject: [PATCH 55/87] =?UTF-8?q?[fix]=20Fenstergr=C3=B6=C3=9Fe=20resized?=
 =?UTF-8?q?=20nur=20bei=20Login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weichware10/analyse/gui/general/FunctionChooser.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
index 21eec1a..9ca3388 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
@@ -2,9 +2,7 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.util.AbsScene;
-import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
-import javafx.stage.Screen;
 
 /**
  * Der Auswahlbildschirm der App.
@@ -16,14 +14,13 @@ public class FunctionChooser extends AbsScene {
      * Startet die App.
      */
     public static void start() {
-        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
         root = start(Main.primaryStage,
                 Login.class.getResource("FunctionChooser.fxml"),
                 root,
                 null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
-                (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2).root;
+                null,
+                null).root;
     }
 }

From 052faca42a8d8ba51b92817a1e682b612056ad6d Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 15 Jan 2022 18:12:59 +0100
Subject: [PATCH 56/87] [fix] configId always fixed

---
 .../github/weichware10/analyse/gui/analyse/TrialSelector.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
index ab83262..4211b67 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
@@ -63,6 +63,7 @@ public static TrialData getTrialData(String fixedConfigId) {
             }
         } else {
             controller.jsonLabel.setText("");
+            TrialSelector.fixedConfigId = null;
         }
 
         reset();

From 89a2f5021b7a4c17ccd4161a4eb1fef29a5954f4 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 18:17:10 +0100
Subject: [PATCH 57/87] [feat] neuanordnung configurator

---
 .../java/github/weichware10/analyse/Main.java |   8 +
 .../analyse/gui/admin/Configurator.java       |   3 +-
 .../gui/admin/ConfiguratorController.java     |  61 ++-
 .../analyse/gui/admin/Configurator.fxml       | 500 +++++++++---------
 4 files changed, 303 insertions(+), 269 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 41ff7eb..7e0d4d6 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,5 +1,6 @@
 package github.weichware10.analyse;
 
+import github.weichware10.analyse.gui.admin.Configurator;
 import github.weichware10.analyse.gui.general.Login;
 import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
@@ -7,6 +8,8 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.scene.image.Image;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
 import org.joda.time.DateTime;
 
@@ -42,5 +45,10 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.setMinHeight(800);
         primaryStage.setMinWidth(800);
         primaryStage.show();
+        primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, (e) -> {
+            if (e.getCode() == KeyCode.CONTROL) {
+                Configurator.start();
+            }
+        });
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java b/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
index f62f206..5d4f4ca 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
@@ -1,6 +1,7 @@
 package github.weichware10.analyse.gui.admin;
 
 import github.weichware10.analyse.Main;
+import github.weichware10.analyse.gui.general.MainMenuBar;
 import github.weichware10.analyse.gui.util.AbsScene;
 import javafx.scene.Parent;
 
@@ -19,7 +20,7 @@ public static void start() {
                 root,
                 null,
                 "Analyse - Konfigurator",
-                null,
+                MainMenuBar.getMenuBar(),
                 null,
                 null).root;
     }
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
index b1a0932..545a3c0 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
@@ -6,13 +6,14 @@
 import github.weichware10.util.ToolType;
 import java.net.URL;
 import java.util.ResourceBundle;
+import javafx.beans.Observable;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-import javafx.scene.control.TitledPane;
+import javafx.scene.layout.GridPane;
 
 /**
  * Controller für {@link Configurator}.
@@ -24,16 +25,14 @@ public class ConfiguratorController extends AbsSceneController {
     @FXML
     private URL location;
     @FXML
-    protected TitledPane codeChartsConfigPane;
+    protected GridPane codeChartsConfigPane;
     @FXML
-    protected TextField configIdField;
+    protected Label configHeading;
     @FXML
     protected Label configIdLabel;
     @FXML
     protected Button dataBaseSaveButton;
     @FXML
-    protected TitledPane generalConfigPane;
-    @FXML
     protected TextField horizontalSplitField;
     @FXML
     protected TextField imageViewHeightField;
@@ -60,7 +59,7 @@ public class ConfiguratorController extends AbsSceneController {
     @FXML
     protected CheckBox relativeSizeBox;
     @FXML
-    protected CheckBox shoGridBox;
+    protected CheckBox showGridBox;
     @FXML
     protected TextField speedField;
     @FXML
@@ -80,7 +79,7 @@ public class ConfiguratorController extends AbsSceneController {
     @FXML
     protected TextField questionField;
     @FXML
-    protected TitledPane zoomMapsConfigPane;
+    protected GridPane zoomMapsConfigPane;
 
     @FXML
     private void startFunctionChooser() {
@@ -92,14 +91,12 @@ private void startFunctionChooser() {
     protected void initialize() {
         assert codeChartsConfigPane != null
                 : "fx:id=\"codeChartsConfigPane\" not injected: check 'Configurator.fxml'.";
-        assert configIdField != null
-                : "fx:id=\"configIdField\" not injected: check 'Configurator.fxml'.";
+        assert configHeading != null
+                : "fx:id=\"configHeading\" not injected: check 'Configurator.fxml'.";
         assert configIdLabel != null
                 : "fx:id=\"configIdLabel\" not injected: check 'Configurator.fxml'.";
         assert dataBaseSaveButton != null
                 : "fx:id=\"dataBaseSaveButton\" not injected: check 'Configurator.fxml'.";
-        assert generalConfigPane != null
-                : "fx:id=\"generalConfigPane\" not injected: check 'Configurator.fxml'.";
         assert horizontalSplitField != null
                 : "fx:id=\"horizontalSplitField\" not injected: check 'Configurator.fxml'.";
         assert imageViewHeightField != null
@@ -126,8 +123,8 @@ protected void initialize() {
                 : "fx:id=\"randomStringsBox\" not injected: check 'Configurator.fxml'.";
         assert relativeSizeBox != null
                 : "fx:id=\"relativeSizeBox\" not injected: check 'Configurator.fxml'.";
-        assert shoGridBox != null
-                : "fx:id=\"shoGridBox\" not injected: check 'Configurator.fxml'.";
+        assert showGridBox != null
+                : "fx:id=\"showGridBox\" not injected: check 'Configurator.fxml'.";
         assert speedField != null
                 : "fx:id=\"speedField\" not injected: check 'Configurator.fxml'.";
         assert stringIdButton != null
@@ -149,7 +146,43 @@ protected void initialize() {
         assert zoomMapsConfigPane != null
                 : "fx:id=\"zoomMapsConfigPane\" not injected: check 'Configurator.fxml'.";
 
-        toolTypeBox.getItems().addAll(ToolType.CODECHARTS, ToolType.ZOOMMAPS);
+        toolTypeBox.getItems().addAll(ToolType.CODECHARTS, ToolType.ZOOMMAPS, null);
+        toolTypeBox.valueProperty().addListener((o) -> setConfigType(o));
+    }
+
+    private void setConfigType(Observable o) {
+        if (toolTypeBox.getValue() == ToolType.ZOOMMAPS) {
+            zoomMapsConfigPane.setVisible(true);
+            zoomMapsConfigPane.setDisable(false);
+            codeChartsConfigPane.setVisible(false);
+        } else if (toolTypeBox.getValue() == ToolType.CODECHARTS) {
+            codeChartsConfigPane.setVisible(true);
+            codeChartsConfigPane.setDisable(false);
+            zoomMapsConfigPane.setVisible(false);
+        } else {
+            codeChartsConfigPane.setDisable(true);
+            zoomMapsConfigPane.setDisable(true);
+        }
     }
 
+    @FXML
+    private void reset() {
+        toolTypeBox.setValue(null);
+        introField.setText(null);
+        outroField.setText(null);
+        imgUrlField.setText(null);
+        stringIdField.setText(null);
+        stringIdButton.setText("...");
+        stringIdButton.setDisable(true);
+        initialSizeFieldX.setText(null);
+        initialSizeFieldY.setText(null);
+        iterationsField.setText(null);
+        maxDepthField.setText(null);
+        horizontalSplitField.setText(null);
+        verticalSplitField.setText(null);
+        questionField.setText(null);
+        speedField.setText(null);
+        imageViewWidthField.setText(null);
+        imageViewHeightField.setText(null);
+    }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
index 3897790..fcd75b3 100644
--- a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
@@ -1,284 +1,276 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Accordion?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.admin.ConfiguratorController">
    <center>
-      <VBox alignment="CENTER" BorderPane.alignment="CENTER">
+      <VBox alignment="CENTER" spacing="10.0" BorderPane.alignment="CENTER">
+         <BorderPane.margin>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </BorderPane.margin>
          <children>
-            <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+            <HBox alignment="CENTER" prefWidth="600.0">
                <children>
-                  <GridPane alignment="CENTER" vgap="10.0" HBox.hgrow="ALWAYS">
-                     <columnConstraints>
-                        <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" percentWidth="80.0" />
-                     </columnConstraints>
-                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                        <RowConstraints minHeight="10.0" vgrow="NEVER" />
-                        <RowConstraints minHeight="10.0" vgrow="NEVER" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                     </rowConstraints>
+                  <ButtonBar prefHeight="40.0" prefWidth="600.0">
+                     <buttons>
+                        <Button mnemonicParsing="false" text="aus JSON laden" ButtonBar.buttonData="LEFT" />
+                        <TextField fx:id="configIdField" promptText="Konfigurations-ID" />
+                        <Button layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="aus Datenbank laden" />
+                     </buttons>
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </ButtonBar>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER">
+               <children>
+                  <Label alignment="CENTER" contentDisplay="CENTER" text="Bewegen Sie die Maus über Begriffe, um mehr über sie zu erfahren." />
+               </children>
+            </HBox>
+            <HBox alignment="CENTER">
+               <children>
+                  <GridPane alignment="CENTER" hgap="10.0" prefWidth="600.0" vgap="10.0" HBox.hgrow="NEVER">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                      <RowConstraints />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
                      <children>
-                        <ButtonBar prefHeight="40.0" prefWidth="200.0">
-                           <buttons>
-                              <TextField fx:id="configIdField" promptText="Konfigurations-ID" />
-                              <Button layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="aus Datenbank laden" />
-                              <Button mnemonicParsing="false" text="aus JSON laden" />
-                           </buttons>
-                           <padding>
-                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                           </padding>
-                        </ButtonBar>
-                        <Label text="Bewegen Sie die Maus über Begriffe, um mehr über sie zu erfahren." GridPane.rowIndex="1" />
-                        <ScrollPane fitToWidth="true" GridPane.rowIndex="2">
-                           <content>
-                              <Accordion expandedPane="$generalConfigPane" >
-                                <panes>
-                                  <TitledPane fx:id="generalConfigPane" animated="false" text="allgemeine Konfiguration">
-                                       <content>
-                                          <GridPane hgap="10.0" vgap="10.0">
-                                            <columnConstraints>
-                                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                            </columnConstraints>
-                                            <rowConstraints>
-                                              <RowConstraints />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                            </rowConstraints>
-                                             <children>
-                                                <Label text="Konfigurations-ID:" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
-                                                   <tooltip>
-                                                      <Tooltip text="wird automatisch gesetzt." wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <Label fx:id="configIdLabel" text="noch nicht gesetzt" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                                <Label text="Tool-Typ" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER">
-                                                   <tooltip>
-                                                      <Tooltip text="Der Tool-Typ bestimmt, welcher Versuch durchgeführt wird." wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <ComboBox fx:id="toolTypeBox" prefWidth="150.0" promptText="Tool-Typ auswählen" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.valignment="BOTTOM" />
-                                                <Label text="Intro" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
-                                                   <tooltip>
-                                                      <Tooltip text="eine kleine Nachricht, welche vor dem Versuch angezeigt wird" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="introField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                                                <Label text="Outro" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
-                                                   <tooltip>
-                                                      <Tooltip text="eine kleine Nachricht, die nach dem Versuch angezeigt wird" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="outroField" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                                                <Label text="Bild-URL" GridPane.halignment="RIGHT" GridPane.rowIndex="5">
-                                                   <tooltip>
-                                                      <Tooltip text="die URL des anzuzeigenden Bildes" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="imgUrlField" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-                                                <Label text="Tutorial" GridPane.halignment="RIGHT" GridPane.rowIndex="6">
-                                                   <tooltip>
-                                                      <Tooltip text="definiert, ob das Tutorial gezeigt werden soll, oder nicht" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <CheckBox fx:id="tutorialBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                                             </children>
-                                          </GridPane>
-                                       </content>
-                                  </TitledPane>
-                                  <TitledPane fx:id="codeChartsConfigPane" animated="false" text="CodeCharts-Konfiguration">
-                                       <content>
-                                          <GridPane hgap="10.0" vgap="10.0">
-                                            <columnConstraints>
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                            </columnConstraints>
-                                            <rowConstraints>
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                            </rowConstraints>
-                                             <children>
-                                                <Label text="String-ID" GridPane.halignment="RIGHT">
-                                                   <tooltip>
-                                                      <Tooltip text="die ID der String-Liste in der Datenbank" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <GridPane hgap="10.0" GridPane.columnIndex="1">
-                                                   <columnConstraints>
-                                                      <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" />
-                                                      <ColumnConstraints hgrow="ALWAYS" minWidth="70.0" />
-                                                   </columnConstraints>
-                                                   <rowConstraints>
-                                                      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                   </rowConstraints>
-                                                   <children>
-                                                      <TextField fx:id="stringIdField" />
-                                                      <Button fx:id="stringIdButton" mnemonicParsing="false" text="anzeigen" GridPane.columnIndex="1" />
-                                                   </children>
-                                                </GridPane>
-                                                <Label text="Ausgangsgröße" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
-                                                   <tooltip>
-                                                      <Tooltip text="Ausgangsunterteilung des Rasters" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
-                                                   <children>
-                                                      <Label text="X:" />
-                                                      <TextField fx:id="initialSizeFieldX" prefWidth="50.0" promptText="X" />
-                                                      <Label text="Y:" />
-                                                      <TextField fx:id="initialSizeFieldY" prefWidth="50.0" promptText="Y" />
-                                                   </children>
-                                                </HBox>
-                                                <Label text="Anzeigezeit Bild" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
-                                                   <tooltip>
-                                                      <Tooltip text="für wie ms das Bild angezeigt werden soll" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="timingsImgField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                                <Label layoutX="101.0" layoutY="87.0" text="Anzeigezeit Raster" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
-                                                   <tooltip>
-                                                      <Tooltip text="für wie ms das Raster angezeigt werden soll" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="timingsGridField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                                                <Label text="Sichtbarkeit Rasterlinien" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
-                                                   <tooltip>
-                                                      <Tooltip text="ob die Linien des Rasters sichtbar sein sollen" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <CheckBox fx:id="shoGridBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                                                <Label text="relative Größenänderung" GridPane.halignment="RIGHT" GridPane.rowIndex="5">
-                                                   <tooltip>
-                                                      <Tooltip text="ob das Raster die Größe in betrachteten Bereichen anpassen soll" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <CheckBox fx:id="relativeSizeBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-                                                <Label text="zufällige String-Anordnung" GridPane.halignment="RIGHT" GridPane.rowIndex="6">
-                                                   <tooltip>
-                                                      <Tooltip text="ob die Strings zufällig angeordnet werden sollen (wenn nicht werden sie so wie in der Liste angeordnet)" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <CheckBox fx:id="randomStringsBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                                                <Label text="Durchläufe" GridPane.halignment="RIGHT" GridPane.rowIndex="7">
-                                                   <tooltip>
-                                                      <Tooltip text="wie viele Durchläufe mit korrekter Antwort absolviert werden müssen" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="iterationsField" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-                                                <Label text="maximale Tiefe" GridPane.halignment="RIGHT" GridPane.rowIndex="8">
-                                                   <tooltip>
-                                                      <Tooltip text="wie oft ein Raster maximal unterteilt werden sollte" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="maxDepthField" GridPane.columnIndex="1" GridPane.rowIndex="8" />
-                                                <Label text="horizontale Unterteilungen" GridPane.halignment="RIGHT" GridPane.rowIndex="9">
-                                                   <tooltip>
-                                                      <Tooltip text="wie oft ein Raster bei der relativen Größenänderung horizontal unterteilt werden soll (≤0 für dynamische Änderung)" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="horizontalSplitField" GridPane.columnIndex="1" GridPane.rowIndex="9" />
-                                                <Label text="vertikale Unterteilungen" GridPane.halignment="RIGHT" GridPane.rowIndex="10">
-                                                   <tooltip>
-                                                      <Tooltip text="wie oft ein Raster bei der relativen Größenänderung vertikal unterteilt werden soll (≤0 für dynamische Änderung)" wrapText="true" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="verticalSplitField" GridPane.columnIndex="1" GridPane.rowIndex="10" />
-                                             </children>
-                                          </GridPane>
-                                       </content>
-                                  </TitledPane>
-                                  <TitledPane fx:id="zoomMapsConfigPane" animated="false" text="ZoomMaps-Konfiguration">
-                                       <content>
-                                          <GridPane hgap="10.0" vgap="10.0">
-                                            <columnConstraints>
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                            </columnConstraints>
-                                            <rowConstraints>
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                            </rowConstraints>
-                                             <children>
-                                                <Label layoutX="155.0" layoutY="27.0" text="Fragestellung" GridPane.halignment="RIGHT">
-                                                   <tooltip>
-                                                      <Tooltip text="die Frage, die beantwortet werden soll" />
-                                                   </tooltip>
-                                                </Label>
-                                                <Label text="Geschwindigkeit" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
-                                                   <tooltip>
-                                                      <Tooltip text="bestimmt die Zoom-Geschwindigkeit" />
-                                                   </tooltip>
-                                                </Label>
-                                                <Label layoutX="20.0" layoutY="27.0" text="Bild-Breite" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
-                                                   <tooltip>
-                                                      <Tooltip text="bestimmt die Höhe des anzuzeigenden Bildes in Pixeln" />
-                                                   </tooltip>
-                                                </Label>
-                                                <Label layoutX="20.0" layoutY="27.0" text="Bild-Höhe" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
-                                                   <tooltip>
-                                                      <Tooltip text="bestimmt die Breite des anzuzeigenden Bildes in Pixeln" />
-                                                   </tooltip>
-                                                </Label>
-                                                <TextField fx:id="speedField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                                <TextField fx:id="imageViewWidthField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                                <TextField fx:id="imageViewHeightField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                                                <TextField fx:id="questionField" GridPane.columnIndex="1" />
-                                             </children>
-                                          </GridPane>
-                                       </content></TitledPane>
-                                </panes>
-                              </Accordion>
-                           </content>
-                        </ScrollPane>
-                        <ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.rowIndex="4">
-                          <buttons>
-                              <Button layoutX="54.0" layoutY="10.0" mnemonicParsing="false" text="reset" ButtonBar.buttonData="LEFT" />
-                              <Button fx:id="dataBaseSaveButton" layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="in Datenbank speichern" />
-                            <Button fx:id="jsonSaveButton" mnemonicParsing="false" text="als JSON speichern" />
-                          </buttons>
-                           <padding>
-                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                           </padding>
-                        </ButtonBar>
-                        <TextArea editable="false" focusTraversable="false" maxHeight="40.0" minHeight="40.0" prefHeight="40.0" promptText="keine Probleme erkannt." wrapText="true" GridPane.hgrow="SOMETIMES" GridPane.rowIndex="3" GridPane.vgrow="SOMETIMES" />
+                        <Label text="Tool-Typ" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                           <tooltip>
+                              <Tooltip text="Der Tool-Typ bestimmt, welcher Versuch durchgeführt wird." wrapText="true" />
+                           </tooltip>
+                        </Label>
+                        <ComboBox fx:id="toolTypeBox" prefWidth="150.0" promptText="Tool-Typ auswählen" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.valignment="BOTTOM" />
+                        <Label text="Intro" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                           <tooltip>
+                              <Tooltip text="eine kleine Nachricht, welche vor dem Versuch angezeigt wird" wrapText="true" />
+                           </tooltip>
+                        </Label>
+                        <TextField fx:id="introField" promptText="string" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                        <Label text="Outro" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                           <tooltip>
+                              <Tooltip text="eine kleine Nachricht, die nach dem Versuch angezeigt wird" wrapText="true" />
+                           </tooltip>
+                        </Label>
+                        <TextField fx:id="outroField" promptText="string" GridPane.columnIndex="3" GridPane.rowIndex="3" />
+                        <Label text="Bild-URL" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                           <tooltip>
+                              <Tooltip text="die URL des anzuzeigenden Bildes" wrapText="true" />
+                           </tooltip>
+                        </Label>
+                        <TextField fx:id="imgUrlField" promptText="string" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                        <Label text="Tutorial" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+                           <tooltip>
+                              <Tooltip text="definiert, ob das Tutorial gezeigt werden soll, oder nicht" wrapText="true" />
+                           </tooltip>
+                        </Label>
+                        <CheckBox fx:id="tutorialBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                        <Label fx:id="configHeading" text="neue Konfiguration" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                           <font>
+                              <Font size="24.0" />
+                           </font>
+                        </Label>
                      </children>
                   </GridPane>
                </children>
             </HBox>
+            <HBox alignment="CENTER">
+               <children>
+                  <StackPane>
+                     <children>
+                        <GridPane fx:id="codeChartsConfigPane" alignment="CENTER" disable="true" hgap="10.0" prefWidth="600.0" vgap="10.0">
+                          <columnConstraints>
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="15.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="15.0" prefWidth="100.0" />
+                          </columnConstraints>
+                          <rowConstraints>
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                          </rowConstraints>
+                           <children>
+                              <Label text="String-ID" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
+                                 <tooltip>
+                                    <Tooltip text="die ID der String-Liste in der Datenbank" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="stringIdField" promptText="string" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                              <Button fx:id="stringIdButton" mnemonicParsing="false" text="anzeigen" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                              <Label text="Rastergröße X" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                                 <tooltip>
+                                    <Tooltip text="Ausgangsunterteilung des Rasters (horizontal)" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="initialSizeFieldX" promptText="X" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                              <Label text="Rastergröße Y" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                                 <tooltip>
+                                    <Tooltip text="Ausgangsunterteilung des Rasters (vertikal)" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <Label text="Anzeigezeit Bild" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                                 <tooltip>
+                                    <Tooltip text="für wie ms das Bild angezeigt werden soll" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="timingsImgField" promptText="ms" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                              <Label layoutX="101.0" layoutY="87.0" text="Anzeigezeit Raster" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                                 <tooltip>
+                                    <Tooltip text="für wie ms das Raster angezeigt werden soll" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="timingsGridField" promptText="ms" GridPane.columnIndex="3" GridPane.rowIndex="3" />
+                              <Label text="Sichtbarkeit Rasterlinien" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+                                 <tooltip>
+                                    <Tooltip text="ob die Linien des Rasters sichtbar sein sollen" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <CheckBox fx:id="shoGridBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                              <Label text="relative Größenänderung" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+                                 <tooltip>
+                                    <Tooltip text="ob das Raster die Größe in betrachteten Bereichen anpassen soll" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <CheckBox fx:id="relativeSizeBox" mnemonicParsing="false" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+                              <Label text="zufällige String-Anordnung" GridPane.halignment="RIGHT" GridPane.rowIndex="5">
+                                 <tooltip>
+                                    <Tooltip text="ob die Strings zufällig angeordnet werden sollen (wenn nicht werden sie so wie in der Liste angeordnet)" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <CheckBox fx:id="randomStringsBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                              <Label text="Durchläufe" GridPane.halignment="RIGHT" GridPane.rowIndex="6">
+                                 <tooltip>
+                                    <Tooltip text="wie viele Durchläufe mit korrekter Antwort absolviert werden müssen" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="iterationsField" promptText="int" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+                              <Label text="maximale Tiefe" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="6">
+                                 <tooltip>
+                                    <Tooltip text="wie oft ein Raster maximal unterteilt werden sollte" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="maxDepthField" promptText="int" GridPane.columnIndex="3" GridPane.rowIndex="6" />
+                              <Label text="horizontale Unterteilungen" GridPane.halignment="RIGHT" GridPane.rowIndex="7">
+                                 <tooltip>
+                                    <Tooltip text="wie oft ein Raster bei der relativen Größenänderung horizontal unterteilt werden soll (≤0 für dynamische Änderung)" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="horizontalSplitField" promptText="int" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+                              <Label text="vertikale Unterteilungen" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="7">
+                                 <tooltip>
+                                    <Tooltip text="wie oft ein Raster bei der relativen Größenänderung vertikal unterteilt werden soll (≤0 für dynamische Änderung)" wrapText="true" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="verticalSplitField" promptText="int" GridPane.columnIndex="3" GridPane.rowIndex="7" />
+                              <TextField fx:id="initialSizeFieldY" prefWidth="50.0" promptText="Y" GridPane.columnIndex="3" GridPane.rowIndex="2" />
+                              <Label text="CodeCharts-Konfiguration" GridPane.columnSpan="4" GridPane.halignment="CENTER">
+                                 <font>
+                                    <Font size="24.0" />
+                                 </font>
+                              </Label>
+                           </children>
+                        </GridPane>
+                        <GridPane fx:id="zoomMapsConfigPane" alignment="CENTER" disable="true" hgap="10.0" layoutX="10.0" layoutY="10.0" prefWidth="600.0" vgap="10.0" visible="false">
+                           <columnConstraints>
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                           </columnConstraints>
+                           <rowConstraints>
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                           </rowConstraints>
+                           <children>
+                              <Label layoutX="155.0" layoutY="27.0" text="Fragestellung" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
+                                 <tooltip>
+                                    <Tooltip text="die Frage, die beantwortet werden soll" />
+                                 </tooltip>
+                              </Label>
+                              <Label text="Geschwindigkeit" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                                 <tooltip>
+                                    <Tooltip text="bestimmt die Zoom-Geschwindigkeit" />
+                                 </tooltip>
+                              </Label>
+                              <Label layoutX="20.0" layoutY="27.0" text="Bild-Breite" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+                                 <tooltip>
+                                    <Tooltip text="bestimmt die Höhe des anzuzeigenden Bildes in Pixeln" />
+                                 </tooltip>
+                              </Label>
+                              <Label layoutX="20.0" layoutY="27.0" text="Bild-Höhe" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
+                                 <tooltip>
+                                    <Tooltip text="bestimmt die Breite des anzuzeigenden Bildes in Pixeln" />
+                                 </tooltip>
+                              </Label>
+                              <TextField fx:id="speedField1" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                              <TextField fx:id="imageViewWidthField1" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                              <TextField fx:id="imageViewHeightField1" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+                              <TextField fx:id="questionField1" promptText="string" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                              <Label text="ZoomMaps-Konfiguration" GridPane.columnSpan="4" GridPane.halignment="CENTER">
+                                 <font>
+                                    <Font size="24.0" />
+                                 </font>
+                              </Label>
+                           </children>
+                        </GridPane>
+                     </children>
+                  </StackPane>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER">
+               <children>
+                  <TextArea editable="false" focusTraversable="false" maxHeight="40.0" minHeight="40.0" mouseTransparent="true" prefHeight="40.0" prefWidth="600.0" promptText="keine Probleme erkannt." wrapText="true" />
+               </children>
+            </HBox>
+            <HBox alignment="CENTER">
+               <children>
+                  <ButtonBar prefHeight="40.0" prefWidth="600.0">
+                    <buttons>
+                        <Button layoutX="54.0" layoutY="10.0" mnemonicParsing="false" onAction="#reset" text="reset" ButtonBar.buttonData="LEFT" />
+                        <Button fx:id="dataBaseSaveButton" layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="in Datenbank speichern" />
+                      <Button fx:id="jsonSaveButton" mnemonicParsing="false" text="als JSON speichern" />
+                    </buttons>
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </ButtonBar>
+               </children>
+            </HBox>
          </children>
       </VBox>
    </center>

From c5ada6f78a8947ffc255f2e63bb90e9e3f0a1676 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 18:22:04 +0100
Subject: [PATCH 58/87] [fix] sizing + debug removed

---
 src/main/java/github/weichware10/analyse/Main.java    | 11 ++++-------
 .../github/weichware10/analyse/gui/general/Login.java |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 7e0d4d6..ec51905 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -21,6 +21,8 @@ public class Main extends Application {
     public static Stage primaryStage;
     public static DataBaseClient dataBaseClient;
     public static String databaseUrl;
+    public static final int MINWIDTH = 800;
+    public static final int MINHEIGHT = 800;
 
     /**
      * Einstiegspunkt der Analyse.
@@ -42,13 +44,8 @@ public void start(Stage primaryStage) throws Exception {
         Login.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
         // FENSTERGRÖẞE
-        primaryStage.setMinHeight(800);
-        primaryStage.setMinWidth(800);
+        primaryStage.setMinWidth(MINWIDTH);
+        primaryStage.setMinHeight(MINHEIGHT);
         primaryStage.show();
-        primaryStage.addEventFilter(KeyEvent.KEY_PRESSED, (e) -> {
-            if (e.getCode() == KeyCode.CONTROL) {
-                Configurator.start();
-            }
-        });
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/general/Login.java b/src/main/java/github/weichware10/analyse/gui/general/Login.java
index 6de0f12..0e6e7e4 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/Login.java
@@ -36,8 +36,8 @@ public static void start() {
                 null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
-                (int) screenBounds.getWidth() / 2,
-                (int) screenBounds.getHeight() / 2).root;
+                Math.max((int) screenBounds.getWidth() / 2, Main.MINWIDTH),
+                Math.max((int) screenBounds.getHeight() / 2, Main.MINHEIGHT)).root;
     }
 
     /**

From 40e01864b416c7634610d1adf7738695c1c3597c Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 15 Jan 2022 18:22:26 +0100
Subject: [PATCH 59/87] [feat] reset analyse on log out

---
 .../analyse/gui/analyse/Analyzer.java           | 17 +++++++++++++++++
 .../gui/general/FunctionChooserController.java  |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index 5f0a9c0..a4f4db7 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -136,4 +136,21 @@ public static void analyse() {
                 diaConfig.toString());
         Logger.info(output);
     }
+
+    /**
+     * Setzt Analyse zurück.
+     */
+    public static void reset() {
+        controller.analyseButton.setDisable(true);
+        controller.analyseTypMenuButton.setDisable(true);
+        controller.configButton.setDisable(true);
+        controller.exportButton.setDisable(true);
+        controller.exportRawButton.setDisable(true);
+        controller.selectCompTrialButton.setVisible(false);
+        Analyzer.analyseType = null;
+        Analyzer.trial = null;
+        Analyzer.trialComp = null;
+        Analyzer.hmConfig = new HeatmapConfig();
+        Analyzer.diaConfig = new DiagramConfig();
+    }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
index 6adb09a..b96dbdf 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
@@ -21,6 +21,8 @@ public class FunctionChooserController extends AbsSceneController {
 
     @FXML
     void logOut() {
+        Logger.info("analyzer:content Resetting");
+        Analyzer.reset();
         Logger.info("functionchooser:content Logging out");
         Login.logOut();
     }

From 1675dc756a59329473f34c49f1c27765bff318b5 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 15 Jan 2022 18:25:35 +0100
Subject: [PATCH 60/87] [style] checkstyle

---
 src/main/java/github/weichware10/analyse/Main.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index ec51905..ad567b3 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,6 +1,5 @@
 package github.weichware10.analyse;
 
-import github.weichware10.analyse.gui.admin.Configurator;
 import github.weichware10.analyse.gui.general.Login;
 import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
@@ -8,8 +7,6 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.scene.image.Image;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
 import org.joda.time.DateTime;
 

From 3d3898c64899aa769102b238fe2258144e6b5866 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 18:36:03 +0100
Subject: [PATCH 61/87] [fix] reset everything

---
 .../gui/admin/ConfiguratorController.java     |  7 ++++++
 .../analyse/gui/admin/Configurator.fxml       | 22 +++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
index 545a3c0..783d77d 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
@@ -184,5 +184,12 @@ private void reset() {
         speedField.setText(null);
         imageViewWidthField.setText(null);
         imageViewHeightField.setText(null);
+        tutorialBox.setSelected(false);
+        showGridBox.setSelected(false);
+        relativeSizeBox.setSelected(false);
+        randomStringsBox.setSelected(false);
+        timingsImgField.setText(null);
+        timingsGridField.setText(null);
+        configHeading.setText("neue Konfiguration");
     }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
index fcd75b3..37940e6 100644
--- a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
@@ -128,7 +128,7 @@
                                  </tooltip>
                               </Label>
                               <TextField fx:id="stringIdField" promptText="string" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                              <Button fx:id="stringIdButton" mnemonicParsing="false" text="anzeigen" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                              <Button fx:id="stringIdButton" mnemonicParsing="false" text="..." GridPane.columnIndex="2" GridPane.rowIndex="1" />
                               <Label text="Rastergröße X" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
                                  <tooltip>
                                     <Tooltip text="Ausgangsunterteilung des Rasters (horizontal)" wrapText="true" />
@@ -157,7 +157,7 @@
                                     <Tooltip text="ob die Linien des Rasters sichtbar sein sollen" wrapText="true" />
                                  </tooltip>
                               </Label>
-                              <CheckBox fx:id="shoGridBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                              <CheckBox fx:id="showGridBox" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                               <Label text="relative Größenänderung" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
                                  <tooltip>
                                     <Tooltip text="ob das Raster die Größe in betrachteten Bereichen anpassen soll" wrapText="true" />
@@ -217,6 +217,11 @@
                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                            </rowConstraints>
                            <children>
+                              <Label text="ZoomMaps-Konfiguration" GridPane.columnSpan="4" GridPane.halignment="CENTER">
+                                 <font>
+                                    <Font size="24.0" />
+                                 </font>
+                              </Label>
                               <Label layoutX="155.0" layoutY="27.0" text="Fragestellung" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
                                  <tooltip>
                                     <Tooltip text="die Frage, die beantwortet werden soll" />
@@ -237,15 +242,10 @@
                                     <Tooltip text="bestimmt die Breite des anzuzeigenden Bildes in Pixeln" />
                                  </tooltip>
                               </Label>
-                              <TextField fx:id="speedField1" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-                              <TextField fx:id="imageViewWidthField1" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-                              <TextField fx:id="imageViewHeightField1" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-                              <TextField fx:id="questionField1" promptText="string" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-                              <Label text="ZoomMaps-Konfiguration" GridPane.columnSpan="4" GridPane.halignment="CENTER">
-                                 <font>
-                                    <Font size="24.0" />
-                                 </font>
-                              </Label>
+                              <TextField fx:id="speedField" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                              <TextField fx:id="imageViewWidthField" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+                              <TextField fx:id="imageViewHeightField" promptText="double" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+                              <TextField fx:id="questionField" promptText="string" GridPane.columnIndex="2" GridPane.rowIndex="1" />
                            </children>
                         </GridPane>
                      </children>

From 4ceb0ff1ae369b58c826a09468889bc4b634abbe Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 19:03:53 +0100
Subject: [PATCH 62/87] [fix] window resizing

---
 src/main/java/github/weichware10/analyse/Main.java         | 5 +++++
 .../java/github/weichware10/analyse/gui/general/Login.java | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index ad567b3..2e2140a 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -6,7 +6,9 @@
 import github.weichware10.util.db.DataBaseClient;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
+import javafx.geometry.Rectangle2D;
 import javafx.scene.image.Image;
+import javafx.stage.Screen;
 import javafx.stage.Stage;
 import org.joda.time.DateTime;
 
@@ -43,6 +45,9 @@ public void start(Stage primaryStage) throws Exception {
         // FENSTERGRÖẞE
         primaryStage.setMinWidth(MINWIDTH);
         primaryStage.setMinHeight(MINHEIGHT);
+        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
+        primaryStage.setWidth(Math.max((int) screenBounds.getWidth() / 2, Main.MINWIDTH));
+        primaryStage.setHeight(Math.max((int) screenBounds.getHeight() / 2, Main.MINHEIGHT));
         primaryStage.show();
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/general/Login.java b/src/main/java/github/weichware10/analyse/gui/general/Login.java
index 0e6e7e4..5881ae2 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/Login.java
@@ -8,13 +8,11 @@
 import javafx.application.Platform;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
-import javafx.geometry.Rectangle2D;
 import javafx.scene.Parent;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.Region;
 import javafx.scene.text.Text;
-import javafx.stage.Screen;
 
 /**
  * Der Loginbildschirm der App.
@@ -29,15 +27,14 @@ public class Login extends AbsScene {
      * Startet die App.
      */
     public static void start() {
-        Rectangle2D screenBounds = Screen.getPrimary().getBounds();
         root = start(Main.primaryStage,
                 Login.class.getResource("Login.fxml"),
                 root,
                 null,
                 "Analyse",
                 MainMenuBar.getMenuBar(),
-                Math.max((int) screenBounds.getWidth() / 2, Main.MINWIDTH),
-                Math.max((int) screenBounds.getHeight() / 2, Main.MINHEIGHT)).root;
+                null,
+                null).root;
     }
 
     /**

From ca84f3fd93e28efb55389b50c51795b684dd4e93 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 19:47:22 +0100
Subject: [PATCH 63/87] [fix] logsMenu

---
 .../github/weichware10/analyse/gui/general/MainMenuBar.fxml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml b/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
index eafd088..2066507 100644
--- a/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/general/MainMenuBar.fxml
@@ -12,7 +12,7 @@
             <MenuItem mnemonicParsing="false" onAction="#setDataBaseUrl" text="Datenbank ändern" />
             <MenuItem mnemonicParsing="false" onAction="#resetDataBaseUrl" text="Datenbank URL reset" />
             <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem mnemonicParsing="false" onAction="#toggleLogs" text="show Logs" />
+            <MenuItem fx:id="logsMenu" mnemonicParsing="false" onAction="#toggleLogs" text="show Logs" />
             <SeparatorMenuItem mnemonicParsing="false" />
         <MenuItem fx:id="logOutMenu" disable="true" mnemonicParsing="false" onAction="#logOut" text="Ausloggen" />
       </items>

From 456dee4b7ffc63abb40b876897c8c3883cc48b62 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Sat, 15 Jan 2022 19:57:51 +0100
Subject: [PATCH 64/87] [refactor] Log und AbsScene nach util verlegt

---
 pom.xml                                       |   2 +-
 .../java/github/weichware10/analyse/Main.java |   4 +-
 .../analyse/gui/admin/Configurator.java       |   3 +-
 .../gui/admin/ConfiguratorController.java     |   2 +-
 .../analyse/gui/admin/TrialCreator.java       |   3 +-
 .../gui/admin/TrialCreatorController.java     |   2 +-
 .../analyse/gui/analyse/Analyzer.java         |   3 +-
 .../gui/analyse/AnalyzerController.java       |   2 +-
 .../gui/analyse/DiagramConfigurator.java      |   2 +-
 .../DiagramConfiguratorController.java        |   2 +-
 .../gui/analyse/HeatmapConfigurator.java      |   2 +-
 .../HeatmapConfiguratorController.java        |   2 +-
 .../analyse/gui/analyse/TrialSelector.java    |   2 +-
 .../gui/analyse/TrialSelectorController.java  |   2 +-
 .../analyse/gui/general/FunctionChooser.java  |   3 +-
 .../general/FunctionChooserController.java    |   2 +-
 .../analyse/gui/general/Login.java            |   3 +-
 .../analyse/gui/general/LoginController.java  |   2 +-
 .../analyse/gui/general/MainMenuBar.java      |   2 +-
 .../gui/general/MainMenuBarController.java    |   4 +-
 .../analyse/gui/util/AbsScene.java            | 107 ------------------
 .../analyse/gui/util/AbsSceneController.java  |  21 ----
 .../weichware10/analyse/gui/util/Log.java     |  95 ----------------
 .../analyse/gui/util/LogController.java       |  75 ------------
 .../analyse/gui/admin/Configurator.fxml       |  12 +-
 .../weichware10/analyse/gui/util/Log.fxml     |   2 +-
 26 files changed, 34 insertions(+), 327 deletions(-)
 delete mode 100644 src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
 delete mode 100644 src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java
 delete mode 100644 src/main/java/github/weichware10/analyse/gui/util/Log.java
 delete mode 100644 src/main/java/github/weichware10/analyse/gui/util/LogController.java

diff --git a/pom.xml b/pom.xml
index be04d78..be509dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>9534096</version>
+      <version>5215fa3</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <dependency>
diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 2e2140a..78d93eb 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,9 +1,9 @@
 package github.weichware10.analyse;
 
 import github.weichware10.analyse.gui.general.Login;
-import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
+import github.weichware10.util.gui.Log;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.geometry.Rectangle2D;
@@ -38,7 +38,7 @@ public static void main(String[] args) {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        Log.start();
+        Log.start("app-icon.png");
         Main.primaryStage = primaryStage;
         Login.start();
         primaryStage.getIcons().add(new Image("app-icon.png"));
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java b/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
index 5d4f4ca..e184627 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/Configurator.java
@@ -2,7 +2,7 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.gui.general.MainMenuBar;
-import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.gui.AbsScene;
 import javafx.scene.Parent;
 
 /**
@@ -22,6 +22,7 @@ public static void start() {
                 "Analyse - Konfigurator",
                 MainMenuBar.getMenuBar(),
                 null,
+                null,
                 null).root;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
index 783d77d..09b78f1 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/ConfiguratorController.java
@@ -1,9 +1,9 @@
 package github.weichware10.analyse.gui.admin;
 
 import github.weichware10.analyse.gui.general.FunctionChooser;
-import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
 import github.weichware10.util.ToolType;
+import github.weichware10.util.gui.AbsSceneController;
 import java.net.URL;
 import java.util.ResourceBundle;
 import javafx.beans.Observable;
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
index b058e80..0646436 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreator.java
@@ -1,7 +1,7 @@
 package github.weichware10.analyse.gui.admin;
 
 import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.gui.AbsScene;
 import javafx.scene.Parent;
 
 /**
@@ -21,6 +21,7 @@ public static void start() {
                 "Analyse - Trialerstellung",
                 null,
                 null,
+                null,
                 null).root;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
index 59ef5aa..eb16d36 100644
--- a/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/admin/TrialCreatorController.java
@@ -1,8 +1,8 @@
 package github.weichware10.analyse.gui.admin;
 
 import github.weichware10.analyse.gui.general.FunctionChooser;
-import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
+import github.weichware10.util.gui.AbsSceneController;
 import javafx.fxml.FXML;
 
 /**
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index a4f4db7..0d11ebc 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -5,9 +5,9 @@
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.general.MainMenuBar;
-import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
+import github.weichware10.util.gui.AbsScene;
 import javafx.scene.Parent;
 
 /**
@@ -34,6 +34,7 @@ public static void start() {
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 null,
+                null,
                 null);
         root = ir.root;
         controller = (AnalyzerController) ir.controller;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index cab4e4e..6592274 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -2,7 +2,7 @@
 
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.general.FunctionChooser;
-import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.gui.AbsSceneController;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
index 6604cb3..e3ef6dd 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
@@ -3,7 +3,7 @@
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.config.DiagramConfig;
 import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.gui.AbsScene;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
index 66c72c1..cf44e5f 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
@@ -1,6 +1,6 @@
 package github.weichware10.analyse.gui.analyse;
 
-import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.gui.AbsSceneController;
 import java.text.DecimalFormat;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
index 7960449..93970ab 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfigurator.java
@@ -2,7 +2,7 @@
 
 import github.weichware10.analyse.Main;
 import github.weichware10.analyse.config.HeatmapConfig;
-import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.gui.AbsScene;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBar.ButtonData;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java
index 511a010..63218d1 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/HeatmapConfiguratorController.java
@@ -1,6 +1,6 @@
 package github.weichware10.analyse.gui.analyse;
 
-import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.gui.AbsSceneController;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ColorPicker;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
index 4211b67..314a797 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelector.java
@@ -1,9 +1,9 @@
 package github.weichware10.analyse.gui.analyse;
 
 import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
+import github.weichware10.util.gui.AbsScene;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java
index ce82f6c..d923c7c 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/TrialSelectorController.java
@@ -1,8 +1,8 @@
 package github.weichware10.analyse.gui.analyse;
 
-import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.ToolType;
 import github.weichware10.util.data.TrialData;
+import github.weichware10.util.gui.AbsSceneController;
 import java.time.LocalDate;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
index 9ca3388..7d4c7d0 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooser.java
@@ -1,7 +1,7 @@
 package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsScene;
+import github.weichware10.util.gui.AbsScene;
 import javafx.scene.Parent;
 
 /**
@@ -21,6 +21,7 @@ public static void start() {
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 null,
+                null,
                 null).root;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
index b96dbdf..35e862d 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/FunctionChooserController.java
@@ -4,8 +4,8 @@
 import github.weichware10.analyse.gui.admin.Configurator;
 import github.weichware10.analyse.gui.admin.TrialCreator;
 import github.weichware10.analyse.gui.analyse.Analyzer;
-import github.weichware10.analyse.gui.util.AbsSceneController;
 import github.weichware10.util.Logger;
+import github.weichware10.util.gui.AbsSceneController;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 
diff --git a/src/main/java/github/weichware10/analyse/gui/general/Login.java b/src/main/java/github/weichware10/analyse/gui/general/Login.java
index 5881ae2..0b918a0 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/Login.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/Login.java
@@ -1,9 +1,9 @@
 package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
+import github.weichware10.util.gui.AbsScene;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -34,6 +34,7 @@ public static void start() {
                 "Analyse",
                 MainMenuBar.getMenuBar(),
                 null,
+                null,
                 null).root;
     }
 
diff --git a/src/main/java/github/weichware10/analyse/gui/general/LoginController.java b/src/main/java/github/weichware10/analyse/gui/general/LoginController.java
index 21c1660..3f0f1b3 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/LoginController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/LoginController.java
@@ -1,7 +1,7 @@
 package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsSceneController;
+import github.weichware10.util.gui.AbsSceneController;
 import javafx.fxml.FXML;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.ProgressIndicator;
diff --git a/src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java
index 5453330..e115284 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBar.java
@@ -1,8 +1,8 @@
 package github.weichware10.analyse.gui.general;
 
 import github.weichware10.analyse.Main;
-import github.weichware10.analyse.gui.util.AbsScene;
 import github.weichware10.util.Logger;
+import github.weichware10.util.gui.AbsScene;
 import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
diff --git a/src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java
index ff46d07..be11981 100644
--- a/src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java
+++ b/src/main/java/github/weichware10/analyse/gui/general/MainMenuBarController.java
@@ -1,8 +1,8 @@
 package github.weichware10.analyse.gui.general;
 
-import github.weichware10.analyse.gui.util.AbsSceneController;
-import github.weichware10.analyse.gui.util.Log;
 import github.weichware10.util.Logger;
+import github.weichware10.util.gui.AbsSceneController;
+import github.weichware10.util.gui.Log;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.MenuItem;
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java b/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
deleted file mode 100644
index 3a53d39..0000000
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsScene.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package github.weichware10.analyse.gui.util;
-
-import github.weichware10.util.Logger;
-import java.net.URL;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.MenuBar;
-import javafx.scene.layout.BorderPane;
-import javafx.stage.Stage;
-
-/**
- * Abstrakte Klasse, von der alle Szenen erben. Diese Klasse lädt vorallem FXML-Dateien.
- */
-public abstract class AbsScene {
-
-    /**
-     * lädt die Szene intern und gibt die root-Instanz zurück.
-     *
-     * @param fxml - URL der FXML-Datei
-     * @return das geladene Parent Objekt und die Controller-Instanz.
-     */
-    protected static InitResult initialize(URL fxml) {
-
-        FXMLLoader loader = new FXMLLoader(fxml);
-
-        Parent root = null;
-        try {
-            root = loader.load();
-        } catch (Exception e) {
-            Logger.error("Error when loading " + fxml, e, true);
-            System.exit(-1);
-        }
-
-        AbsSceneController controller = loader.getController();
-
-        return new InitResult(root, controller);
-    }
-
-    /**
-     * Setzt die MenuBar, falls das in initialize geladene root-Objekt BorderPane ist.
-     *
-     * @param menuBar - die zu setzende Menüleiste
-     */
-    public static void setMenuBar(MenuBar menuBar, Parent root) {
-        if (root != null && root instanceof BorderPane) {
-            BorderPane borderPane = (BorderPane) root;
-            borderPane.setTop(menuBar);
-        }
-    }
-
-    /**
-     * Zeigt die Szene an.
-     *
-     * @param primaryStage - das Hauptfenster
-     * @return das Initialisierungsergebniss
-     */
-    public static InitResult start(Stage primaryStage, URL fxml, Parent root,
-            AbsSceneController controller, String title, MenuBar menuBar,
-            Integer width, Integer height) {
-        if (primaryStage == null || title == null || fxml == null) {
-            throw new NullPointerException(
-                    String.format("Stage primaryStage (%s), ",
-                            (primaryStage != null) ? primaryStage.toString() : "null")
-                            + String.format("String title (%s), ",
-                                    (title != null) ? title : "null")
-                            + String.format("and URL fxml (%s) are required",
-                                    (fxml != null) ? fxml.toString() : "null"));
-        }
-        if (root == null) {
-            InitResult ir = initialize(fxml);
-            root = ir.root;
-            controller = ir.controller;
-        }
-        // Menüleiste setzen
-        if (menuBar != null) {
-            setMenuBar(menuBar, root);
-        }
-        // Größe einstellen
-        if (width != null && height != null) {
-            primaryStage.setWidth(width);
-            primaryStage.setHeight(height);
-        }
-        // auf primaryStage setzen
-        Scene existingScene = root.getScene();
-        if (existingScene != null) {
-            primaryStage.setScene(existingScene);
-        } else {
-            primaryStage.setScene(new Scene(root));
-        }
-        primaryStage.setTitle(title);
-        return new InitResult(root, controller);
-    }
-
-    /**
-     * root und controller des Lade-Vorgangs.
-     */
-    public static class InitResult {
-        public final Parent root;
-        public final AbsSceneController controller;
-
-        protected InitResult(Parent root, AbsSceneController controller) {
-            this.root = root;
-            this.controller = controller;
-        }
-    }
-}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java b/src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java
deleted file mode 100644
index 5fbb666..0000000
--- a/src/main/java/github/weichware10/analyse/gui/util/AbsSceneController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package github.weichware10.analyse.gui.util;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.fxml.FXML;
-
-
-/**
- * abstrakte Klasse für Controller-Klassen.
- */
-public abstract class AbsSceneController {
-
-    @FXML
-    protected ResourceBundle resources;
-    @FXML
-    protected URL location;
-
-    @FXML
-    protected abstract void initialize();
-
-}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/Log.java b/src/main/java/github/weichware10/analyse/gui/util/Log.java
deleted file mode 100644
index 0420d4d..0000000
--- a/src/main/java/github/weichware10/analyse/gui/util/Log.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package github.weichware10.analyse.gui.util;
-
-import github.weichware10.util.Logger;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.value.ObservableBooleanValue;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
-
-/**
- * Dialog zum Darstellen der Log Infos.
- */
-public class Log {
-
-    private static Stage logStage;
-    // private static boolean visible = false;
-
-    private static SimpleBooleanProperty visibleProperty = new SimpleBooleanProperty(false);
-    public static ObservableBooleanValue visible = visibleProperty;
-
-    /**
-     * Startet das Log.
-     */
-    public static void start() {
-        FXMLLoader loader = new FXMLLoader(Log.class.getResource("Log.fxml"));
-
-        Parent root = null;
-        try {
-            root = loader.load();
-        } catch (Exception e) {
-            Logger.error("Error when loading main scene", e, true);
-            System.exit(-1);
-        }
-
-        Scene logScene = new Scene(root, 750, 500);
-        logStage = new Stage();
-        logStage.setScene(logScene);
-        logStage.setTitle("Toolbox - Log");
-        logStage.setMinHeight(500);
-        logStage.setMinWidth(550);
-        logStage.getIcons().add(new Image("app-icon.png"));
-        logStage.addEventFilter(WindowEvent.WINDOW_CLOSE_REQUEST, event -> {
-            hide();
-        });
-    }
-
-    public static boolean isVisible() {
-        return visible.get();
-    }
-
-    public static void show() {
-        logStage.show();
-        visibleProperty.set(true);
-    }
-
-    public static void hide() {
-        logStage.hide();
-        visibleProperty.set(false);
-    }
-
-    public static void close() {
-        logStage.close();
-    }
-
-    /**
-     * Loggt den Inhalt (falls vorhanden) mit dem gegebenen Typ.
-     *
-     * @param content - zu loggender Inhalt
-     * @param type - "DEBUG", "INFO", "WARN" oder "ERROR"
-     */
-    public static void log(String content, String type) {
-        if (content.length() == 0) {
-            return;
-        }
-        switch (type) {
-            case "DEBUG":
-                Logger.debug(content);
-                break;
-            case "INFO":
-                Logger.info(content);
-                break;
-            case "WARN":
-                Logger.warn(content);
-                break;
-            case "ERROR":
-                Logger.error(content);
-                break;
-            default:
-                break;
-        }
-    }
-}
diff --git a/src/main/java/github/weichware10/analyse/gui/util/LogController.java b/src/main/java/github/weichware10/analyse/gui/util/LogController.java
deleted file mode 100644
index 136c853..0000000
--- a/src/main/java/github/weichware10/analyse/gui/util/LogController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package github.weichware10.analyse.gui.util;
-
-import github.weichware10.util.Logger;
-import java.net.URL;
-import java.util.ResourceBundle;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.Pane;
-
-/**
- * Controller für {@link Log}.
- */
-public class LogController {
-
-    @FXML
-    private ResourceBundle resources;
-    @FXML
-    private URL location;
-
-
-    @FXML
-    private TextField logInput;
-    @FXML
-    private TextArea logArea;
-    @FXML
-    private Pane logPane;
-    @FXML
-    private MenuButton logMenuButton;
-
-    @FXML
-    void initialize() {
-        assert logArea != null
-                : "fx:id=\"logArea\" not injected: check 'Log.fxml'.";
-        assert logPane != null
-                : "fx:id=\"logPane\" not injected: check 'Log.fxml'.";
-        assert logInput != null
-                : "fx:id=\"logInput\" not injected: check 'Log.fxml'.";
-        assert logMenuButton != null
-                : "fx:id=\"logMenuButton\" not injected: check 'Log.fxml'.";
-        logArea.minHeightProperty().bind(logPane.heightProperty());
-        logArea.minWidthProperty().bind(logPane.widthProperty());
-        Logger.setLogArea(logArea);
-    }
-
-    @FXML
-    void setLogType(ActionEvent event) {
-        Logger.info("log:content Setting log type");
-        // mit try/catch, da Abfrage nach Klasse von event.getSource() nicht gut funktioniert
-        try {
-            MenuItem type = (MenuItem) event.getSource();
-            logMenuButton.setText(type.getText());
-        } catch (Exception e) {
-            Logger.error("an error occured while changing the log type");
-        }
-    }
-
-    @FXML
-    void inputKeyPress(KeyEvent event) {
-        if (event.getCode() == KeyCode.ENTER) {
-            log();
-        }
-    }
-
-    @FXML
-    void log() {
-        Log.log(logInput.getText(), logMenuButton.getText());
-        logInput.clear();
-    }
-}
diff --git a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
index 37940e6..6b16bbf 100644
--- a/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/admin/Configurator.fxml
@@ -25,7 +25,7 @@
             <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
          </BorderPane.margin>
          <children>
-            <HBox alignment="CENTER" prefWidth="600.0">
+            <HBox alignment="CENTER" prefWidth="700.0">
                <children>
                   <ButtonBar prefHeight="40.0" prefWidth="600.0">
                      <buttons>
@@ -46,7 +46,7 @@
             </HBox>
             <HBox alignment="CENTER">
                <children>
-                  <GridPane alignment="CENTER" hgap="10.0" prefWidth="600.0" vgap="10.0" HBox.hgrow="NEVER">
+                  <GridPane alignment="CENTER" hgap="10.0" prefWidth="700.0" vgap="10.0" HBox.hgrow="NEVER">
                     <columnConstraints>
                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -104,7 +104,7 @@
                <children>
                   <StackPane>
                      <children>
-                        <GridPane fx:id="codeChartsConfigPane" alignment="CENTER" disable="true" hgap="10.0" prefWidth="600.0" vgap="10.0">
+                        <GridPane fx:id="codeChartsConfigPane" alignment="CENTER" disable="true" hgap="10.0" prefWidth="700.0" vgap="10.0">
                           <columnConstraints>
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="15.0" prefWidth="100.0" />
@@ -202,7 +202,7 @@
                               </Label>
                            </children>
                         </GridPane>
-                        <GridPane fx:id="zoomMapsConfigPane" alignment="CENTER" disable="true" hgap="10.0" layoutX="10.0" layoutY="10.0" prefWidth="600.0" vgap="10.0" visible="false">
+                        <GridPane fx:id="zoomMapsConfigPane" alignment="CENTER" disable="true" hgap="10.0" layoutX="10.0" layoutY="10.0" prefWidth="700.0" vgap="10.0" visible="false">
                            <columnConstraints>
                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -254,12 +254,12 @@
             </HBox>
             <HBox alignment="CENTER">
                <children>
-                  <TextArea editable="false" focusTraversable="false" maxHeight="40.0" minHeight="40.0" mouseTransparent="true" prefHeight="40.0" prefWidth="600.0" promptText="keine Probleme erkannt." wrapText="true" />
+                  <TextArea editable="false" focusTraversable="false" maxHeight="40.0" minHeight="40.0" mouseTransparent="true" prefHeight="40.0" prefWidth="700.0" promptText="keine Probleme erkannt." wrapText="true" />
                </children>
             </HBox>
             <HBox alignment="CENTER">
                <children>
-                  <ButtonBar prefHeight="40.0" prefWidth="600.0">
+                  <ButtonBar prefHeight="40.0" prefWidth="700.0">
                     <buttons>
                         <Button layoutX="54.0" layoutY="10.0" mnemonicParsing="false" onAction="#reset" text="reset" ButtonBar.buttonData="LEFT" />
                         <Button fx:id="dataBaseSaveButton" layoutX="370.0" layoutY="42.0" mnemonicParsing="false" text="in Datenbank speichern" />
diff --git a/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml b/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml
index 409ce17..8fceb59 100644
--- a/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/util/Log.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane fx:id="borderPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.util.LogController">
+<BorderPane fx:id="borderPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.util.gui.LogController">
    <center>
       <Pane fx:id="logPane">
          <children>

From 2a47710b27b6579f064fe205843151684dc8d39c Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sat, 15 Jan 2022 20:03:46 +0100
Subject: [PATCH 65/87] [fix] smoll fix

---
 .../weichware10/analyse/config/HeatmapConfig.java      | 10 ++++++----
 .../weichware10/analyse/gui/analyse/Analyzer.java      |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
index abd3e39..092ac4c 100644
--- a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
+++ b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
@@ -82,14 +82,16 @@ public boolean isImage() {
     public String toString() {
         return String.format("""
                 HeatmapConfig: {
-                    minColorDiff: (%f,%f,%f)
-                    maxColorDiff: (%f,%f,%f)
+                    minColorDiff: (%f,%f,%f,%f)
+                    maxColorDiff: (%f,%f,%f,%f)
                     isGrid: %b
                     isImage: %b
                 }
                 """,
-                minColorDiff.getRed(), minColorDiff.getGreen(), minColorDiff.getBlue(),
-                maxColorDiff.getRed(), maxColorDiff.getGreen(), maxColorDiff.getBlue(),
+                minColorDiff.getRed(), minColorDiff.getGreen(),
+                minColorDiff.getBlue(), minColorDiff.getOpacity(),
+                maxColorDiff.getRed(), maxColorDiff.getGreen(),
+                maxColorDiff.getBlue(), minColorDiff.getOpacity(),
                 isGrid(),
                 isImage());
     }
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index 0d11ebc..efc3ba4 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -93,7 +93,7 @@ public static void setTrialId() {
     }
 
     /**
-     *  Setzt das ausgewählte Vergleichs Trial.
+     * Setzt das ausgewählte Vergleichs Trial.
      */
     public static void setTrialIdComp() {
         trialComp = TrialSelector.getTrialData(trial.configId);

From 4ac11f4df9e3613c830836d0b9417fe2ca63a271 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 00:51:24 +0100
Subject: [PATCH 66/87] [refactor] deletion

---
 .../weichware10/analyse/logic/Client.java     | 162 ---------------
 .../weichware10/analyse/logic/ClientTest.java | 187 ------------------
 .../analyse/logic/HeatmapTest.java            |  76 -------
 3 files changed, 425 deletions(-)
 delete mode 100644 src/main/java/github/weichware10/analyse/logic/Client.java
 delete mode 100644 src/test/java/github/weichware10/analyse/logic/ClientTest.java
 delete mode 100644 src/test/java/github/weichware10/analyse/logic/HeatmapTest.java

diff --git a/src/main/java/github/weichware10/analyse/logic/Client.java b/src/main/java/github/weichware10/analyse/logic/Client.java
deleted file mode 100644
index 61e4f30..0000000
--- a/src/main/java/github/weichware10/analyse/logic/Client.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package github.weichware10.analyse.logic;
-
-import github.weichware10.analyse.config.DiagramConfig;
-import github.weichware10.analyse.config.HeatmapConfig;
-import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.util.ToolType;
-import github.weichware10.util.data.TrialData;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.joda.time.DateTime;
-
-/**
- * Grundlegende Klasse für den Analyse-Client.
- */
-@SuppressWarnings("unused")
-public class Client {
-    private TrialData data;
-    private TrialData dataForComp;
-    private List<AnalyseType> analyseTypes;
-    private List<String> analyzedData;
-    private HeatmapConfig confHm;
-    private DiagramConfig confDia;
-
-    public Client() {
-        analyseTypes = new ArrayList<AnalyseType>();
-        analyzedData = new ArrayList<String>();
-    }
-
-    /**
-     * setzt die ausgewählten Analyse-Typen.
-     *
-     * @param selectedAnalyseTypes - die ausgewählten Analyse-Typen
-     * @return
-     *         true, falls Analyse-Typen gesetzt wurden;
-     *         false, falls keine Analyse-Typen gesetzt wurden
-     */
-    public boolean setAnalyseTypes(List<AnalyseType> selectedAnalyseTypes) {
-        if (selectedAnalyseTypes.isEmpty()) {
-            return false;
-        }
-        this.analyseTypes = selectedAnalyseTypes;
-        return true;
-    }
-
-    /**
-     * gibt die Anaylse-Typen zurück.
-     *
-     * @return Analyse-Typen
-     */
-    public List<AnalyseType> getAnalyseTypes() {
-        return this.analyseTypes;
-    }
-
-    /**
-     * holt die angeforderten Daten vom Speichermedium, falls diese existieren.
-     *
-     * @param start    - Startzeitpunkt der benötigten Daten
-     * @param end      - Endzeitpunkt der benötigten Daten
-     * @param dataType - Tool-Typ der benötigten Daten
-     * @return
-     *         true, falls benötigte Daten gefunden und gesetzt wurden;
-     *         false, falls benötigte Daten nicht gefunden wurden
-     */
-    public boolean getData(DateTime start, DateTime end, ToolType dataType) {
-        if (start.isAfter(end) || start.isAfter(DateTime.now()) || end.isAfter(DateTime.now())) {
-            return false;
-        }
-
-        // * Provisorische Lösung für Test, da er sonst nicht funktionieren würde
-        int amountData = 3;
-        List<DateTime> dataStart = new ArrayList<DateTime>(Arrays.asList(
-                new DateTime(2021, 11, 28, 16, 0, 0), new DateTime(2021, 11, 28, 15, 0, 0),
-                new DateTime(2021, 11, 28, 19, 0, 0)));
-        List<DateTime> dataEnd = new ArrayList<DateTime>(Arrays.asList(
-                new DateTime(2021, 11, 28, 19, 0, 0), new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 20, 0, 0)));
-        List<ToolType> dataToolType = new ArrayList<ToolType>(Arrays.asList(
-                ToolType.ZOOMMAPS, ToolType.EYETRACKING, ToolType.CODECHARTS));
-
-        for (int id = 0; id < amountData; id++) {
-            if (dataStart.get(id).equals(start) && dataEnd.get(id).equals(end)
-                    && dataToolType.get(id).equals(dataType)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * holt die angeforderten Daten zum Vergleich vom Speichermedium, falls diese
-     * existieren.
-     *
-     * @param start - Startzeitpunkt der benötigten Daten zum Vergleich
-     * @param end   - Endzeitpunkt der benötigten Daten zum Vergleich
-     * @return
-     *         true, falls benötigte Daten zum Vergleich gefunden und gesetzt
-     *         wurden;
-     *         false, falls benötigte Daten zum Vergleich nicht gefunden wurden
-     */
-    public boolean getDataForComp(DateTime start, DateTime end, ToolType dataType) {
-        if (start.isAfter(end) || start.isAfter(DateTime.now()) || end.isAfter(DateTime.now())) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * verändert die Standard-Konfiguration für die Heatmap-Analyse.
-     *
-     * @param confHm - Konfiguration der Heatmap-Analyse
-     */
-    public void setConfigAnalyseHm(HeatmapConfig confHm) {
-        this.confHm = confHm;
-    }
-
-    /**
-     * verändert die Standard-Konfiguration für die Diagramm-Analyse.
-     *
-     * @param confDia - Konfiguration der Diagramm-Analyse
-     */
-    public void setConfigAnalyseDia(DiagramConfig confDia) {
-        this.confDia = confDia;
-    }
-
-    /**
-     * führt die ausgewählten Analysen durch.
-     */
-    public void analyseData() {
-        ;
-    }
-
-    /**
-     * zeigt die analysierten Daten an.
-     */
-    public void displayAnalyzedData() {
-        ;
-    }
-
-    /**
-     * exportiert die analysierten Daten.
-     *
-     * @return
-     *         true, wenn Export erfolreich war;
-     *         false, wenn Fehler aufgetreten ist
-     */
-    public boolean export() {
-        return true;
-    }
-
-    /**
-     * exportiert die rohen Daten der Analyse.
-     *
-     * @return
-     *         true, wenn Export erfolreich war;
-     *         false, wenn Fehler aufgetreten ist
-     */
-    public boolean exportRaw() {
-        return true;
-    }
-
-}
diff --git a/src/test/java/github/weichware10/analyse/logic/ClientTest.java b/src/test/java/github/weichware10/analyse/logic/ClientTest.java
deleted file mode 100644
index f803353..0000000
--- a/src/test/java/github/weichware10/analyse/logic/ClientTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package github.weichware10.analyse.logic;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import github.weichware10.analyse.enums.AnalyseType;
-import github.weichware10.util.ToolType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.joda.time.DateTime;
-import org.junit.Test;
-
-/**
- * Unit Test für Klasse Client.
- */
-public class ClientTest {
-
-    /**
-     * Testet, ob Analyse-Typen gesetzt werden.
-     */
-    @Test
-    public void analyseTypesShouldBeSet() {
-        // * Nichtleere Liste wird übergeben
-        Client client1 = new Client();
-        List<AnalyseType> list1 = new ArrayList<AnalyseType>(
-                Arrays.asList(AnalyseType.HEATPMAP));
-        assertTrue("setAnalyseTypes sollte True zurückgeben", client1.setAnalyseTypes(list1));
-        assertTrue("Vergleich sollte True zurückgeben", client1.getAnalyseTypes().equals(list1));
-        assertFalse("Test auf leere Liste sollte False sein", client1.getAnalyseTypes().isEmpty());
-
-        Client client2 = new Client();
-        List<AnalyseType> list2 = new ArrayList<AnalyseType>(
-                Arrays.asList(AnalyseType.VERLAUF));
-        assertTrue("setAnalyseTypes sollte True zurückgeben", client2.setAnalyseTypes(list2));
-        assertTrue("Vergleich sollte True zurückgeben", client2.getAnalyseTypes().equals(list2));
-        assertFalse("Test auf leere Liste sollte False sein", client2.getAnalyseTypes().isEmpty());
-
-        Client client3 = new Client();
-        List<AnalyseType> list3 = new ArrayList<AnalyseType>(
-                Arrays.asList(AnalyseType.RELFRQIMGAREA));
-        assertTrue("setAnalyseTypes sollte True zurückgeben", client3.setAnalyseTypes(list3));
-        assertTrue("Vergleich sollte True zurückgeben", client3.getAnalyseTypes().equals(list3));
-        assertFalse("Test auf leere Liste sollte False sein", client3.getAnalyseTypes().isEmpty());
-
-        assertFalse("Vergleich sollte False zurückgeben", client1.getAnalyseTypes().equals(list2));
-        assertFalse("Vergleich sollte False zurückgeben", client1.getAnalyseTypes().equals(list3));
-        assertFalse("Vergleich sollte False zurückgeben", client2.getAnalyseTypes().equals(list3));
-
-        // * Leere Liste wird übergeben
-        Client client4 = new Client();
-        assertFalse("setAnalyseTypes sollte False zurückgeben, da leere Liste",
-                client4.setAnalyseTypes(new ArrayList<AnalyseType>()));
-    }
-
-    /**
-     * Testet, ob Daten gesetzt werden.
-     */
-    @Test
-    public void dataShouldBeSet() {
-        // * Korrekte Zeiteingabe und Daten zu Tool-Typ vorhanden
-        Client client1 = new Client();
-        assertTrue("getData sollte True zurückgeben", client1.getData(
-                new DateTime(2021, 11, 28, 16, 0, 0),
-                new DateTime(2021, 11, 28, 19, 0, 0), ToolType.ZOOMMAPS));
-
-        Client client2 = new Client();
-        assertTrue("getData sollte True zurückgeben", client2.getData(
-                new DateTime(2021, 11, 28, 15, 0, 0),
-                new DateTime(2021, 11, 28, 18, 0, 0), ToolType.EYETRACKING));
-
-        Client client3 = new Client();
-        assertTrue("getData sollte True zurückgeben", client3.getData(
-                new DateTime(2021, 11, 28, 19, 0, 0),
-                new DateTime(2021, 11, 28, 20, 0, 0), ToolType.CODECHARTS));
-
-        // * Korrekte Zeiteingabe, aber Daten zu Tool-Typ nicht vorhanden
-        Client client4 = new Client();
-        assertFalse(client4.getData(new DateTime(2021, 11, 28, 15, 0, 0),
-                new DateTime(2021, 11, 28, 16, 0, 0), ToolType.ZOOMMAPS));
-
-        Client client5 = new Client();
-        assertFalse(client5.getData(new DateTime(2021, 11, 28, 15, 0, 0),
-                new DateTime(2021, 11, 28, 16, 0, 0), ToolType.EYETRACKING));
-
-        Client client6 = new Client();
-        assertFalse(client6.getData(new DateTime(2021, 11, 28, 15, 0, 0),
-                new DateTime(2021, 11, 28, 16, 0, 0), ToolType.CODECHARTS));
-
-        // * Falsche Zeiteingabe
-        Client client7 = new Client();
-        assertFalse("getData sollte False zurückgeben", client7.getData(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 17, 0, 0), ToolType.ZOOMMAPS));
-
-        Client client8 = new Client();
-        assertFalse("getData sollte False zurückgeben", client8.getData(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 17, 0, 0), ToolType.EYETRACKING));
-
-        Client client9 = new Client();
-        assertFalse("getData sollte False zurückgeben", client9.getData(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 17, 0, 0), ToolType.CODECHARTS));
-
-        // * Zeitpunkt in der Zunkunft
-        Client client10 = new Client();
-        assertFalse("getData sollte False zurückgeben", client10.getData(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                DateTime.now().plusMinutes(5), ToolType.ZOOMMAPS));
-
-        Client client11 = new Client();
-        assertFalse("getData sollte False zurückgeben", client11.getData(
-                DateTime.now().plusMinutes(5),
-                DateTime.now().plusMinutes(10), ToolType.EYETRACKING));
-    }
-
-    /**
-     * Testet, ob Daten gesetzt werden.
-     */
-    @Test
-    public void dataForCompShouldBeSet() {
-        // * Korrekte Zeiteingabe und Daten zu Tool-Typ vorhanden
-        Client client1 = new Client();
-        assertTrue("getDataForComp sollte True zurückgeben", client1.getDataForComp(
-                new DateTime(2021, 11, 28, 16, 0, 0),
-                new DateTime(2021, 11, 28, 19, 0, 0), ToolType.ZOOMMAPS));
-
-        Client client2 = new Client();
-        assertTrue("getDataForComp sollte True zurückgeben", client2.getDataForComp(
-                new DateTime(2021, 11, 28, 15, 0, 0),
-                new DateTime(2021, 11, 28, 18, 0, 0), ToolType.EYETRACKING));
-
-        Client client3 = new Client();
-        assertTrue("getDataForComp sollte True zurückgeben", client3.getDataForComp(
-                new DateTime(2021, 11, 28, 19, 0, 0),
-                new DateTime(2021, 11, 28, 20, 0, 0), ToolType.CODECHARTS));
-
-        // * Falsche Zeiteingabe
-        Client client7 = new Client();
-        assertFalse("getDataForComp sollte False zurückgeben", client7.getDataForComp(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 17, 0, 0), ToolType.ZOOMMAPS));
-
-        Client client8 = new Client();
-        assertFalse("getDataForComp sollte False zurückgeben", client8.getDataForComp(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 17, 0, 0), ToolType.EYETRACKING));
-
-        Client client9 = new Client();
-        assertFalse("getDataForComp sollte False zurückgeben", client9.getDataForComp(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                new DateTime(2021, 11, 28, 17, 0, 0), ToolType.CODECHARTS));
-
-        // * Zeitpunkt in der Zunkunft
-        Client client10 = new Client();
-        assertFalse("getDataForComp sollte False zurückgeben", client10.getDataForComp(
-                new DateTime(2021, 11, 28, 18, 0, 0),
-                DateTime.now().plusMinutes(5), ToolType.ZOOMMAPS));
-
-        Client client11 = new Client();
-        assertFalse("getDataForComp sollte False zurückgeben", client11.getDataForComp(
-                DateTime.now().plusMinutes(5),
-                DateTime.now().plusMinutes(10), ToolType.EYETRACKING));
-    }
-
-    // ? Woher kommen Daten für den Export?
-    /**
-     * Testet, ob Export der analysierten Daten funktioniert.
-     */
-    @Test
-    public void exportShouldWork() {
-        Client client1 = new Client();
-        assertTrue("export sollte True zurückgeben", client1.export());
-    }
-
-    // ? Woher kommen Daten für den Export?
-    /**
-     * Testet, ob Export der rohen Daten der Analyse funktioniert.
-     */
-    @Test
-    public void exportRawShouldWork() {
-        Client client1 = new Client();
-        assertTrue("exportRaw sollte True zurückgeben", client1.exportRaw());
-    }
-
-}
diff --git a/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java b/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
deleted file mode 100644
index 86bea8e..0000000
--- a/src/test/java/github/weichware10/analyse/logic/HeatmapTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package github.weichware10.analyse.logic;
-
-import static org.junit.Assert.assertEquals;
-
-import github.weichware10.analyse.config.HeatmapConfig;
-import github.weichware10.util.ToolType;
-import github.weichware10.util.data.TrialData;
-import org.junit.Test;
-
-/**
- * Unit Test für Klasse Heatmap.
- */
-public class HeatmapTest {
-    /**
-     * Teset, ob String erstellt und ausgegeben wird.
-     */
-    @Test
-    public void createHeatmapShouldWork() {
-        Heatmap hm1 = new Heatmap(
-                new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new HeatmapConfig());
-        assertEquals("createHeatMap sollte .../heatmap/HEATMAP_ZOOMMAPS_1.jpg ausgeben",
-                ".../heatmap/HEATMAP_ZOOMMAPS_1.jpg", hm1.createHeatmap());
-
-        Heatmap hm2 = new Heatmap(
-                new TrialData(ToolType.EYETRACKING, "7", "3"),
-                new HeatmapConfig());
-        assertEquals("createHeatMap sollte .../heatmap/HEATMAP_EYETRACKING_7.jpg ausgeben",
-                ".../heatmap/HEATMAP_EYETRACKING_7.jpg", hm2.createHeatmap());
-
-        Heatmap hm3 = new Heatmap(
-                new TrialData(ToolType.CODECHARTS, "3", "3"),
-                new HeatmapConfig());
-        assertEquals("createHeatMap sollte .../heatmap/HEATMAP_CODECHARTS_3.jpg ausgeben",
-                ".../heatmap/HEATMAP_CODECHARTS_3.jpg", hm3.createHeatmap());
-    }
-
-    /**
-     * Testet, ob String erstellt und ausgegeben wird.
-     */
-    @Test
-    public void compHeatmapsShouldWork() {
-        Heatmap hm1 = new Heatmap(
-                new TrialData(ToolType.CODECHARTS, "4", "3"),
-                new HeatmapConfig());
-        Heatmap hm2 = new Heatmap(
-                new TrialData(ToolType.EYETRACKING, "2", "3"),
-                new HeatmapConfig());
-        assertEquals(
-                "compHeatmaps sollte .../heatmap/COMPHEATMAP_CODECHARTS_1_EYETRACKING_2.jpg ausgeb",
-                ".../heatmap/COMPHEATMAP_CODECHARTS_4_EYETRACKING_2.jpg",
-                Heatmap.compHeatmaps(hm1, hm2));
-
-        Heatmap hm3 = new Heatmap(
-                new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new HeatmapConfig());
-        Heatmap hm4 = new Heatmap(
-                new TrialData(ToolType.CODECHARTS, "6", "3"),
-                new HeatmapConfig());
-        assertEquals(
-                "compHeatmaps sollte .../heatmap/COMPHEATMAP_ZOOMMAPS_1_CODECHARTS_6.jpg ausgeben",
-                ".../heatmap/COMPHEATMAP_ZOOMMAPS_1_CODECHARTS_6.jpg",
-                Heatmap.compHeatmaps(hm3, hm4));
-
-        Heatmap hm5 = new Heatmap(
-                new TrialData(ToolType.EYETRACKING, "8", "3"),
-                new HeatmapConfig());
-        Heatmap hm6 = new Heatmap(
-                new TrialData(ToolType.ZOOMMAPS, "12", "3"),
-                new HeatmapConfig());
-        assertEquals(
-                "sollte .../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOMMAPS_12.jpg ausgeben",
-                ".../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOMMAPS_12.jpg",
-                Heatmap.compHeatmaps(hm5, hm6));
-    }
-}

From 279561e6bdecce70d0bb900279d1c5adf0489b7c Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 00:51:44 +0100
Subject: [PATCH 67/87] [feat] delete temp folder

---
 src/main/java/github/weichware10/analyse/Main.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/github/weichware10/analyse/Main.java b/src/main/java/github/weichware10/analyse/Main.java
index 78d93eb..5f972dc 100644
--- a/src/main/java/github/weichware10/analyse/Main.java
+++ b/src/main/java/github/weichware10/analyse/Main.java
@@ -1,6 +1,7 @@
 package github.weichware10.analyse;
 
 import github.weichware10.analyse.gui.general.Login;
+import github.weichware10.util.Files;
 import github.weichware10.util.Logger;
 import github.weichware10.util.db.DataBaseClient;
 import github.weichware10.util.gui.Log;
@@ -33,6 +34,8 @@ public static void main(String[] args) {
         String logfile = String.format(
                 Dotenv.load().get("LOGS") + "/%s.log", DateTime.now().toString("yMMdd-HHmmss"));
         Logger.setLogfile(logfile);
+        // delete temp dir
+        Runtime.getRuntime().addShutdownHook(Files.deleteTempDir());
         launch(args);
     }
 

From 4b4331921e64861d6b6cd6983dc084a7b10821af Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 00:51:58 +0100
Subject: [PATCH 68/87] [fix] util version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be509dd..fb32bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>5215fa3</version>
+      <version>cc0b84e</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <dependency>

From abd3fcd0a588af61583b657826789cd08d55c68f Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 00:52:27 +0100
Subject: [PATCH 69/87] [feat] javafx color to awt color converter

---
 .../weichware10/analyse/config/HeatmapConfig.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
index 092ac4c..e97d96c 100644
--- a/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
+++ b/src/main/java/github/weichware10/analyse/config/HeatmapConfig.java
@@ -95,4 +95,18 @@ public String toString() {
                 isGrid(),
                 isImage());
     }
+
+    /**
+     * Konvertiert javafx Color in awt Color.
+     *
+     * @param color - javafx Color
+     * @return awt Color
+     */
+    public static java.awt.Color fxToAwtColor(Color color) {
+        return new java.awt.Color(
+                                (float) color.getRed(),
+                                (float) color.getGreen(),
+                                (float) color.getBlue(),
+                                (float) color.getOpacity());
+    }
 }

From 5ce75587c932e81559d5d5332b3db5f8314bb9f4 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 00:53:31 +0100
Subject: [PATCH 70/87] [refactor] delete Analyse method

---
 .../github/weichware10/analyse/logic/Analyse.java    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Analyse.java b/src/main/java/github/weichware10/analyse/logic/Analyse.java
index 450e7fd..0d516c4 100644
--- a/src/main/java/github/weichware10/analyse/logic/Analyse.java
+++ b/src/main/java/github/weichware10/analyse/logic/Analyse.java
@@ -16,16 +16,4 @@ public abstract class Analyse {
     protected List<List<Float>> calcRelFreq(TrialData data) {
         return null;
     }
-
-    /**
-     * erstellt eine Tabelle mit den Zeitpunkten und dazugehörigen Bildkoordinaten
-     * bzw. Zoomstärken
-     *
-     * @return Tabelle mit Zeitpunkten und dazugehörigen Bildkoordinaten bzw.
-     *         Zoomstärken
-     */
-    protected List<List<Float>> createTimeTable(TrialData data) {
-        return null;
-    }
-
 }

From fd2f61ef62927233177e871583007bba43d01c20 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 00:53:48 +0100
Subject: [PATCH 71/87] [feat] heatmap implemented

---
 .../analyse/gui/analyse/Analyzer.java         |  26 +++-
 .../gui/analyse/AnalyzerController.java       |   5 +
 .../weichware10/analyse/logic/Heatmap.java    | 133 ++++++++++++++----
 .../analyse/gui/analyse/Analyzer.fxml         |  53 +++----
 4 files changed, 165 insertions(+), 52 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index efc3ba4..8404c8d 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -5,10 +5,12 @@
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.general.MainMenuBar;
+import github.weichware10.analyse.logic.Heatmap;
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
 import github.weichware10.util.gui.AbsScene;
 import javafx.scene.Parent;
+import javafx.scene.image.Image;
 
 /**
  * Analysefenster der App.
@@ -22,6 +24,7 @@ public class Analyzer extends AbsScene {
     private static TrialData trialComp;
     private static HeatmapConfig hmConfig = new HeatmapConfig();
     private static DiagramConfig diaConfig = new DiagramConfig();
+    private static String analysedImage;
 
     /**
      * Startet die App.
@@ -104,7 +107,7 @@ public static void setTrialIdComp() {
         } else {
             controller.analyseButton.setDisable(true);
             controller.errorLabel.setText(
-                "Trial und Vergleichs-Trial sind identisch. Wähle ein anderes Vergleichs-Trial!");
+                    "Trial & Vergleichs-Trial sind identisch. Wähle ein anderes Vergleichs-Trial!");
             controller.errorLabel.setVisible(true);
         }
     }
@@ -136,6 +139,25 @@ public static void analyse() {
                 hmConfig.toString(),
                 diaConfig.toString());
         Logger.info(output);
+
+        switch (analyseType) {
+            case HEATPMAP:
+                analysedImage = Heatmap.createHeatmap(trial, hmConfig);
+                break;
+            case COMPHEATMAP:
+                analysedImage = Heatmap.createHeatmapComp(trial, trialComp, hmConfig);
+                break;
+            case VERLAUF:
+                break;
+            case RELFRQIMGAREA:
+                break;
+            case VIEWTIMEDISTR:
+                break;
+            default:
+                // sollte niemals eintreten
+                break;
+        }
+        controller.analysedImage.setImage(new Image(analysedImage));
     }
 
     /**
@@ -148,10 +170,12 @@ public static void reset() {
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
         controller.selectCompTrialButton.setVisible(false);
+        controller.analysedImage.setImage(null);
         Analyzer.analyseType = null;
         Analyzer.trial = null;
         Analyzer.trialComp = null;
         Analyzer.hmConfig = new HeatmapConfig();
         Analyzer.diaConfig = new DiagramConfig();
+        Analyzer.analysedImage = null;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index 6592274..bc9879a 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -8,6 +8,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuButton;
+import javafx.scene.image.ImageView;
 
 /**
  * Kontroller für {@link Analyzer}.
@@ -19,6 +20,8 @@ public class AnalyzerController extends AbsSceneController {
     @FXML
     protected MenuButton analyseTypMenuButton;
     @FXML
+    protected ImageView analysedImage;
+    @FXML
     protected Button backButton;
     @FXML
     protected Button configButton;
@@ -118,6 +121,8 @@ protected void initialize() {
                 : "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
         assert analyseTypMenuButton != null
                 : "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
+        assert analysedImage != null
+                : "fx:id=\"analysedImage\" not injected: check 'Analyzer.fxml'.";
         assert backButton != null
                 : "fx:id=\"backButton\" was injected: check 'Analyzer.fxml'.";
         assert configButton != null
diff --git a/src/main/java/github/weichware10/analyse/logic/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
index 3ae1af1..b86e8be 100644
--- a/src/main/java/github/weichware10/analyse/logic/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -1,50 +1,131 @@
 package github.weichware10.analyse.logic;
 
+import github.weichware10.analyse.Main;
 import github.weichware10.analyse.config.HeatmapConfig;
+import github.weichware10.util.Files;
+import github.weichware10.util.Logger;
+import github.weichware10.util.ToolType;
+import github.weichware10.util.config.Configuration;
+import github.weichware10.util.data.DataPoint;
 import github.weichware10.util.data.TrialData;
-import java.util.List;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javafx.scene.image.Image;
+import javax.imageio.ImageIO;
 
 /**
  * verantwortlich für die Erstellung der Heatmap.
  */
-@SuppressWarnings("unused")
-public class Heatmap extends Analyse {
-    private final TrialData data;
-    private final HeatmapConfig confHm;
-    private List<List<Float>> heatmap;
+public class Heatmap {
 
     /**
-     * verantwortlich für die Erstellung der Heatmap.
+     * Erstellt Heatmap.
      *
-     * @param data   - Daten die zur Erstellung der Heatmaps benötigt werden
-     * @param confHm - Konfiguration der Heatmap
+     * @param trial    - Versuch
+     * @param hmConfig - Konfiguration
+     * @return ?
      */
-    public Heatmap(TrialData data, HeatmapConfig confHm) {
-        this.data = data;
-        this.confHm = confHm;
+    public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
+        Configuration config = Main.dataBaseClient.configurations.get(trial.configId);
+
+        // Load image for width & height
+        String imageUrl = null;
+        ;
+        try {
+            imageUrl = Files.saveImage(config.getImageUrl());
+        } catch (IllegalArgumentException | IOException e) {
+            Logger.error("Failed to save img", e, true);
+        }
+        Image image = new Image(imageUrl);
+        int width = (int) image.getWidth();
+        int height = (int) image.getHeight();
+
+        // Create image
+        BufferedImage heatmap = null;
+        double opacity;
+
+        if (hmConfig.isImage()) {
+            try {
+                heatmap = ImageIO.read(new File(imageUrl));
+            } catch (IOException e) {
+                Logger.error("Failed to load image", e, true);
+            }
+            opacity = 0.4f;
+        } else {
+            heatmap = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            opacity = 1.0f;
+        }
+        Graphics2D graphic = heatmap.createGraphics();
+        // Tiefe 0 setzten
+        graphic.setColor(calcColor(0.0f, opacity,
+                hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
+        graphic.fillRect(0, 0, width, height);
+
+        if (trial.toolType == ToolType.ZOOMMAPS) {
+            // TODO: Implementieren
+        } else if (trial.toolType == ToolType.CODECHARTS) {
+            // Rechtecke der Durchläufe setzen
+            for (DataPoint dataPoint : trial.getData()) {
+                // Relative Tiefe berechnen
+                double relDepth = (double) dataPoint.depth
+                        / (double) config.getCodeChartsConfiguration().getMaxDepth();
+
+                // Rechteck färben und setzten
+                graphic.setColor(calcColor(relDepth, opacity,
+                        hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
+                graphic.fillRect((int) dataPoint.viewport.getMinX(),
+                        (int) dataPoint.viewport.getMinY(),
+                        (int) dataPoint.viewport.getWidth(),
+                        (int) dataPoint.viewport.getHeight());
+            }
+        }
+
+        graphic.dispose();
+
+        // save generated image
+        String imgLocation = null;
+        try {
+            imgLocation = Files.saveGeneratedImage(heatmap, "test.png");
+        } catch (IllegalArgumentException | IOException e) {
+            Logger.error("Failed to save the image", e, true);
+        }
+
+        return imgLocation;
     }
 
     /**
-     * erstellt die Heatmap, welche die relativen Häufigkeiten der betrachteten
-     * Bildkoordinaten darstellt.
+     * Erstellt Heatmap-Vergleich.
      *
-     * @return Pfad des Bildes der erstellten Heatmap
+     * @param trial     - 1. Versuch
+     * @param trialComp - 2. Versuch
+     * @param hmConfig  - Konfiguration
+     * @return ?
      */
-    public String createHeatmap() {
-        return ".../heatmap/HEATMAP_" + this.data.toolType.toString()
-            + "_" + this.data.trialId + ".jpg";
+    public static String createHeatmapComp(TrialData trial,
+            TrialData trialComp, HeatmapConfig hmConfig) {
+        return null;
     }
 
     /**
-     * vergleicht zwei Heatmaps und erstellt aus dem Vergleich eine Heatmap.
+     * Berechnet neue Farbe anhand der Tiefe (CodeCharts).
      *
-     * @param heatmap1 - erste Heatmap für den Vergleich
-     * @param heatmap2 - zweite Heatmap für den Vergleich
-     * @return Pfad des Bildes der erstellten Heatmap
+     * @param relDepth     - relative Tiefe
+     * @param opacity      - Transparenz
+     * @param minColorDiff - minimale Farbe
+     * @param maxColorDiff - maximale Farbe
+     * @return berechnete Farbe (java.awt.Color Color)
      */
-    public static String compHeatmaps(Heatmap heatmap1, Heatmap heatmap2) {
-        return ".../heatmap/COMPHEATMAP_" + heatmap1.data.toolType.toString()
-            + "_" + heatmap1.data.trialId + "_" + heatmap2.data.toolType.toString()
-            + "_" + heatmap2.data.trialId + ".jpg";
+    private static java.awt.Color calcColor(double relDepth, double opacity,
+            javafx.scene.paint.Color minColorDiff,
+            javafx.scene.paint.Color maxColorDiff) {
+        double r = minColorDiff.getRed() * (1.0f - relDepth) + maxColorDiff.getRed() * relDepth;
+        double g = minColorDiff.getGreen() * (1.0f - relDepth) + maxColorDiff.getGreen() * relDepth;
+        double b = minColorDiff.getBlue() * (1.0f - relDepth) + maxColorDiff.getBlue() * relDepth;
+        Logger.debug(String.format("R:%f, G:%fm B:%f", r, g, b));
+
+        javafx.scene.paint.Color color = new javafx.scene.paint.Color(r, g, b, opacity);
+        return HeatmapConfig.fxToAwtColor(color);
     }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
index e888e69..934bfc3 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.chart.BarChart?>
-<?import javafx.scene.chart.CategoryAxis?>
-<?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.AnalyzerController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.AnalyzerController">
    <children>
       <HBox alignment="TOP_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
          <children>
-            <Button mnemonicParsing="false" onAction="#selectTrial" text="Auswahl Trial" />
-            <MenuButton fx:id="analyseTypMenuButton" disable="true" mnemonicParsing="false" text="Analyse-Typ">
-              <items>
-                <MenuItem mnemonicParsing="false" onAction="#setHeatmap" text="Heatmap" />
-                <MenuItem mnemonicParsing="false" onAction="#setCompHeatmap" text="Heatmap Vergleich" />
-                  <MenuItem mnemonicParsing="false" onAction="#setVerlauf" text="Verlauf" />
-                  <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsverteilung Bildbereiche" />
-                  <MenuItem mnemonicParsing="false" onAction="#setViewTimeDistr" text="Verteilung Betrachtungszeit" />
-              </items>
-            </MenuButton>
-            <Button fx:id="configButton" disable="true" mnemonicParsing="false" onAction="#setConfig" text="Konfiguration" />
-            <Button fx:id="selectCompTrialButton" mnemonicParsing="false" onAction="#selectTrialForComp" text="Auswahl Vergleichs-Trial" visible="false" />
-            <Button fx:id="analyseButton" disable="true" mnemonicParsing="false" onAction="#analyze" text="Analyse" />
+            <HBox prefHeight="46.0" prefWidth="543.0" spacing="15.0">
+               <children>
+                  <Button mnemonicParsing="false" onAction="#selectTrial" text="Auswahl Trial" />
+                  <MenuButton fx:id="analyseTypMenuButton" disable="true" mnemonicParsing="false" text="Analyse-Typ">
+                    <items>
+                      <MenuItem mnemonicParsing="false" onAction="#setHeatmap" text="Heatmap" />
+                      <MenuItem mnemonicParsing="false" onAction="#setCompHeatmap" text="Heatmap Vergleich" />
+                        <MenuItem mnemonicParsing="false" onAction="#setVerlauf" text="Verlauf" />
+                        <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsverteilung Bildbereiche" />
+                        <MenuItem mnemonicParsing="false" onAction="#setViewTimeDistr" text="Verteilung Betrachtungszeit" />
+                    </items>
+                  </MenuButton>
+                  <Button fx:id="configButton" disable="true" mnemonicParsing="false" onAction="#setConfig" text="Konfiguration" />
+                  <Button fx:id="selectCompTrialButton" mnemonicParsing="false" onAction="#selectTrialForComp" text="Auswahl Vergleichs-Trial" visible="false" />
+               </children>
+            </HBox>
+            <HBox alignment="TOP_RIGHT" prefHeight="46.0" prefWidth="133.0">
+               <children>
+                  <Button fx:id="analyseButton" disable="true" mnemonicParsing="false" onAction="#analyze" text="Analyse" />
+               </children>
+            </HBox>
          </children>
          <VBox.margin>
             <Insets />
@@ -43,14 +49,11 @@
             </Label>
          </children>
       </HBox>
-      <BarChart title="Beispiel">
-        <xAxis>
-          <CategoryAxis side="BOTTOM" />
-        </xAxis>
-        <yAxis>
-          <NumberAxis side="LEFT" />
-        </yAxis>
-      </BarChart>
+      <HBox alignment="CENTER" prefHeight="347.0" prefWidth="555.0">
+         <children>
+            <ImageView fx:id="analysedImage" fitHeight="303.0" fitWidth="555.0" pickOnBounds="true" preserveRatio="true" />
+         </children>
+      </HBox>
       <HBox alignment="BOTTOM_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
          <children>
             <HBox alignment="CENTER_LEFT" prefHeight="33.0" prefWidth="183.0" spacing="15.0">

From 3f186456f6e3487f81b492f507f467511bf7ce02 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 16:40:52 +0100
Subject: [PATCH 72/87] [feat] ZoomMaps Heatmap

---
 .../weichware10/analyse/logic/Heatmap.java    | 124 +++++++++++++++---
 1 file changed, 103 insertions(+), 21 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
index b86e8be..7f4c763 100644
--- a/src/main/java/github/weichware10/analyse/logic/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -12,6 +12,7 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import javafx.scene.image.Image;
 import javax.imageio.ImageIO;
 
@@ -30,7 +31,7 @@ public class Heatmap {
     public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
         Configuration config = Main.dataBaseClient.configurations.get(trial.configId);
 
-        // Load image for width & height
+        // Bild laden für Bildbreite und -höhe
         String imageUrl = null;
         ;
         try {
@@ -42,30 +43,69 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
         int width = (int) image.getWidth();
         int height = (int) image.getHeight();
 
-        // Create image
+        // Heatmap Bild erstellen
         BufferedImage heatmap = null;
         double opacity;
 
+        // Wenn Versuchs-Bild angezeigt werden soll, dieses als Hintergrund setzen sonst
+        // leerer Hintergrund
         if (hmConfig.isImage()) {
             try {
                 heatmap = ImageIO.read(new File(imageUrl));
             } catch (IOException e) {
                 Logger.error("Failed to load image", e, true);
             }
-            opacity = 0.4f;
+            opacity = 0.5f;
         } else {
             heatmap = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
             opacity = 1.0f;
         }
+
         Graphics2D graphic = heatmap.createGraphics();
-        // Tiefe 0 setzten
-        graphic.setColor(calcColor(0.0f, opacity,
-                hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
-        graphic.fillRect(0, 0, width, height);
 
         if (trial.toolType == ToolType.ZOOMMAPS) {
-            // TODO: Implementieren
+            // Tiefe 0 setzten
+            graphic.setColor(calcColorCc(0.0f, opacity,
+                    hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
+            graphic.fillRect(0, 0, width, height);
+
+            // Maximale Tiefe ermitteln
+            double maxDepth = findMaxDepth(trial.getData(), (double) width, (double) height);
+            double oldRelDepth = 0.0f;
+
+            // Rechtecke der Zooms setzen
+            for (DataPoint dataPoint : trial.getData()) {
+                // Relative Tiefe berechnen
+                double stepWidth = dataPoint.viewport.getWidth();
+                double stepHeight = dataPoint.viewport.getHeight();
+                double tempRelDepth = 1
+                        / ((stepWidth * stepHeight) / ((double) width * (double) height));
+                tempRelDepth = java.lang.Math.log10(tempRelDepth);
+                double relDepth = tempRelDepth / maxDepth;
+
+                // Prüfen ob herausgezoomt wurde
+                if (oldRelDepth > relDepth) {
+                    oldRelDepth = relDepth;
+                    continue;
+                }
+                oldRelDepth = relDepth;
+                // Logger.debug(relDepth + " " + tempRelDepth);
+
+                // Rechteck färben und setzten
+                graphic.setColor(calcColorZm(relDepth, 0.1f,
+                        hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
+                int minX = (dataPoint.viewport.getMinX() < 0.0f
+                        ? 0 : (int) dataPoint.viewport.getMinX());
+                int minY = (dataPoint.viewport.getMinY() < 0.0f
+                        ? 0 : (int) dataPoint.viewport.getMinY());
+                graphic.fillRect(minX, minY, (int) stepWidth, (int) stepHeight);
+            }
         } else if (trial.toolType == ToolType.CODECHARTS) {
+            // Tiefe 0 setzten
+            graphic.setColor(calcColorCc(0.0f, opacity,
+                    hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
+            graphic.fillRect(0, 0, width, height);
+
             // Rechtecke der Durchläufe setzen
             for (DataPoint dataPoint : trial.getData()) {
                 // Relative Tiefe berechnen
@@ -73,7 +113,7 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
                         / (double) config.getCodeChartsConfiguration().getMaxDepth();
 
                 // Rechteck färben und setzten
-                graphic.setColor(calcColor(relDepth, opacity,
+                graphic.setColor(calcColorCc(relDepth, opacity,
                         hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
                 graphic.fillRect((int) dataPoint.viewport.getMinX(),
                         (int) dataPoint.viewport.getMinY(),
@@ -81,10 +121,9 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
                         (int) dataPoint.viewport.getHeight());
             }
         }
-
         graphic.dispose();
 
-        // save generated image
+        // Generierte Heatmap-Bild speichern
         String imgLocation = null;
         try {
             imgLocation = Files.saveGeneratedImage(heatmap, "test.png");
@@ -96,16 +135,24 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
     }
 
     /**
-     * Erstellt Heatmap-Vergleich.
+     * Berechnet maximale Tiefe eines ZoomMaps-Versuchs.
      *
-     * @param trial     - 1. Versuch
-     * @param trialComp - 2. Versuch
-     * @param hmConfig  - Konfiguration
-     * @return ?
+     * @param data - Datenpunkte des Versuchs
+     * @param width - Breite des verwendeten Bilds
+     * @param height - Höhe des verwendeten Bilds
+     * @return maximale Tiefe des Versuchs
      */
-    public static String createHeatmapComp(TrialData trial,
-            TrialData trialComp, HeatmapConfig hmConfig) {
-        return null;
+    private static double findMaxDepth(List<DataPoint> data, double width, double height) {
+        double maxDepth = Float.MAX_VALUE;
+        for (DataPoint dataPoint : data) {
+            double currentWidth = dataPoint.viewport.getWidth();
+            double currentHeight = dataPoint.viewport.getHeight();
+            double depth = (currentWidth * currentHeight) / (width * height);
+            if (depth < maxDepth) {
+                maxDepth = depth;
+            }
+        }
+        return java.lang.Math.log10(1 / maxDepth);
     }
 
     /**
@@ -117,15 +164,50 @@ public static String createHeatmapComp(TrialData trial,
      * @param maxColorDiff - maximale Farbe
      * @return berechnete Farbe (java.awt.Color Color)
      */
-    private static java.awt.Color calcColor(double relDepth, double opacity,
+    private static java.awt.Color calcColorCc(double relDepth, double opacity,
             javafx.scene.paint.Color minColorDiff,
             javafx.scene.paint.Color maxColorDiff) {
         double r = minColorDiff.getRed() * (1.0f - relDepth) + maxColorDiff.getRed() * relDepth;
         double g = minColorDiff.getGreen() * (1.0f - relDepth) + maxColorDiff.getGreen() * relDepth;
         double b = minColorDiff.getBlue() * (1.0f - relDepth) + maxColorDiff.getBlue() * relDepth;
-        Logger.debug(String.format("R:%f, G:%fm B:%f", r, g, b));
+        // Logger.debug(String.format("R:%f, G:%fm B:%f", r, g, b));
 
         javafx.scene.paint.Color color = new javafx.scene.paint.Color(r, g, b, opacity);
         return HeatmapConfig.fxToAwtColor(color);
     }
+
+    /**
+     * Berechnet neue Farbe anhand der Tiefe (ZoomMaps).
+     *
+     * @param relDepth     - relative Tiefe
+     * @param opacity      - Transparenz
+     * @param minColorDiff - minimale Farbe
+     * @param maxColorDiff - maximale Farbe
+     * @return berechnete Farbe (java.awt.Color Color)
+     */
+    private static java.awt.Color calcColorZm(double relDepth, double opacity,
+            javafx.scene.paint.Color minColorDiff,
+            javafx.scene.paint.Color maxColorDiff) {
+        double r = 1.0f * (1.0f - relDepth) + maxColorDiff.getRed() * relDepth;
+        double g = 1.0f * (1.0f - relDepth) + maxColorDiff.getGreen() * relDepth;
+        double b = 1.0f * (1.0f - relDepth) + maxColorDiff.getBlue() * relDepth;
+        double a = opacity * relDepth;
+        // Logger.debug(String.format("R:%f, G:%fm B:%f", r, g, b));
+
+        javafx.scene.paint.Color color = new javafx.scene.paint.Color(r, g, b, a);
+        return HeatmapConfig.fxToAwtColor(color);
+    }
+
+    /**
+     * Erstellt Heatmap-Vergleich.
+     *
+     * @param trial     - 1. Versuch
+     * @param trialComp - 2. Versuch
+     * @param hmConfig  - Konfiguration
+     * @return ?
+     */
+    public static String createHeatmapComp(TrialData trial,
+            TrialData trialComp, HeatmapConfig hmConfig) {
+        return null;
+    }
 }

From fc6b3553f35101a947851b494c47dc1bfabce6af Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 17:55:21 +0100
Subject: [PATCH 73/87] [feat] export function

---
 .../analyse/gui/analyse/Analyzer.java         | 78 ++++++++++++++++++-
 .../gui/analyse/AnalyzerController.java       | 10 ++-
 2 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index 8404c8d..d221a06 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -9,8 +9,15 @@
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
 import github.weichware10.util.gui.AbsScene;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javafx.application.Platform;
 import javafx.scene.Parent;
 import javafx.scene.image.Image;
+import javafx.stage.FileChooser;
+import javafx.stage.FileChooser.ExtensionFilter;
+import javax.imageio.ImageIO;
 
 /**
  * Analysefenster der App.
@@ -56,6 +63,10 @@ public static void setAnalyseType(AnalyseType analyseType) {
         diaConfig = new DiagramConfig();
 
         controller.errorLabel.setVisible(false);
+        controller.analysedImage.setImage(null);
+        controller.exportButton.setDisable(true);
+        controller.exportRawButton.setDisable(true);
+        analysedImage = null;
 
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
             trialComp = null;
@@ -86,9 +97,13 @@ public static void setTrialId() {
                 controller.analyseButton.setDisable(true);
                 controller.selectCompTrialButton.setVisible(false);
                 controller.analyseTypMenuButton.setText("Analyse-Typ");
+                controller.errorLabel.setVisible(false);
+                controller.analysedImage.setImage(null);
+                controller.exportButton.setDisable(true);
+                controller.exportRawButton.setDisable(true);
+                analysedImage = null;
                 hmConfig = new HeatmapConfig();
                 diaConfig = new DiagramConfig();
-                controller.errorLabel.setVisible(false);
             }
             controller.analyseTypMenuButton.setDisable(false);
             Logger.info("trialId set to " + trial.trialId);
@@ -116,6 +131,8 @@ public static void setTrialIdComp() {
      * Setzt die Konfiguration für Heatmap bzw. Diagramm Analyse
      */
     public static void setConfig() {
+        controller.errorLabel.setVisible(false);
+
         if (analyseType == AnalyseType.COMPHEATMAP
                 || analyseType == AnalyseType.HEATPMAP) {
             HeatmapConfigurator.start(hmConfig);
@@ -140,6 +157,8 @@ public static void analyse() {
                 diaConfig.toString());
         Logger.info(output);
 
+        controller.errorLabel.setVisible(false);
+
         switch (analyseType) {
             case HEATPMAP:
                 analysedImage = Heatmap.createHeatmap(trial, hmConfig);
@@ -157,7 +176,59 @@ public static void analyse() {
                 // sollte niemals eintreten
                 break;
         }
-        controller.analysedImage.setImage(new Image(analysedImage));
+        if (analysedImage != null) {
+            controller.analysedImage.setImage(new Image(analysedImage));
+            controller.exportButton.setDisable(false);
+            controller.exportRawButton.setDisable(false);
+        }
+    }
+
+    /**
+     * Exportiert erstelltes Bild.
+     */
+    public static void export() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Analyse Bild speichern unter");
+        fileChooser.getExtensionFilters().add(
+                new ExtensionFilter("PNG Image", "*.png"));
+
+        // Dateipfad als String speichern und json laden
+        String location = fileChooser.showSaveDialog(Main.primaryStage).getAbsolutePath();
+        if (location != null) {
+            Thread taskThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    if (saveImage(location)) {
+                        Platform.runLater(() -> controller.setExportStatus(
+                                    String.format("Bild unter %s gesepeichert", location)));
+                    } else {
+                        Platform.runLater(() -> controller.setExportStatus(
+                                "Bild konnte nicht gespeichert werden"));
+                    }
+                }
+            });
+            taskThread.start();
+        }
+    }
+
+    // TODO: in util verschieben?(ja -> analysedImage als Paramter dazu)
+    /**
+     * Speichert Bild unter location.
+     *
+     * @param location - Speicherort
+     * @return Erfolgsboolean
+     */
+    private static boolean saveImage(String location) {
+        BufferedImage image = null;
+        try {
+            image = ImageIO.read(new File(analysedImage));
+            ImageIO.write(image, "png", new File(location));
+        } catch (IOException e) {
+            Logger.error("Failed to save image", e, true);
+            return false;
+        }
+        Logger.info("Image saved: " + location);
+        return true;
     }
 
     /**
@@ -171,6 +242,9 @@ public static void reset() {
         controller.exportRawButton.setDisable(true);
         controller.selectCompTrialButton.setVisible(false);
         controller.analysedImage.setImage(null);
+        controller.exportButton.setDisable(true);
+        controller.exportRawButton.setDisable(true);
+        controller.errorLabel.setVisible(false);
         Analyzer.analyseType = null;
         Analyzer.trial = null;
         Analyzer.trialComp = null;
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index bc9879a..82c0217 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -36,7 +36,6 @@ public class AnalyzerController extends AbsSceneController {
 
     @FXML
     protected void analyze(ActionEvent event) {
-        // TODO: Analyse
         Analyzer.analyse();
     }
 
@@ -47,12 +46,12 @@ void back(ActionEvent event) {
 
     @FXML
     void export(ActionEvent event) {
-        // TODO: Export
+        Analyzer.export();
     }
 
     @FXML
     void exportRaw(ActionEvent event) {
-        // TODO: ExportRaw
+        // TODO: ExportRaw (Was sollte hier ausgegeben werden?)
     }
 
     @FXML
@@ -115,6 +114,11 @@ protected void setViewTimeDistr(ActionEvent event) {
         analyseTypMenuButton.setText("Verteilung Betrachtungszeit");
     }
 
+    protected void setExportStatus(String text) {
+        errorLabel.setText(text);
+        errorLabel.setVisible(true);
+    }
+
     @FXML
     protected void initialize() {
         assert analyseButton != null

From 8a92fc577be5755a7c1941c3de6fe3d6577f4946 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 18:40:55 +0100
Subject: [PATCH 74/87] [refactor] depth calcs in analyse

---
 .../weichware10/analyse/logic/Analyse.java    | 60 +++++++++++++++++--
 .../weichware10/analyse/logic/Heatmap.java    | 42 +++----------
 2 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Analyse.java b/src/main/java/github/weichware10/analyse/logic/Analyse.java
index 0d516c4..6301562 100644
--- a/src/main/java/github/weichware10/analyse/logic/Analyse.java
+++ b/src/main/java/github/weichware10/analyse/logic/Analyse.java
@@ -1,19 +1,67 @@
 package github.weichware10.analyse.logic;
 
-import github.weichware10.util.data.TrialData;
+import github.weichware10.util.data.DataPoint;
 import java.util.List;
 
 /**
  * beinhaltet Methoden die zur Analyse benötigt werden.
  */
-public abstract class Analyse {
+public class Analyse {
 
     /**
-     * berechnet die relativen Häufigkeiten der Bildkoordinaten.
+     * Berechnet maximale Tiefe eines ZoomMaps-Versuchs.
      *
-     * @return Liste mit den relativen Häufigkeiten der Bildkoordinaten
+     * @param data - Datenpunkte des Versuchs
+     * @param width - Breite des verwendeten Bilds
+     * @param height - Höhe des verwendeten Bilds
+     * @return maximale Tiefe des Versuchs
      */
-    protected List<List<Float>> calcRelFreq(TrialData data) {
-        return null;
+    protected static double findMaxDepth(List<DataPoint> data, double width, double height) {
+        double maxDepth = Float.MAX_VALUE;
+        for (DataPoint dataPoint : data) {
+            double currentWidth = dataPoint.viewport.getWidth();
+            double currentHeight = dataPoint.viewport.getHeight();
+            double depth = (currentWidth * currentHeight) / (width * height);
+            if (depth < maxDepth) {
+                maxDepth = depth;
+            }
+        }
+        return java.lang.Math.log10(1 / maxDepth);
+    }
+
+    /**
+     * Berechnet die relative Tiefe eines Datenpunktes (ZoomMaps).
+     *
+     * @param currentWidth - Breite Viewport des Datenpunktes
+     * @param currentHeight - Höhe Viewport des Datenpunktes
+     * @param imageWidth - Breite Versuchs-Bild
+     * @param imageHeight - Höhe Versuchs-Bild
+     * @param maxDepth - maximale Tiefe des Versuchs
+     * @return relative Tiefe des Datenpunkts
+     */
+    protected static double calcRelDepthZm(double currentWidth, double currentHeight,
+            double imageWidth, double imageHeight, double maxDepth) {
+        // Tiefe berechnen
+        double tempRelDepth = 1 / ((currentWidth * currentHeight) / (imageWidth * imageHeight));
+
+        // Logarithmus der Tiefe für linearen Verlauf
+        tempRelDepth = java.lang.Math.log10(tempRelDepth);
+
+        // relative Tiefe berechnen
+        double relDepth = tempRelDepth / maxDepth;
+        // Logger.debug(relDepth + " " + tempRelDepth);
+
+        return relDepth;
+    }
+
+    /**
+     * Berechnet die relative Tiefe eines Datenpunktes (CodeCharts).
+     *
+     * @param depth - Tiefe des Datenpunktes
+     * @param maxDepth - Maximale Tiefe des Versuchs
+     * @return relative Tiefe des Datenpunkts
+     */
+    protected static double calcRelDepthCc(double depth, double maxDepth) {
+        return depth / maxDepth;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/logic/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
index 7f4c763..2432980 100644
--- a/src/main/java/github/weichware10/analyse/logic/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -12,7 +12,6 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 import javafx.scene.image.Image;
 import javax.imageio.ImageIO;
 
@@ -33,7 +32,6 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
 
         // Bild laden für Bildbreite und -höhe
         String imageUrl = null;
-        ;
         try {
             imageUrl = Files.saveImage(config.getImageUrl());
         } catch (IllegalArgumentException | IOException e) {
@@ -70,7 +68,8 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
             graphic.fillRect(0, 0, width, height);
 
             // Maximale Tiefe ermitteln
-            double maxDepth = findMaxDepth(trial.getData(), (double) width, (double) height);
+            double maxDepth = Analyse.findMaxDepth(
+                    trial.getData(), (double) width, (double) height);
             double oldRelDepth = 0.0f;
 
             // Rechtecke der Zooms setzen
@@ -78,10 +77,8 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
                 // Relative Tiefe berechnen
                 double stepWidth = dataPoint.viewport.getWidth();
                 double stepHeight = dataPoint.viewport.getHeight();
-                double tempRelDepth = 1
-                        / ((stepWidth * stepHeight) / ((double) width * (double) height));
-                tempRelDepth = java.lang.Math.log10(tempRelDepth);
-                double relDepth = tempRelDepth / maxDepth;
+                double relDepth = Analyse.calcRelDepthZm(
+                            stepWidth, stepHeight, width, height, maxDepth);
 
                 // Prüfen ob herausgezoomt wurde
                 if (oldRelDepth > relDepth) {
@@ -89,11 +86,9 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
                     continue;
                 }
                 oldRelDepth = relDepth;
-                // Logger.debug(relDepth + " " + tempRelDepth);
 
                 // Rechteck färben und setzten
-                graphic.setColor(calcColorZm(relDepth, 0.1f,
-                        hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
+                graphic.setColor(calcColorZm(relDepth, 0.1f, hmConfig.getMaxColorDiff()));
                 int minX = (dataPoint.viewport.getMinX() < 0.0f
                         ? 0 : (int) dataPoint.viewport.getMinX());
                 int minY = (dataPoint.viewport.getMinY() < 0.0f
@@ -109,8 +104,8 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
             // Rechtecke der Durchläufe setzen
             for (DataPoint dataPoint : trial.getData()) {
                 // Relative Tiefe berechnen
-                double relDepth = (double) dataPoint.depth
-                        / (double) config.getCodeChartsConfiguration().getMaxDepth();
+                double relDepth = Analyse.calcRelDepthCc((double) dataPoint.depth,
+                        (double) config.getCodeChartsConfiguration().getMaxDepth());
 
                 // Rechteck färben und setzten
                 graphic.setColor(calcColorCc(relDepth, opacity,
@@ -134,27 +129,6 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
         return imgLocation;
     }
 
-    /**
-     * Berechnet maximale Tiefe eines ZoomMaps-Versuchs.
-     *
-     * @param data - Datenpunkte des Versuchs
-     * @param width - Breite des verwendeten Bilds
-     * @param height - Höhe des verwendeten Bilds
-     * @return maximale Tiefe des Versuchs
-     */
-    private static double findMaxDepth(List<DataPoint> data, double width, double height) {
-        double maxDepth = Float.MAX_VALUE;
-        for (DataPoint dataPoint : data) {
-            double currentWidth = dataPoint.viewport.getWidth();
-            double currentHeight = dataPoint.viewport.getHeight();
-            double depth = (currentWidth * currentHeight) / (width * height);
-            if (depth < maxDepth) {
-                maxDepth = depth;
-            }
-        }
-        return java.lang.Math.log10(1 / maxDepth);
-    }
-
     /**
      * Berechnet neue Farbe anhand der Tiefe (CodeCharts).
      *
@@ -181,12 +155,10 @@ private static java.awt.Color calcColorCc(double relDepth, double opacity,
      *
      * @param relDepth     - relative Tiefe
      * @param opacity      - Transparenz
-     * @param minColorDiff - minimale Farbe
      * @param maxColorDiff - maximale Farbe
      * @return berechnete Farbe (java.awt.Color Color)
      */
     private static java.awt.Color calcColorZm(double relDepth, double opacity,
-            javafx.scene.paint.Color minColorDiff,
             javafx.scene.paint.Color maxColorDiff) {
         double r = 1.0f * (1.0f - relDepth) + maxColorDiff.getRed() * relDepth;
         double g = 1.0f * (1.0f - relDepth) + maxColorDiff.getGreen() * relDepth;

From 529cca3e91767c2b8c00bd31b9e8025172ceb9c0 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 21:07:28 +0100
Subject: [PATCH 75/87] [feat] saveImage -> Analyse

---
 .../weichware10/analyse/logic/Analyse.java    | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Analyse.java b/src/main/java/github/weichware10/analyse/logic/Analyse.java
index 6301562..2c90ee2 100644
--- a/src/main/java/github/weichware10/analyse/logic/Analyse.java
+++ b/src/main/java/github/weichware10/analyse/logic/Analyse.java
@@ -1,13 +1,33 @@
 package github.weichware10.analyse.logic;
 
+import github.weichware10.util.Files;
+import github.weichware10.util.Logger;
 import github.weichware10.util.data.DataPoint;
+import java.io.IOException;
 import java.util.List;
+import javafx.geometry.Rectangle2D;
 
 /**
  * beinhaltet Methoden die zur Analyse benötigt werden.
  */
 public class Analyse {
 
+    /**
+     * Speichert das Versuchs-Bild.
+     *
+     * @param imageUrl - URL des Versuchs-Bilds
+     * @return Pfad zum gespeicherten Bild
+     */
+    public static String saveImage(String imageUrl) {
+        String imageLocation = null;
+        try {
+            imageLocation = Files.saveImage(imageUrl);
+        } catch (IllegalArgumentException | IOException e) {
+            Logger.error("Failed to save img", e, true);
+        }
+        return imageLocation;
+    }
+
     /**
      * Berechnet maximale Tiefe eines ZoomMaps-Versuchs.
      *
@@ -32,16 +52,17 @@ protected static double findMaxDepth(List<DataPoint> data, double width, double
     /**
      * Berechnet die relative Tiefe eines Datenpunktes (ZoomMaps).
      *
-     * @param currentWidth - Breite Viewport des Datenpunktes
-     * @param currentHeight - Höhe Viewport des Datenpunktes
+     * @param viewport - Viewport des Datenpunktes
      * @param imageWidth - Breite Versuchs-Bild
      * @param imageHeight - Höhe Versuchs-Bild
      * @param maxDepth - maximale Tiefe des Versuchs
      * @return relative Tiefe des Datenpunkts
      */
-    protected static double calcRelDepthZm(double currentWidth, double currentHeight,
-            double imageWidth, double imageHeight, double maxDepth) {
+    protected static double calcRelDepthZm(Rectangle2D viewport, double imageWidth,
+            double imageHeight, double maxDepth) {
         // Tiefe berechnen
+        double currentWidth = viewport.getWidth();
+        double currentHeight = viewport.getHeight();
         double tempRelDepth = 1 / ((currentWidth * currentHeight) / (imageWidth * imageHeight));
 
         // Logarithmus der Tiefe für linearen Verlauf

From 9a9d4e2203ee83ecb30b9ebd4d2bdbc515a8e710 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 21:07:53 +0100
Subject: [PATCH 76/87] [refactor] delete VerlaufTest

---
 .../analyse/logic/VerlaufTest.java            | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 src/test/java/github/weichware10/analyse/logic/VerlaufTest.java

diff --git a/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java b/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
deleted file mode 100644
index 5a723ac..0000000
--- a/src/test/java/github/weichware10/analyse/logic/VerlaufTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package github.weichware10.analyse.logic;
-
-import static org.junit.Assert.assertEquals;
-
-import github.weichware10.util.ToolType;
-import github.weichware10.util.data.TrialData;
-import org.junit.Test;
-
-/**
- * Unit Test für Klasse Verlauf.
- */
-public class VerlaufTest {
-    /**
-     * Testet, ob String erstellt und ausgegeben wird.
-     */
-    @Test
-    public void createVerlaufShouldWork() {
-        Verlauf verlauf1 = new Verlauf(new TrialData(ToolType.ZOOMMAPS, "1", "3"));
-        assertEquals("createVerlauf sollte .../verlauf/VERLAUF_ZOOMMAPS_1.jpg ausgeben",
-                ".../verlauf/VERLAUF_ZOOMMAPS_1.jpg", verlauf1.createVerlauf());
-
-        Verlauf verlauf2 = new Verlauf(new TrialData(ToolType.EYETRACKING, "6", "3"));
-        assertEquals("createVerlauf sollte .../verlauf/VERLAUF_EYETRACKING_6.jpg ausgeben",
-                ".../verlauf/VERLAUF_EYETRACKING_6.jpg",
-                verlauf2.createVerlauf());
-
-        Verlauf verlauf3 = new Verlauf(new TrialData(ToolType.CODECHARTS, "20", "3"));
-        assertEquals("createVerlauf sollte .../verlauf/VERLAUF_CODECHARTS_20.jpg ausgeben",
-                ".../verlauf/VERLAUF_CODECHARTS_20.jpg",
-                verlauf3.createVerlauf());
-    }
-}

From 8bc01dc9566d31ba7a1f4aefd8a18748239c1f93 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 21:08:46 +0100
Subject: [PATCH 77/87] [fix] saveImage from Analyse

---
 .../weichware10/analyse/logic/Heatmap.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
index 2432980..90089ea 100644
--- a/src/main/java/github/weichware10/analyse/logic/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -31,13 +31,14 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
         Configuration config = Main.dataBaseClient.configurations.get(trial.configId);
 
         // Bild laden für Bildbreite und -höhe
-        String imageUrl = null;
+        String imageUrl = Analyse.saveImage(config.getImageUrl());
+        Image image = null;
         try {
-            imageUrl = Files.saveImage(config.getImageUrl());
-        } catch (IllegalArgumentException | IOException e) {
-            Logger.error("Failed to save img", e, true);
+            image = new Image(imageUrl);
+        } catch (Exception e) {
+            Logger.error("Failed to save the image", e, true);
+            return null;
         }
-        Image image = new Image(imageUrl);
         int width = (int) image.getWidth();
         int height = (int) image.getHeight();
 
@@ -75,10 +76,8 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
             // Rechtecke der Zooms setzen
             for (DataPoint dataPoint : trial.getData()) {
                 // Relative Tiefe berechnen
-                double stepWidth = dataPoint.viewport.getWidth();
-                double stepHeight = dataPoint.viewport.getHeight();
-                double relDepth = Analyse.calcRelDepthZm(
-                            stepWidth, stepHeight, width, height, maxDepth);
+                double relDepth = Analyse.calcRelDepthZm(dataPoint.viewport, width,
+                        height, maxDepth);
 
                 // Prüfen ob herausgezoomt wurde
                 if (oldRelDepth > relDepth) {
@@ -93,7 +92,8 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
                         ? 0 : (int) dataPoint.viewport.getMinX());
                 int minY = (dataPoint.viewport.getMinY() < 0.0f
                         ? 0 : (int) dataPoint.viewport.getMinY());
-                graphic.fillRect(minX, minY, (int) stepWidth, (int) stepHeight);
+                graphic.fillRect(minX, minY, (int) dataPoint.viewport.getWidth(),
+                        (int) dataPoint.viewport.getHeight());
             }
         } else if (trial.toolType == ToolType.CODECHARTS) {
             // Tiefe 0 setzten

From b73381ed7031d2acc95b98f2f5d2fc35e1634b5a Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Sun, 16 Jan 2022 21:09:13 +0100
Subject: [PATCH 78/87] [feat] Verlauf Analyse & Export

---
 pom.xml                                       | 22 +++--
 .../analyse/gui/analyse/Analyzer.java         | 70 +++++++++++---
 .../gui/analyse/AnalyzerController.java       |  5 +
 .../weichware10/analyse/logic/Verlauf.java    | 91 +++++++++++++------
 .../analyse/gui/analyse/Analyzer.fxml         | 12 ++-
 5 files changed, 145 insertions(+), 55 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb32bbf..3fc3d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- shoutout to https://github.com/wiverson/maven-jpackage-template -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.github.weichware10</groupId>
@@ -75,6 +74,13 @@
       <version>${javafx.version}</version>
       <classifier>${platform}</classifier>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-swing -->
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-swing</artifactId>
+      <version>11-ea+24</version>
+    </dependency>
+
 
     <!-- UTIL -->
     <dependency>
@@ -306,15 +312,15 @@
         <artifactId>coveralls-maven-plugin</artifactId>
         <version>4.3.0</version>
         <configuration>
-            <!-- <repoToken></repoToken> -->
+          <!-- <repoToken></repoToken> -->
         </configuration>
         <dependencies>
           <dependency>
-             <groupId>javax.xml.bind</groupId>
-             <artifactId>jaxb-api</artifactId>
-             <version>2.2.3</version>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.2.3</version>
           </dependency>
-       </dependencies>
+        </dependencies>
       </plugin>
       <!-- UPDATE VERSION-->
       <plugin>
@@ -334,7 +340,7 @@
             <phase>validate</phase>
             <configuration>
               <target>
-                <mkdir dir="${platform}-javafx/javafx-jmods-${javafx.version}"/>
+                <mkdir dir="${platform}-javafx/javafx-jmods-${javafx.version}" />
                 <get src="https://raw.githubusercontent.com/weichware10/javafx-jmods/main/${platform}-javafx/javafx-jmods-${javafx.version}/javafx.base.jmod" dest="${platform}-javafx/javafx-jmods-${javafx.version}/javafx.base.jmod" skipexisting="true" />
                 <get src="https://raw.githubusercontent.com/weichware10/javafx-jmods/main/${platform}-javafx/javafx-jmods-${javafx.version}/javafx.controls.jmod" dest="${platform}-javafx/javafx-jmods-${javafx.version}/javafx.controls.jmod" skipexisting="true" />
                 <get src="https://raw.githubusercontent.com/weichware10/javafx-jmods/main/${platform}-javafx/javafx-jmods-${javafx.version}/javafx.fxml.jmod" dest="${platform}-javafx/javafx-jmods-${javafx.version}/javafx.fxml.jmod" skipexisting="true" />
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index d221a06..d08ae5d 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -6,15 +6,19 @@
 import github.weichware10.analyse.enums.AnalyseType;
 import github.weichware10.analyse.gui.general.MainMenuBar;
 import github.weichware10.analyse.logic.Heatmap;
+import github.weichware10.analyse.logic.Verlauf;
 import github.weichware10.util.Logger;
 import github.weichware10.util.data.TrialData;
 import github.weichware10.util.gui.AbsScene;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import javafx.application.Platform;
+import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.Parent;
+import javafx.scene.SnapshotParameters;
+import javafx.scene.chart.LineChart;
 import javafx.scene.image.Image;
+import javafx.scene.image.WritableImage;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javax.imageio.ImageIO;
@@ -32,6 +36,7 @@ public class Analyzer extends AbsScene {
     private static HeatmapConfig hmConfig = new HeatmapConfig();
     private static DiagramConfig diaConfig = new DiagramConfig();
     private static String analysedImage;
+    private static LineChart<Number, Number> lineChartSeries;
 
     /**
      * Startet die App.
@@ -66,7 +71,9 @@ public static void setAnalyseType(AnalyseType analyseType) {
         controller.analysedImage.setImage(null);
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
+        controller.chartPane.getChildren().clear();
         analysedImage = null;
+        lineChartSeries = null;
 
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
             trialComp = null;
@@ -101,7 +108,9 @@ public static void setTrialId() {
                 controller.analysedImage.setImage(null);
                 controller.exportButton.setDisable(true);
                 controller.exportRawButton.setDisable(true);
+                controller.chartPane.getChildren().clear();
                 analysedImage = null;
+                lineChartSeries = null;
                 hmConfig = new HeatmapConfig();
                 diaConfig = new DiagramConfig();
             }
@@ -167,6 +176,7 @@ public static void analyse() {
                 analysedImage = Heatmap.createHeatmapComp(trial, trialComp, hmConfig);
                 break;
             case VERLAUF:
+                lineChartSeries = Verlauf.createVerlauf(trial);
                 break;
             case RELFRQIMGAREA:
                 break;
@@ -180,11 +190,16 @@ public static void analyse() {
             controller.analysedImage.setImage(new Image(analysedImage));
             controller.exportButton.setDisable(false);
             controller.exportRawButton.setDisable(false);
+        } else if (lineChartSeries != null) {
+            controller.chartPane.getChildren().clear();
+            controller.chartPane.getChildren().addAll(lineChartSeries);
+            controller.exportButton.setDisable(false);
+            controller.exportRawButton.setDisable(false);
         }
     }
 
     /**
-     * Exportiert erstelltes Bild.
+     * Exportiert erstelltes Bild oder Diagramm.
      */
     public static void export() {
         FileChooser fileChooser = new FileChooser();
@@ -192,22 +207,24 @@ public static void export() {
         fileChooser.getExtensionFilters().add(
                 new ExtensionFilter("PNG Image", "*.png"));
 
-        // Dateipfad als String speichern und json laden
+        // Dateipfad als String speichern
         String location = fileChooser.showSaveDialog(Main.primaryStage).getAbsolutePath();
         if (location != null) {
-            Thread taskThread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    if (saveImage(location)) {
-                        Platform.runLater(() -> controller.setExportStatus(
-                                    String.format("Bild unter %s gesepeichert", location)));
-                    } else {
-                        Platform.runLater(() -> controller.setExportStatus(
-                                "Bild konnte nicht gespeichert werden"));
-                    }
+            if (analyseType.equals(AnalyseType.HEATPMAP)) {
+                if (saveImage(location)) {
+                    controller.setExportStatus(
+                            String.format("Bild unter %s gesepeichert", location));
+                } else {
+                    controller.setExportStatus("Bild konnte nicht gespeichert werden");
+                }
+            } else if (analyseType.equals(AnalyseType.VERLAUF)) {
+                if (saveAsPng(location)) {
+                    controller.setExportStatus(String.format(
+                            "Diagramm unter %s gesepeichert", location));
+                } else {
+                    controller.setExportStatus("Diagramm konnte nicht gespeichert werden");
                 }
-            });
-            taskThread.start();
+            }
         }
     }
 
@@ -231,6 +248,27 @@ private static boolean saveImage(String location) {
         return true;
     }
 
+    // TODO: in util verschieben?
+    /**
+     * Speichert Diagramm als Bild unter location.
+     *
+     * @param location - Speicherort
+     * @return Erfolgsboolean
+     */
+    private static boolean saveAsPng(String location) {
+        WritableImage image = controller.chartPane.snapshot(new SnapshotParameters(), null);
+
+        File file = new File(location);
+
+        try {
+            ImageIO.write(SwingFXUtils.fromFXImage(image, null), "png", file);
+        } catch (IOException e) {
+            Logger.error("Failed to save Snapshot", e, true);
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Setzt Analyse zurück.
      */
@@ -245,11 +283,13 @@ public static void reset() {
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
         controller.errorLabel.setVisible(false);
+        controller.chartPane.getChildren().clear();
         Analyzer.analyseType = null;
         Analyzer.trial = null;
         Analyzer.trialComp = null;
         Analyzer.hmConfig = new HeatmapConfig();
         Analyzer.diaConfig = new DiagramConfig();
         Analyzer.analysedImage = null;
+        Analyzer.lineChartSeries = null;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index 82c0217..411b33a 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuButton;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
 
 /**
  * Kontroller für {@link Analyzer}.
@@ -24,6 +25,8 @@ public class AnalyzerController extends AbsSceneController {
     @FXML
     protected Button backButton;
     @FXML
+    protected Pane chartPane;
+    @FXML
     protected Button configButton;
     @FXML
     protected Label errorLabel;
@@ -129,6 +132,8 @@ protected void initialize() {
                 : "fx:id=\"analysedImage\" not injected: check 'Analyzer.fxml'.";
         assert backButton != null
                 : "fx:id=\"backButton\" was injected: check 'Analyzer.fxml'.";
+        assert chartPane != null
+                : "fx:id=\"chartPane\" was injected: check 'Analyzer.fxml'.";
         assert configButton != null
                 : "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
         assert errorLabel != null
diff --git a/src/main/java/github/weichware10/analyse/logic/Verlauf.java b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
index 1281d64..5f68b27 100644
--- a/src/main/java/github/weichware10/analyse/logic/Verlauf.java
+++ b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
@@ -1,42 +1,79 @@
 package github.weichware10.analyse.logic;
 
+import github.weichware10.analyse.Main;
+import github.weichware10.util.Logger;
+import github.weichware10.util.ToolType;
+import github.weichware10.util.config.Configuration;
+import github.weichware10.util.data.DataPoint;
 import github.weichware10.util.data.TrialData;
-import java.util.List;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+import javafx.scene.image.Image;
 
 /**
  * verantwortlich für die Erstellung des Verlauf-Diagramms.
  */
-public class Verlauf extends Analyse {
-    private final TrialData data;
+public class Verlauf {
 
     /**
-     * verantwortlich für die Erstellung des Verlauf-Diagramms.
+     * Erstellt Verlauf-Liniendiagramm.
      *
-     * @param data - Daten die zur Erstellung des Diagramms benötigt werden
+     * @param trial - Versuch
      */
-    public Verlauf(TrialData data) {
-        this.data = data;
-    }
+    public static LineChart<Number, Number> createVerlauf(TrialData trial) {
+        Configuration config = Main.dataBaseClient.configurations.get(trial.configId);
 
-    /**
-     * erstellt Diagramm, welches den Verlauf der betrachteten Bildkoordinaten
-     * darstellt.
-     *
-     * @return Pfad des Bildes des erstellten Diagramms
-     */
-    public String createVerlauf() {
-        return drawDiagramm(null);
-    }
+        // Bild laden für Bildbreite und -höhe
+        String imageUrl = Analyse.saveImage(config.getImageUrl());
+        Image image = null;
+        try {
+            image = new Image(imageUrl);
+        } catch (Exception e) {
+            Logger.error("Failed to save the image", e, true);
+            return null;
+        }
 
-    /**
-     * zeichnet das Diagramm.
-     *
-     * @param diagrammData - Daten die zur Erstellung des Diagramms benötigt werden
-     * @return Pfad des Bildes des erstellten Diagramms
-     */
-    private String drawDiagramm(List<List<Float>> diagrammData) {
-        return ".../verlauf/VERLAUF_" + this.data.toolType.toString()
-            + "_" + this.data.trialId + ".jpg";
-    }
+        int width = (int) image.getWidth();
+        int height = (int) image.getHeight();
+
+        // Liniendiagramm erstellen
+        final NumberAxis xAxis = new NumberAxis();
+        final NumberAxis yAxis = new NumberAxis();
+        xAxis.setLabel("Zeit in s");
+        yAxis.setLabel("relDepth");
+        final LineChart<Number, Number> lineChart =
+                new LineChart<Number, Number>(xAxis, yAxis);
+        lineChart.setTitle(String.format("Verlauf %s", trial.toolType.toString()));
+
+        // Graph für Liniendiagramm erstellen
+        XYChart.Series<Number, Number> series = new XYChart.Series<Number, Number>();
+        series.setName(trial.getTrialId());
 
+        if (trial.toolType == ToolType.ZOOMMAPS) {
+            // Maximale Tiefe ermitteln
+            double maxDepth = Analyse.findMaxDepth(trial.getData(), width, height);
+            for (DataPoint dataPoint : trial.getData()) {
+                // Relative Tiefe berechnen
+                double relDepth = Analyse.calcRelDepthZm(dataPoint.viewport, width,
+                        height, maxDepth);
+
+                // Punkt im Diagramm setzen
+                series.getData().add(
+                        new XYChart.Data<Number, Number>(dataPoint.timeOffset, relDepth));
+            }
+        } else if (trial.toolType == ToolType.CODECHARTS) {
+            for (DataPoint dataPoint : trial.getData()) {
+                // Relative Tiefe berechnen
+                double relDepth = Analyse.calcRelDepthCc((double) dataPoint.depth,
+                        (double) config.getCodeChartsConfiguration().getMaxDepth());
+
+                // Punkt im Diagramm setzen
+                series.getData().add(
+                        new XYChart.Data<Number, Number>(dataPoint.timeOffset / 1000, relDepth));
+            }
+        }
+        lineChart.getData().add(series);
+        return lineChart;
+    }
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
index 934bfc3..33a66bb 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
@@ -7,10 +7,11 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="575.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.AnalyzerController">
+<VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.AnalyzerController">
    <children>
       <HBox alignment="TOP_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
          <children>
@@ -40,7 +41,7 @@
             <Insets />
          </VBox.margin>
       </HBox>
-      <HBox alignment="TOP_CENTER" prefHeight="80.0" prefWidth="200.0">
+      <HBox alignment="TOP_CENTER" prefHeight="18.0" prefWidth="680.0">
          <children>
             <Label fx:id="errorLabel" alignment="CENTER" text="error" textAlignment="CENTER" textFill="RED" visible="false">
                <font>
@@ -51,17 +52,18 @@
       </HBox>
       <HBox alignment="CENTER" prefHeight="347.0" prefWidth="555.0">
          <children>
-            <ImageView fx:id="analysedImage" fitHeight="303.0" fitWidth="555.0" pickOnBounds="true" preserveRatio="true" />
+            <ImageView fx:id="analysedImage" fitHeight="203.0" fitWidth="324.0" pickOnBounds="true" preserveRatio="true" />
+            <Pane fx:id="chartPane" prefHeight="347.0" prefWidth="356.0" />
          </children>
       </HBox>
       <HBox alignment="BOTTOM_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
          <children>
-            <HBox alignment="CENTER_LEFT" prefHeight="33.0" prefWidth="183.0" spacing="15.0">
+            <HBox alignment="BOTTOM_LEFT" prefHeight="90.0" prefWidth="246.0" spacing="15.0">
                <children>
                   <Button fx:id="backButton" mnemonicParsing="false" onAction="#back" text="Zurück" />
                </children>
             </HBox>
-            <HBox alignment="CENTER_RIGHT" prefHeight="33.0" prefWidth="337.0" spacing="15.0">
+            <HBox alignment="BOTTOM_RIGHT" prefHeight="90.0" prefWidth="428.0" spacing="15.0">
                <children>
                   <Button fx:id="exportRawButton" disable="true" mnemonicParsing="false" onAction="#exportRaw" text="ExportRaw" />
                   <Button fx:id="exportButton" disable="true" mnemonicParsing="false" onAction="#export" text="Export" />

From c15879ba7e7ea9bcfd407e5527ebb1a861378900 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 16:59:54 +0100
Subject: [PATCH 79/87] [fix] delete analyse:  RELFRQIMGAREA

---
 .../analyse/enums/DiagrammType.java           |  9 ---
 .../gui/analyse/DiagramConfigurator.java      | 33 ++-------
 .../DiagramConfiguratorController.java        | 16 -----
 .../weichware10/analyse/logic/Diagram.java    | 18 +----
 .../analyse/logic/DiagramTest.java            | 72 -------------------
 5 files changed, 7 insertions(+), 141 deletions(-)
 delete mode 100644 src/main/java/github/weichware10/analyse/enums/DiagrammType.java
 delete mode 100644 src/test/java/github/weichware10/analyse/logic/DiagramTest.java

diff --git a/src/main/java/github/weichware10/analyse/enums/DiagrammType.java b/src/main/java/github/weichware10/analyse/enums/DiagrammType.java
deleted file mode 100644
index 1969cd0..0000000
--- a/src/main/java/github/weichware10/analyse/enums/DiagrammType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package github.weichware10.analyse.enums;
-
-/**
- * Enum der möglichen Diagramm-Typen.
- */
-public enum DiagrammType {
-    RELFRQIMGAREA,
-    VIEWTIMEDISTR
-}
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
index e3ef6dd..28636d6 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfigurator.java
@@ -37,45 +37,20 @@ public static void start(DiagramConfig diaConfig, AnalyseType analyseType) {
         stage.getIcons().add(
                 new Image(Main.class.getResource("app-icon.png").toString()));
 
-        InitResult ir =
-                initialize(DiagramConfigurator.class.getResource("DiagramConfigurator.fxml"));
+        InitResult ir = initialize(
+                DiagramConfigurator.class.getResource("DiagramConfigurator.fxml"));
         root = (VBox) ir.root;
         controller = (DiagramConfiguratorController) ir.controller;
 
-        // Sichtbarkeitseinstellungen
-        if (analyseType == AnalyseType.RELFRQIMGAREA) {
-            controller.amountAreas.setDisable(false);
-            controller.minTimeSlider.setDisable(true);
-            controller.maxTimeSlider.setDisable(true);
-            controller.stepsSlider.setDisable(true);
-            controller.minTimeLabel.setVisible(false);
-            controller.maxTimeLabel.setVisible(false);
-            controller.stepsLabel.setVisible(false);
-        } else if (analyseType == AnalyseType.VIEWTIMEDISTR) {
-            controller.amountAreas.setDisable(true);
-            controller.minTimeSlider.setDisable(false);
-            controller.maxTimeSlider.setDisable(false);
-            controller.stepsSlider.setDisable(false);
-            controller.minTimeLabel.setVisible(true);
-            controller.maxTimeLabel.setVisible(true);
-            controller.stepsLabel.setVisible(true);
-        }
-
         // Beim erneueten Aufrufen bereits gesetzte Konfiguration wieder setzten
-        controller.initAmountBox(diaConfig.getAmountAreas());
         controller.initMinTimeSlider(diaConfig.getMinTime());
         controller.initMaxTimeSlider(diaConfig.getMaxTime());
         controller.initStepsSlider(diaConfig.getStepsBetween());
 
-
         final Button ok = (Button) configDialog.getDialogPane().lookupButton(applyButtonType);
         ok.addEventFilter(ActionEvent.ACTION, applyEvent -> {
-            if (analyseType == AnalyseType.RELFRQIMGAREA) {
-                diaConfig.setAmountAreas(controller.getAmountAreas());
-            } else if (analyseType == AnalyseType.VIEWTIMEDISTR) {
-                diaConfig.setNewTime(controller.getMinTime(), controller.getMaxTime());
-                diaConfig.setStepsBetween(controller.getSteps());
-            }
+            diaConfig.setNewTime(controller.getMinTime(), controller.getMaxTime());
+            diaConfig.setStepsBetween(controller.getSteps());
         });
         configDialog.getDialogPane().setContent(root);
         configDialog.showAndWait();
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
index cf44e5f..df7dc35 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/DiagramConfiguratorController.java
@@ -5,7 +5,6 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
-import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.Slider;
 
@@ -18,8 +17,6 @@ public class DiagramConfiguratorController extends AbsSceneController {
     private double minTime;
     private int steps;
     @FXML
-    protected ComboBox<Integer> amountAreas;
-    @FXML
     protected Slider maxTimeSlider;
     @FXML
     protected Label maxTimeLabel;
@@ -32,13 +29,6 @@ public class DiagramConfiguratorController extends AbsSceneController {
     @FXML
     protected Label stepsLabel;
 
-    protected void initAmountBox(int current) {
-        for (Integer i = 2; i <= 8; i += 2) {
-            amountAreas.getItems().add(i);
-        }
-        amountAreas.setValue(current);
-    }
-
     protected void initMaxTimeSlider(double current) {
         maxTimeSlider.adjustValue(current);
     }
@@ -51,10 +41,6 @@ protected void initStepsSlider(int current) {
         stepsSlider.adjustValue(current);
     }
 
-    public int getAmountAreas() {
-        return amountAreas.getValue();
-    }
-
     public double getMaxTime() {
         return maxTime;
     }
@@ -69,8 +55,6 @@ public int getSteps() {
 
     @FXML
     protected void initialize() {
-        assert amountAreas != null
-                : "fx:id=\"amountAreas\" not injected: check 'DiagramConfigurator.fxml'.";
         assert maxTimeSlider != null
                 : "fx:id=\"maxTime\" not injected: check 'DiagramConfigurator.fxml'.";
         assert maxTimeLabel != null
diff --git a/src/main/java/github/weichware10/analyse/logic/Diagram.java b/src/main/java/github/weichware10/analyse/logic/Diagram.java
index 734a348..1449232 100644
--- a/src/main/java/github/weichware10/analyse/logic/Diagram.java
+++ b/src/main/java/github/weichware10/analyse/logic/Diagram.java
@@ -1,7 +1,6 @@
 package github.weichware10.analyse.logic;
 
 import github.weichware10.analyse.config.DiagramConfig;
-import github.weichware10.analyse.enums.DiagrammType;
 import github.weichware10.util.data.TrialData;
 import java.util.List;
 
@@ -24,16 +23,6 @@ public Diagram(TrialData data, DiagramConfig confDia) {
         this.confDia = confDia;
     }
 
-    /**
-     * erstellt Diagramm, welches die relativen Häufigkeiten pro Bildbereich
-     * darstellt.
-     *
-     * @return Pfad des Bildes des erstellten Diagramms
-     */
-    public String createRelFreqImgArea() {
-        return drawDiagramm(null, DiagrammType.RELFRQIMGAREA);
-    }
-
     /**
      * erstellt Diagramm, welches die relativen Häufigkeiten der Blickedauer bzw.
      * Zoomstärken darstellt.
@@ -41,7 +30,7 @@ public String createRelFreqImgArea() {
      * @return Pfad des Bildes des erstellten Diagramms
      */
     public String createViewTimeDistr() {
-        return drawDiagramm(null, DiagrammType.VIEWTIMEDISTR);
+        return drawDiagramm(null);
     }
 
     /**
@@ -62,9 +51,8 @@ private List<Float> calcViewTimeDistr(List<List<Float>> timeTableData) {
      * @param type         - Diagramm-Typ des zu erstellenden Diagramms
      * @return Pfad des Bildes des erstellten Diagramms
      */
-    private String drawDiagramm(List<Float> diagrammData, DiagrammType type) {
-        return ".../diagramm/" + type + "_" + this.data.toolType.toString()
-                + "_" + this.data.trialId + ".jpg";
+    private String drawDiagramm(List<Float> diagrammData) {
+        return null;
     }
 
 }
diff --git a/src/test/java/github/weichware10/analyse/logic/DiagramTest.java b/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
deleted file mode 100644
index 3481b56..0000000
--- a/src/test/java/github/weichware10/analyse/logic/DiagramTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package github.weichware10.analyse.logic;
-
-import static org.junit.Assert.assertEquals;
-
-import github.weichware10.analyse.config.DiagramConfig;
-import github.weichware10.util.ToolType;
-import github.weichware10.util.data.TrialData;
-import org.junit.Test;
-
-/**
- * Unit Test für Klasse Diagramm.
- */
-public class DiagramTest {
-    /**
-     * Testet, ob String erstellt und ausgegeben wird.
-     */
-    @Test
-    public void createRelFreqImgAreaShouldWork() {
-        Diagram dia1 = new Diagram(
-                new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new DiagramConfig());
-        assertEquals(
-                "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_ZOOMMAPS_1 zurückgeben",
-                ".../diagramm/RELFRQIMGAREA_ZOOMMAPS_1.jpg",
-                dia1.createRelFreqImgArea());
-
-        Diagram dia2 = new Diagram(
-                new TrialData(ToolType.EYETRACKING, "5", "3"),
-                new DiagramConfig());
-        assertEquals(
-                "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_EYETRACKING_5 zurückgeben",
-                ".../diagramm/RELFRQIMGAREA_EYETRACKING_5.jpg",
-                dia2.createRelFreqImgArea());
-
-        Diagram dia3 = new Diagram(
-                new TrialData(ToolType.CODECHARTS, "132", "3"),
-                new DiagramConfig());
-        assertEquals(
-                "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_CODECHARTS_132 zurückgeben",
-                ".../diagramm/RELFRQIMGAREA_CODECHARTS_132.jpg",
-                dia3.createRelFreqImgArea());
-    }
-
-    /**
-     * Testet, ob String erstellt und ausgegeben wird.
-     */
-    @Test
-    public void createViewTimeDistrSouldWork() {
-        Diagram dia1 = new Diagram(
-                new TrialData(ToolType.ZOOMMAPS, "1", "3"),
-                new DiagramConfig());
-        assertEquals("createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_ZOOMMAPS_1 zurückgeben",
-                ".../diagramm/VIEWTIMEDISTR_ZOOMMAPS_1.jpg",
-                dia1.createViewTimeDistr());
-
-        Diagram dia2 = new Diagram(
-                new TrialData(ToolType.EYETRACKING, "5", "3"),
-                new DiagramConfig());
-        assertEquals(
-                "createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_EYETRACKING_5 zurückgeben",
-                ".../diagramm/VIEWTIMEDISTR_EYETRACKING_5.jpg",
-                dia2.createViewTimeDistr());
-
-        Diagram dia3 = new Diagram(
-                new TrialData(ToolType.CODECHARTS, "132", "3"),
-                new DiagramConfig());
-        assertEquals(
-                "createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_CODECHARTS_132 zurückgeben",
-                ".../diagramm/VIEWTIMEDISTR_CODECHARTS_132.jpg",
-                dia3.createViewTimeDistr());
-    }
-}

From 5f5844fc3271ba5c28a0e9520060f2149655b26c Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 17:01:15 +0100
Subject: [PATCH 80/87] [fix] delete amountAreas from fxml

---
 .../analyse/gui/analyse/DiagramConfigurator.fxml          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
index 8bc677c..28efa35 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/DiagramConfigurator.fxml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Slider?>
 <?import javafx.scene.layout.HBox?>
@@ -15,12 +14,7 @@
             <Font size="16.0" />
          </font>
       </Label>
-      <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
-         <children>
-            <Label alignment="CENTER" text="Anzahl Bereiche" />
-            <ComboBox fx:id="amountAreas" prefWidth="75.0" />
-         </children>
-      </HBox>
+      <HBox prefHeight="0.0" prefWidth="280.0" />
       <HBox alignment="CENTER_LEFT" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="30.0" prefWidth="200.0" spacing="10.0">
          <children>
             <Label text="Minimale Zeit" />

From 4bbfaf6d116649d759c8581e6752ab8f088ced26 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 17:04:35 +0100
Subject: [PATCH 81/87] [feat] analysis result in pane + status label +
 rawExport + RELDEPTHDISTR

---
 .../analyse/enums/AnalyseType.java            |   3 +-
 .../analyse/gui/analyse/Analyzer.java         | 104 +++++++++++++-----
 .../gui/analyse/AnalyzerController.java       |  36 +++---
 .../analyse/gui/analyse/Analyzer.fxml         |  20 ++--
 4 files changed, 99 insertions(+), 64 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/enums/AnalyseType.java b/src/main/java/github/weichware10/analyse/enums/AnalyseType.java
index 8887fa0..77deb86 100644
--- a/src/main/java/github/weichware10/analyse/enums/AnalyseType.java
+++ b/src/main/java/github/weichware10/analyse/enums/AnalyseType.java
@@ -7,6 +7,5 @@ public enum AnalyseType {
     HEATPMAP,
     COMPHEATMAP,
     VERLAUF,
-    RELFRQIMGAREA,
-    VIEWTIMEDISTR
+    RELDEPTHDISTR
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index d08ae5d..c30df41 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -13,11 +13,13 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import javafx.application.Platform;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.Parent;
 import javafx.scene.SnapshotParameters;
 import javafx.scene.chart.LineChart;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.image.WritableImage;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
@@ -35,8 +37,8 @@ public class Analyzer extends AbsScene {
     private static TrialData trialComp;
     private static HeatmapConfig hmConfig = new HeatmapConfig();
     private static DiagramConfig diaConfig = new DiagramConfig();
-    private static String analysedImage;
-    private static LineChart<Number, Number> lineChartSeries;
+    private static String heatmapImage;
+    private static LineChart<Number, Number> verlaufLineChart;
 
     /**
      * Startet die App.
@@ -68,12 +70,12 @@ public static void setAnalyseType(AnalyseType analyseType) {
         diaConfig = new DiagramConfig();
 
         controller.errorLabel.setVisible(false);
-        controller.analysedImage.setImage(null);
+        controller.statusLabel.setVisible(false);
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
-        controller.chartPane.getChildren().clear();
-        analysedImage = null;
-        lineChartSeries = null;
+        controller.analysePane.getChildren().clear();
+        heatmapImage = null;
+        verlaufLineChart = null;
 
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
             trialComp = null;
@@ -105,12 +107,12 @@ public static void setTrialId() {
                 controller.selectCompTrialButton.setVisible(false);
                 controller.analyseTypMenuButton.setText("Analyse-Typ");
                 controller.errorLabel.setVisible(false);
-                controller.analysedImage.setImage(null);
+                controller.statusLabel.setVisible(false);
                 controller.exportButton.setDisable(true);
                 controller.exportRawButton.setDisable(true);
-                controller.chartPane.getChildren().clear();
-                analysedImage = null;
-                lineChartSeries = null;
+                controller.analysePane.getChildren().clear();
+                heatmapImage = null;
+                verlaufLineChart = null;
                 hmConfig = new HeatmapConfig();
                 diaConfig = new DiagramConfig();
             }
@@ -141,13 +143,13 @@ public static void setTrialIdComp() {
      */
     public static void setConfig() {
         controller.errorLabel.setVisible(false);
+        controller.statusLabel.setVisible(false);
 
         if (analyseType == AnalyseType.COMPHEATMAP
                 || analyseType == AnalyseType.HEATPMAP) {
             HeatmapConfigurator.start(hmConfig);
             Logger.info("Start Heatmap Configurator");
-        } else if (analyseType == AnalyseType.RELFRQIMGAREA
-                || analyseType == AnalyseType.VIEWTIMEDISTR) {
+        } else if (analyseType == AnalyseType.RELDEPTHDISTR) {
             DiagramConfigurator.start(diaConfig, analyseType);
             Logger.info("Start Diagram Configurator");
         }
@@ -166,33 +168,46 @@ public static void analyse() {
                 diaConfig.toString());
         Logger.info(output);
 
-        controller.errorLabel.setVisible(false);
+        controller.statusLabel.setVisible(false);
 
         switch (analyseType) {
             case HEATPMAP:
-                analysedImage = Heatmap.createHeatmap(trial, hmConfig);
+                heatmapImage = Heatmap.createHeatmap(trial, hmConfig);
                 break;
             case COMPHEATMAP:
-                analysedImage = Heatmap.createHeatmapComp(trial, trialComp, hmConfig);
+                heatmapImage = Heatmap.createHeatmapComp(trial, trialComp, hmConfig);
                 break;
             case VERLAUF:
-                lineChartSeries = Verlauf.createVerlauf(trial);
-                break;
-            case RELFRQIMGAREA:
+                verlaufLineChart = Verlauf.createVerlauf(trial);
                 break;
-            case VIEWTIMEDISTR:
+            case RELDEPTHDISTR:
                 break;
             default:
                 // sollte niemals eintreten
                 break;
         }
-        if (analysedImage != null) {
-            controller.analysedImage.setImage(new Image(analysedImage));
+        if (heatmapImage != null) {
+            // Pane leeren
+            controller.analysePane.getChildren().clear();
+
+            // ImageView mit Heatmap setzen
+            ImageView imageView = new ImageView(new Image(heatmapImage));
+            imageView.setFitWidth(680.0f);
+            imageView.setFitHeight(405.0f);
+            imageView.setPreserveRatio(true);
+            controller.analysePane.getChildren().addAll(imageView);
+
+            // Export aktivieren
             controller.exportButton.setDisable(false);
             controller.exportRawButton.setDisable(false);
-        } else if (lineChartSeries != null) {
-            controller.chartPane.getChildren().clear();
-            controller.chartPane.getChildren().addAll(lineChartSeries);
+        } else if (verlaufLineChart != null) {
+            // Pane leeren
+            controller.analysePane.getChildren().clear();
+
+            // LineChart vom Verlauf setzen
+            controller.analysePane.getChildren().addAll(verlaufLineChart);
+
+            // Export aktivieren
             controller.exportButton.setDisable(false);
             controller.exportRawButton.setDisable(false);
         }
@@ -238,7 +253,7 @@ public static void export() {
     private static boolean saveImage(String location) {
         BufferedImage image = null;
         try {
-            image = ImageIO.read(new File(analysedImage));
+            image = ImageIO.read(new File(heatmapImage));
             ImageIO.write(image, "png", new File(location));
         } catch (IOException e) {
             Logger.error("Failed to save image", e, true);
@@ -256,7 +271,7 @@ private static boolean saveImage(String location) {
      * @return Erfolgsboolean
      */
     private static boolean saveAsPng(String location) {
-        WritableImage image = controller.chartPane.snapshot(new SnapshotParameters(), null);
+        WritableImage image = controller.analysePane.snapshot(new SnapshotParameters(), null);
 
         File file = new File(location);
 
@@ -269,6 +284,35 @@ private static boolean saveAsPng(String location) {
         return true;
     }
 
+    /**
+     * Export von Raw-Daten des Versuchs.
+     */
+    public static void exportRaw() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Versuchs-Daten speichern unter");
+        fileChooser.getExtensionFilters().add(
+                new ExtensionFilter("JSON File", "*.json"));
+
+        // Dateipfad als String speichern und json laden
+        String location = fileChooser.showSaveDialog(Main.primaryStage).getAbsolutePath();
+        if (location != null) {
+            Thread taskThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    if (TrialData.toJson(location, trial)) {
+                        Platform.runLater(() -> controller.setExportStatus(
+                                String.format("Versuchs-Daten unter %s gespeichert", location)));
+                    } else {
+                        Platform.runLater(() -> controller.setExportStatus(
+                                "Versuchs-Daten konnten nicht gespeichert werden"));
+                    }
+                }
+            });
+            taskThread.start();
+        }
+
+    }
+
     /**
      * Setzt Analyse zurück.
      */
@@ -279,17 +323,17 @@ public static void reset() {
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
         controller.selectCompTrialButton.setVisible(false);
-        controller.analysedImage.setImage(null);
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
         controller.errorLabel.setVisible(false);
-        controller.chartPane.getChildren().clear();
+        controller.statusLabel.setVisible(false);
+        controller.analysePane.getChildren().clear();
         Analyzer.analyseType = null;
         Analyzer.trial = null;
         Analyzer.trialComp = null;
         Analyzer.hmConfig = new HeatmapConfig();
         Analyzer.diaConfig = new DiagramConfig();
-        Analyzer.analysedImage = null;
-        Analyzer.lineChartSeries = null;
+        Analyzer.heatmapImage = null;
+        Analyzer.verlaufLineChart = null;
     }
 }
diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index 411b33a..6564cd6 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -8,7 +8,6 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuButton;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.Pane;
 
 /**
@@ -19,14 +18,12 @@ public class AnalyzerController extends AbsSceneController {
     @FXML
     protected Button analyseButton;
     @FXML
-    protected MenuButton analyseTypMenuButton;
+    protected Pane analysePane;
     @FXML
-    protected ImageView analysedImage;
+    protected MenuButton analyseTypMenuButton;
     @FXML
     protected Button backButton;
     @FXML
-    protected Pane chartPane;
-    @FXML
     protected Button configButton;
     @FXML
     protected Label errorLabel;
@@ -36,6 +33,8 @@ public class AnalyzerController extends AbsSceneController {
     protected Button exportRawButton;
     @FXML
     protected Button selectCompTrialButton;
+    @FXML
+    protected Label statusLabel;
 
     @FXML
     protected void analyze(ActionEvent event) {
@@ -54,7 +53,7 @@ void export(ActionEvent event) {
 
     @FXML
     void exportRaw(ActionEvent event) {
-        // TODO: ExportRaw (Was sollte hier ausgegeben werden?)
+        Analyzer.exportRaw();
     }
 
     @FXML
@@ -91,12 +90,12 @@ protected void setHeatmap(ActionEvent event) {
     }
 
     @FXML
-    protected void setRelFrqImgArea(ActionEvent event) {
+    protected void setRelDepthDistr(ActionEvent event) {
         configButton.setDisable(false);
         analyseButton.setDisable(false);
         selectCompTrialButton.setVisible(false);
-        Analyzer.setAnalyseType(AnalyseType.RELFRQIMGAREA);
-        analyseTypMenuButton.setText("Häufigkeitsverteilung Bildbereiche");
+        Analyzer.setAnalyseType(AnalyseType.RELDEPTHDISTR);
+        analyseTypMenuButton.setText("Verteilung Relative Tiefe");
     }
 
     @FXML
@@ -108,18 +107,9 @@ protected void setVerlauf(ActionEvent event) {
         analyseTypMenuButton.setText("Verlauf");
     }
 
-    @FXML
-    protected void setViewTimeDistr(ActionEvent event) {
-        configButton.setDisable(false);
-        analyseButton.setDisable(false);
-        selectCompTrialButton.setVisible(false);
-        Analyzer.setAnalyseType(AnalyseType.VIEWTIMEDISTR);
-        analyseTypMenuButton.setText("Verteilung Betrachtungszeit");
-    }
-
     protected void setExportStatus(String text) {
-        errorLabel.setText(text);
-        errorLabel.setVisible(true);
+        statusLabel.setText(text);
+        statusLabel.setVisible(true);
     }
 
     @FXML
@@ -128,11 +118,9 @@ protected void initialize() {
                 : "fx:id=\"analyseButton\" not injected: check 'Analyzer.fxml'.";
         assert analyseTypMenuButton != null
                 : "fx:id=\"analyseTypMenuButton\" not injected: check 'Analyzer.fxml'.";
-        assert analysedImage != null
-                : "fx:id=\"analysedImage\" not injected: check 'Analyzer.fxml'.";
         assert backButton != null
                 : "fx:id=\"backButton\" was injected: check 'Analyzer.fxml'.";
-        assert chartPane != null
+        assert analysePane != null
                 : "fx:id=\"chartPane\" was injected: check 'Analyzer.fxml'.";
         assert configButton != null
                 : "fx:id=\"configButton\" not injected: check 'Analyzer.fxml'.";
@@ -144,6 +132,8 @@ protected void initialize() {
                 : "fx:id=\"exportRawButton\" not injected: check 'Analyzer.fxml'.";
         assert selectCompTrialButton != null
                 : "fx:id=\"selectCompTrialButton\" not injected: check 'Analyzer.fxml'.";
+        assert statusLabel != null
+                : "fx:id=\"statusLabel\" not injected: check 'Analyzer.fxml'.";
     }
 
 }
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
index 33a66bb..8995757 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
@@ -5,7 +5,6 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
@@ -13,7 +12,7 @@
 
 <VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="github.weichware10.analyse.gui.analyse.AnalyzerController">
    <children>
-      <HBox alignment="TOP_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
+      <HBox alignment="TOP_CENTER" prefHeight="38.0" prefWidth="680.0" spacing="15.0">
          <children>
             <HBox prefHeight="46.0" prefWidth="543.0" spacing="15.0">
                <children>
@@ -23,8 +22,7 @@
                       <MenuItem mnemonicParsing="false" onAction="#setHeatmap" text="Heatmap" />
                       <MenuItem mnemonicParsing="false" onAction="#setCompHeatmap" text="Heatmap Vergleich" />
                         <MenuItem mnemonicParsing="false" onAction="#setVerlauf" text="Verlauf" />
-                        <MenuItem mnemonicParsing="false" onAction="#setRelFrqImgArea" text="Häufigkeitsverteilung Bildbereiche" />
-                        <MenuItem mnemonicParsing="false" onAction="#setViewTimeDistr" text="Verteilung Betrachtungszeit" />
+                        <MenuItem mnemonicParsing="false" onAction="#setRelDepthDistr" text="Verteilung Relative Tiefe" />
                     </items>
                   </MenuButton>
                   <Button fx:id="configButton" disable="true" mnemonicParsing="false" onAction="#setConfig" text="Konfiguration" />
@@ -41,7 +39,7 @@
             <Insets />
          </VBox.margin>
       </HBox>
-      <HBox alignment="TOP_CENTER" prefHeight="18.0" prefWidth="680.0">
+      <HBox alignment="CENTER" prefHeight="29.0" prefWidth="680.0">
          <children>
             <Label fx:id="errorLabel" alignment="CENTER" text="error" textAlignment="CENTER" textFill="RED" visible="false">
                <font>
@@ -50,13 +48,17 @@
             </Label>
          </children>
       </HBox>
-      <HBox alignment="CENTER" prefHeight="347.0" prefWidth="555.0">
+      <HBox alignment="CENTER" prefHeight="505.0" prefWidth="680.0">
          <children>
-            <ImageView fx:id="analysedImage" fitHeight="203.0" fitWidth="324.0" pickOnBounds="true" preserveRatio="true" />
-            <Pane fx:id="chartPane" prefHeight="347.0" prefWidth="356.0" />
+            <Pane fx:id="analysePane" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="405.0" prefWidth="680.0" />
          </children>
       </HBox>
-      <HBox alignment="BOTTOM_CENTER" prefHeight="90.0" prefWidth="200.0" spacing="15.0">
+      <HBox alignment="CENTER" prefHeight="22.0" prefWidth="680.0">
+         <children>
+            <Label fx:id="statusLabel" text="status" textAlignment="CENTER" textFill="#2400ff" visible="false" />
+         </children>
+      </HBox>
+      <HBox alignment="BOTTOM_CENTER" prefHeight="29.0" prefWidth="680.0" spacing="15.0">
          <children>
             <HBox alignment="BOTTOM_LEFT" prefHeight="90.0" prefWidth="246.0" spacing="15.0">
                <children>

From 5e0adf60788c49440927d7f74cb4c0f9ae4e551b Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 17:05:24 +0100
Subject: [PATCH 82/87] [fix] x-Label unit fix & zm dots removed

---
 .../java/github/weichware10/analyse/logic/Verlauf.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Verlauf.java b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
index 5f68b27..4eda422 100644
--- a/src/main/java/github/weichware10/analyse/logic/Verlauf.java
+++ b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
@@ -40,7 +40,11 @@ public static LineChart<Number, Number> createVerlauf(TrialData trial) {
         // Liniendiagramm erstellen
         final NumberAxis xAxis = new NumberAxis();
         final NumberAxis yAxis = new NumberAxis();
-        xAxis.setLabel("Zeit in s");
+        if (trial.toolType == ToolType.ZOOMMAPS) {
+            xAxis.setLabel("Zeit in ms");
+        } else {
+            xAxis.setLabel("Zeit in s");
+        }
         yAxis.setLabel("relDepth");
         final LineChart<Number, Number> lineChart =
                 new LineChart<Number, Number>(xAxis, yAxis);
@@ -51,6 +55,7 @@ public static LineChart<Number, Number> createVerlauf(TrialData trial) {
         series.setName(trial.getTrialId());
 
         if (trial.toolType == ToolType.ZOOMMAPS) {
+            lineChart.setCreateSymbols(false);
             // Maximale Tiefe ermitteln
             double maxDepth = Analyse.findMaxDepth(trial.getData(), width, height);
             for (DataPoint dataPoint : trial.getData()) {

From 73d237f469cdbe242544219ffa08eff562c7cfdb Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 17:21:59 +0100
Subject: [PATCH 83/87] [feat] save heatmap in thread

---
 .../analyse/gui/analyse/Analyzer.java         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
index c30df41..ba3d5ac 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java
@@ -226,12 +226,19 @@ public static void export() {
         String location = fileChooser.showSaveDialog(Main.primaryStage).getAbsolutePath();
         if (location != null) {
             if (analyseType.equals(AnalyseType.HEATPMAP)) {
-                if (saveImage(location)) {
-                    controller.setExportStatus(
-                            String.format("Bild unter %s gesepeichert", location));
-                } else {
-                    controller.setExportStatus("Bild konnte nicht gespeichert werden");
-                }
+                Thread taskThread = new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (saveImage(location)) {
+                            Platform.runLater(() -> controller.setExportStatus(
+                                    String.format("Bild unter %s gesepeichert", location)));
+                        } else {
+                            Platform.runLater(() -> controller.setExportStatus(
+                                    "Bild konnte nicht gespeichert werden"));
+                        }
+                    }
+                });
+                taskThread.start();
             } else if (analyseType.equals(AnalyseType.VERLAUF)) {
                 if (saveAsPng(location)) {
                     controller.setExportStatus(String.format(

From 6f9935356a2c26c831cc59d4dbb01874bee84cd3 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 17:22:18 +0100
Subject: [PATCH 84/87] [fix] pane -> stackpane for alignment

---
 .../weichware10/analyse/gui/analyse/AnalyzerController.java   | 4 ++--
 .../github/weichware10/analyse/gui/analyse/Analyzer.fxml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
index 6564cd6..fde23df 100644
--- a/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
+++ b/src/main/java/github/weichware10/analyse/gui/analyse/AnalyzerController.java
@@ -8,7 +8,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuButton;
-import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
 
 /**
  * Kontroller für {@link Analyzer}.
@@ -18,7 +18,7 @@ public class AnalyzerController extends AbsSceneController {
     @FXML
     protected Button analyseButton;
     @FXML
-    protected Pane analysePane;
+    protected StackPane analysePane;
     @FXML
     protected MenuButton analyseTypMenuButton;
     @FXML
diff --git a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
index 8995757..32d92df 100644
--- a/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
+++ b/src/main/resources/github/weichware10/analyse/gui/analyse/Analyzer.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
@@ -50,7 +50,7 @@
       </HBox>
       <HBox alignment="CENTER" prefHeight="505.0" prefWidth="680.0">
          <children>
-            <Pane fx:id="analysePane" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="405.0" prefWidth="680.0" />
+            <StackPane fx:id="analysePane" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="405.0" prefWidth="680.0" />
          </children>
       </HBox>
       <HBox alignment="CENTER" prefHeight="22.0" prefWidth="680.0">

From 349c209e5a442a50c3cff8b64adc005c6c8e482f Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Tue, 18 Jan 2022 17:36:40 +0100
Subject: [PATCH 85/87] [rework] heatmap

---
 .../weichware10/analyse/logic/Analyse.java    |  23 +++
 .../weichware10/analyse/logic/Heatmap.java    | 193 +++++++-----------
 2 files changed, 101 insertions(+), 115 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Analyse.java b/src/main/java/github/weichware10/analyse/logic/Analyse.java
index 2c90ee2..0e0ecda 100644
--- a/src/main/java/github/weichware10/analyse/logic/Analyse.java
+++ b/src/main/java/github/weichware10/analyse/logic/Analyse.java
@@ -85,4 +85,27 @@ protected static double calcRelDepthZm(Rectangle2D viewport, double imageWidth,
     protected static double calcRelDepthCc(double depth, double maxDepth) {
         return depth / maxDepth;
     }
+
+    /**
+     * Berechnet die Tiefe eines Viewports. Falls min-/maxDepth nicht gegeben sind,
+     * wird die unkorrigierte Tiefe zurückgegeben (Zur Berechnug von min / max Depth)
+     *
+     * @param dataPoint - der betroffene DataPoint
+     * @param imageWidth - die Größe des Bildes
+     * @param imageHeight - die Höhe des Bildes
+     * @param minDepth - die minimale Tiefe, oder {@code null}, falls diese berechnet werden soll
+     * @param maxDepth - die maximale Tiefe, oder {@code null}, falls diese berechnet werden soll
+     * @return die berechnete Tiefe
+     */
+    protected static double calculateDepth(DataPoint dataPoint,
+            double imageWidth, double imageHeight, Double minDepth, Double maxDepth) {
+        double localDepth = 1 - ((dataPoint.viewport.getWidth() * dataPoint.viewport.getHeight())
+                / (imageWidth * imageHeight));
+
+        if (minDepth == null || maxDepth == null) {
+            return localDepth;
+        } else {
+            return (Math.pow(100, (localDepth - minDepth) / (maxDepth - minDepth)) - 1) / 99;
+        }
+    }
 }
diff --git a/src/main/java/github/weichware10/analyse/logic/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
index 90089ea..dc0a45a 100644
--- a/src/main/java/github/weichware10/analyse/logic/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -4,15 +4,17 @@
 import github.weichware10.analyse.config.HeatmapConfig;
 import github.weichware10.util.Files;
 import github.weichware10.util.Logger;
-import github.weichware10.util.ToolType;
 import github.weichware10.util.config.Configuration;
 import github.weichware10.util.data.DataPoint;
 import github.weichware10.util.data.TrialData;
+import java.awt.AlphaComposite;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import javafx.scene.image.Image;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 import javax.imageio.ImageIO;
 
 /**
@@ -20,6 +22,9 @@
  */
 public class Heatmap {
 
+    private static DataPointComparator comparator = new DataPointComparator();
+
+
     /**
      * Erstellt Heatmap.
      *
@@ -31,10 +36,10 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
         Configuration config = Main.dataBaseClient.configurations.get(trial.configId);
 
         // Bild laden für Bildbreite und -höhe
-        String imageUrl = Analyse.saveImage(config.getImageUrl());
-        Image image = null;
+        String sourceImgLocation = Analyse.saveImage(config.getImageUrl());
+        BufferedImage image = null;
         try {
-            image = new Image(imageUrl);
+            image = ImageIO.read(new File(sourceImgLocation));
         } catch (Exception e) {
             Logger.error("Failed to save the image", e, true);
             return null;
@@ -44,84 +49,41 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
 
         // Heatmap Bild erstellen
         BufferedImage heatmap = null;
-        double opacity;
-
-        // Wenn Versuchs-Bild angezeigt werden soll, dieses als Hintergrund setzen sonst
-        // leerer Hintergrund
-        if (hmConfig.isImage()) {
-            try {
-                heatmap = ImageIO.read(new File(imageUrl));
-            } catch (IOException e) {
-                Logger.error("Failed to load image", e, true);
-            }
-            opacity = 0.5f;
-        } else {
-            heatmap = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            opacity = 1.0f;
+
+        heatmap = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D heatmapGraphics = heatmap.createGraphics();
+        heatmapGraphics.setBackground(new java.awt.Color(1, 1, 1, 0));
+        heatmapGraphics.clearRect(0, 0, width, height);
+
+        // so sortieren, dass immer weiter reingezoomt wird
+        List<DataPoint> sortedDataPoints = trial.getData().stream()
+                .sorted(comparator).collect(Collectors.toList());
+
+        createHeatmapFromData(heatmapGraphics, hmConfig, sortedDataPoints, width, height);
+        heatmapGraphics.dispose();
+
+        // Generierte Heatmap-Bild speichern
+        String heatmapLocation = null;
+        try {
+            heatmapLocation = Files.saveGeneratedImage(heatmap, "HEATMAP" + trial.trialId + ".png");
+        } catch (IllegalArgumentException | IOException e) {
+            Logger.error("Failed to save the image", e, true);
         }
 
-        Graphics2D graphic = heatmap.createGraphics();
-
-        if (trial.toolType == ToolType.ZOOMMAPS) {
-            // Tiefe 0 setzten
-            graphic.setColor(calcColorCc(0.0f, opacity,
-                    hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
-            graphic.fillRect(0, 0, width, height);
-
-            // Maximale Tiefe ermitteln
-            double maxDepth = Analyse.findMaxDepth(
-                    trial.getData(), (double) width, (double) height);
-            double oldRelDepth = 0.0f;
-
-            // Rechtecke der Zooms setzen
-            for (DataPoint dataPoint : trial.getData()) {
-                // Relative Tiefe berechnen
-                double relDepth = Analyse.calcRelDepthZm(dataPoint.viewport, width,
-                        height, maxDepth);
-
-                // Prüfen ob herausgezoomt wurde
-                if (oldRelDepth > relDepth) {
-                    oldRelDepth = relDepth;
-                    continue;
-                }
-                oldRelDepth = relDepth;
-
-                // Rechteck färben und setzten
-                graphic.setColor(calcColorZm(relDepth, 0.1f, hmConfig.getMaxColorDiff()));
-                int minX = (dataPoint.viewport.getMinX() < 0.0f
-                        ? 0 : (int) dataPoint.viewport.getMinX());
-                int minY = (dataPoint.viewport.getMinY() < 0.0f
-                        ? 0 : (int) dataPoint.viewport.getMinY());
-                graphic.fillRect(minX, minY, (int) dataPoint.viewport.getWidth(),
-                        (int) dataPoint.viewport.getHeight());
-            }
-        } else if (trial.toolType == ToolType.CODECHARTS) {
-            // Tiefe 0 setzten
-            graphic.setColor(calcColorCc(0.0f, opacity,
-                    hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
-            graphic.fillRect(0, 0, width, height);
-
-            // Rechtecke der Durchläufe setzen
-            for (DataPoint dataPoint : trial.getData()) {
-                // Relative Tiefe berechnen
-                double relDepth = Analyse.calcRelDepthCc((double) dataPoint.depth,
-                        (double) config.getCodeChartsConfiguration().getMaxDepth());
-
-                // Rechteck färben und setzten
-                graphic.setColor(calcColorCc(relDepth, opacity,
-                        hmConfig.getMinColorDiff(), hmConfig.getMaxColorDiff()));
-                graphic.fillRect((int) dataPoint.viewport.getMinX(),
-                        (int) dataPoint.viewport.getMinY(),
-                        (int) dataPoint.viewport.getWidth(),
-                        (int) dataPoint.viewport.getHeight());
-            }
+        if (image == null || !hmConfig.isImage()) {
+            return heatmapLocation;
         }
-        graphic.dispose();
 
-        // Generierte Heatmap-Bild speichern
+        Graphics2D imageGraphics = image.createGraphics();
+        AlphaComposite acomp = AlphaComposite.getInstance(
+                AlphaComposite.SRC_OVER, .5f);
+        imageGraphics.setComposite(acomp);
+        imageGraphics.drawImage(heatmap, 0, 0, null);
+        imageGraphics.dispose();
+
         String imgLocation = null;
         try {
-            imgLocation = Files.saveGeneratedImage(heatmap, "test.png");
+            imgLocation = Files.saveGeneratedImage(image, "IMGHEATMAP" + trial.trialId + ".png");
         } catch (IllegalArgumentException | IOException e) {
             Logger.error("Failed to save the image", e, true);
         }
@@ -129,45 +91,33 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
         return imgLocation;
     }
 
-    /**
-     * Berechnet neue Farbe anhand der Tiefe (CodeCharts).
-     *
-     * @param relDepth     - relative Tiefe
-     * @param opacity      - Transparenz
-     * @param minColorDiff - minimale Farbe
-     * @param maxColorDiff - maximale Farbe
-     * @return berechnete Farbe (java.awt.Color Color)
-     */
-    private static java.awt.Color calcColorCc(double relDepth, double opacity,
-            javafx.scene.paint.Color minColorDiff,
-            javafx.scene.paint.Color maxColorDiff) {
-        double r = minColorDiff.getRed() * (1.0f - relDepth) + maxColorDiff.getRed() * relDepth;
-        double g = minColorDiff.getGreen() * (1.0f - relDepth) + maxColorDiff.getGreen() * relDepth;
-        double b = minColorDiff.getBlue() * (1.0f - relDepth) + maxColorDiff.getBlue() * relDepth;
-        // Logger.debug(String.format("R:%f, G:%fm B:%f", r, g, b));
-
-        javafx.scene.paint.Color color = new javafx.scene.paint.Color(r, g, b, opacity);
-        return HeatmapConfig.fxToAwtColor(color);
-    }
+    private static void createHeatmapFromData(Graphics2D graphic, HeatmapConfig hmConfig,
+            List<DataPoint> sortedDataPoints, double imageWidth, double imageHeight) {
 
-    /**
-     * Berechnet neue Farbe anhand der Tiefe (ZoomMaps).
-     *
-     * @param relDepth     - relative Tiefe
-     * @param opacity      - Transparenz
-     * @param maxColorDiff - maximale Farbe
-     * @return berechnete Farbe (java.awt.Color Color)
-     */
-    private static java.awt.Color calcColorZm(double relDepth, double opacity,
-            javafx.scene.paint.Color maxColorDiff) {
-        double r = 1.0f * (1.0f - relDepth) + maxColorDiff.getRed() * relDepth;
-        double g = 1.0f * (1.0f - relDepth) + maxColorDiff.getGreen() * relDepth;
-        double b = 1.0f * (1.0f - relDepth) + maxColorDiff.getBlue() * relDepth;
-        double a = opacity * relDepth;
-        // Logger.debug(String.format("R:%f, G:%fm B:%f", r, g, b));
-
-        javafx.scene.paint.Color color = new javafx.scene.paint.Color(r, g, b, a);
-        return HeatmapConfig.fxToAwtColor(color);
+        if (sortedDataPoints.size() == 0) {
+            return;
+        }
+
+        DataPoint minDataPoint = sortedDataPoints.get(0);
+        DataPoint maxDataPoint = sortedDataPoints.get(sortedDataPoints.size() - 1);
+
+        double minDepth = Analyse.calculateDepth(minDataPoint, imageWidth, imageHeight, null, null);
+        double maxDepth = Analyse.calculateDepth(maxDataPoint, imageWidth, imageHeight, null, null);
+
+        Logger.debug(Double.toString(minDepth) + " ... " + Double.toString(maxDepth));
+
+        for (DataPoint dataPoint : sortedDataPoints) {
+            double relDepth = Analyse.calculateDepth(
+                    dataPoint, imageWidth, imageHeight, minDepth, maxDepth);
+            Logger.debug(Double.toString(relDepth));
+            graphic.setColor(HeatmapConfig.fxToAwtColor(hmConfig.getMinColorDiff()
+                    .interpolate(hmConfig.getMaxColorDiff(), relDepth)));
+            graphic.fillRect(
+                    (int) dataPoint.viewport.getMinX(),
+                    (int) dataPoint.viewport.getMinY(),
+                    (int) dataPoint.viewport.getWidth(),
+                    (int) dataPoint.viewport.getHeight());
+        }
     }
 
     /**
@@ -182,4 +132,17 @@ public static String createHeatmapComp(TrialData trial,
             TrialData trialComp, HeatmapConfig hmConfig) {
         return null;
     }
+
+    /**
+     * DataPointComparator.
+     */
+    private static class DataPointComparator implements Comparator<DataPoint> {
+
+        @Override
+        public int compare(DataPoint dp1, DataPoint dp2) {
+            int area1 = (int) (dp1.viewport.getWidth() * dp1.viewport.getHeight());
+            int area2 = (int) (dp2.viewport.getWidth() * dp2.viewport.getHeight());
+            return area2 - area1;
+        }
+    }
 }

From 0e13909d833215e1d73980ff1ffa48b47b16dfa9 Mon Sep 17 00:00:00 2001
From: joshuajeschek <joshua.jeschek@gmail.com>
Date: Tue, 18 Jan 2022 19:40:45 +0100
Subject: [PATCH 86/87] [feat] smoll things

---
 .../weichware10/analyse/logic/Analyse.java    |  1 -
 .../weichware10/analyse/logic/Heatmap.java    |  6 ++--
 .../weichware10/analyse/logic/Verlauf.java    | 35 ++++++++++++++++---
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/main/java/github/weichware10/analyse/logic/Analyse.java b/src/main/java/github/weichware10/analyse/logic/Analyse.java
index 0e0ecda..99cdb23 100644
--- a/src/main/java/github/weichware10/analyse/logic/Analyse.java
+++ b/src/main/java/github/weichware10/analyse/logic/Analyse.java
@@ -70,7 +70,6 @@ protected static double calcRelDepthZm(Rectangle2D viewport, double imageWidth,
 
         // relative Tiefe berechnen
         double relDepth = tempRelDepth / maxDepth;
-        // Logger.debug(relDepth + " " + tempRelDepth);
 
         return relDepth;
     }
diff --git a/src/main/java/github/weichware10/analyse/logic/Heatmap.java b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
index 9766ee9..0b8501f 100644
--- a/src/main/java/github/weichware10/analyse/logic/Heatmap.java
+++ b/src/main/java/github/weichware10/analyse/logic/Heatmap.java
@@ -23,7 +23,7 @@
 public class Heatmap {
 
     private static DataPointComparator comparator = new DataPointComparator();
-
+    private static final float ALPHA = .75f;
 
     /**
      * Erstellt Heatmap.
@@ -75,7 +75,7 @@ public static String createHeatmap(TrialData trial, HeatmapConfig hmConfig) {
 
         Graphics2D imageGraphics = image.createGraphics();
         AlphaComposite acomp = AlphaComposite.getInstance(
-                AlphaComposite.SRC_OVER, .5f);
+                AlphaComposite.SRC_OVER, ALPHA);
         imageGraphics.setComposite(acomp);
         imageGraphics.drawImage(heatmap, 0, 0, null);
         imageGraphics.dispose();
@@ -103,12 +103,10 @@ private static void createHeatmapFromData(Graphics2D graphic, HeatmapConfig hmCo
         double minDepth = Analyse.calculateDepth(minDataPoint, imageWidth, imageHeight, null, null);
         double maxDepth = Analyse.calculateDepth(maxDataPoint, imageWidth, imageHeight, null, null);
 
-        Logger.debug(Double.toString(minDepth) + " ... " + Double.toString(maxDepth));
 
         for (DataPoint dataPoint : sortedDataPoints) {
             double relDepth = Analyse.calculateDepth(
                     dataPoint, imageWidth, imageHeight, minDepth, maxDepth);
-            Logger.debug(Double.toString(relDepth));
             graphic.setColor(HeatmapConfig.fxToAwtColor(hmConfig.getMinColorDiff()
                     .interpolate(hmConfig.getMaxColorDiff(), relDepth)));
             graphic.fillRect(
diff --git a/src/main/java/github/weichware10/analyse/logic/Verlauf.java b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
index 4eda422..89f8d16 100644
--- a/src/main/java/github/weichware10/analyse/logic/Verlauf.java
+++ b/src/main/java/github/weichware10/analyse/logic/Verlauf.java
@@ -6,6 +6,9 @@
 import github.weichware10.util.config.Configuration;
 import github.weichware10.util.data.DataPoint;
 import github.weichware10.util.data.TrialData;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
@@ -16,6 +19,8 @@
  */
 public class Verlauf {
 
+    private static DataPointComparator comparator = new DataPointComparator();
+
     /**
      * Erstellt Verlauf-Liniendiagramm.
      *
@@ -46,8 +51,7 @@ public static LineChart<Number, Number> createVerlauf(TrialData trial) {
             xAxis.setLabel("Zeit in s");
         }
         yAxis.setLabel("relDepth");
-        final LineChart<Number, Number> lineChart =
-                new LineChart<Number, Number>(xAxis, yAxis);
+        final LineChart<Number, Number> lineChart = new LineChart<Number, Number>(xAxis, yAxis);
         lineChart.setTitle(String.format("Verlauf %s", trial.toolType.toString()));
 
         // Graph für Liniendiagramm erstellen
@@ -56,12 +60,20 @@ public static LineChart<Number, Number> createVerlauf(TrialData trial) {
 
         if (trial.toolType == ToolType.ZOOMMAPS) {
             lineChart.setCreateSymbols(false);
+
+            // so sortieren, dass immer weiter reingezoomt wird
+            List<DataPoint> sortedDataPoints = trial.getData().stream()
+                    .sorted(comparator).collect(Collectors.toList());
             // Maximale Tiefe ermitteln
-            double maxDepth = Analyse.findMaxDepth(trial.getData(), width, height);
+            DataPoint minDataPoint = sortedDataPoints.get(0);
+            DataPoint maxDataPoint = sortedDataPoints.get(sortedDataPoints.size() - 1);
+
+            double minDepth = Analyse.calculateDepth(minDataPoint, width, height, null, null);
+            double maxDepth = Analyse.calculateDepth(maxDataPoint, width, height, null, null);
             for (DataPoint dataPoint : trial.getData()) {
                 // Relative Tiefe berechnen
-                double relDepth = Analyse.calcRelDepthZm(dataPoint.viewport, width,
-                        height, maxDepth);
+                double relDepth = Analyse.calculateDepth(
+                        dataPoint, width, height, minDepth, maxDepth);
 
                 // Punkt im Diagramm setzen
                 series.getData().add(
@@ -81,4 +93,17 @@ public static LineChart<Number, Number> createVerlauf(TrialData trial) {
         lineChart.getData().add(series);
         return lineChart;
     }
+
+    /**
+     * DataPointComparator.
+     */
+    private static class DataPointComparator implements Comparator<DataPoint> {
+
+        @Override
+        public int compare(DataPoint dp1, DataPoint dp2) {
+            int area1 = (int) (dp1.viewport.getWidth() * dp1.viewport.getHeight());
+            int area2 = (int) (dp2.viewport.getWidth() * dp2.viewport.getHeight());
+            return area2 - area1;
+        }
+    }
 }

From 397a2119cd280031ebf0c430875c1fbe5c051b60 Mon Sep 17 00:00:00 2001
From: TheDarkDesync <philipmk69@gmail.com>
Date: Tue, 18 Jan 2022 20:47:57 +0100
Subject: [PATCH 87/87] [chore] update util version to v3.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fc3d50..2e2df07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>cc0b84e</version>
+      <version>v3.3</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <dependency>