[feat] Heatmap + Verlauf

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,12 +74,19 @@
       <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>
       <groupId>com.github.weichware10</groupId>
       <artifactId>util</artifactId>
-      <version>v3.2</version>
+      <version>v3.3</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
     <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" />

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);
     }
 

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());
+    }
 }

src/main/java/github/weichware10/analyse/enums/AnalyseType.java

@@ -7,6 +7,5 @@ public enum AnalyseType {
     HEATPMAP,
     COMPHEATMAP,
     VERLAUF,
-    RELFRQIMGAREA,
-    VIEWTIMEDISTR
+    RELDEPTHDISTR
 }

src/main/java/github/weichware10/analyse/gui/analyse/Analyzer.java

@@ -5,10 +5,25 @@
 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.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.ImageView;
+import javafx.scene.image.WritableImage;
+import javafx.stage.FileChooser;
+import javafx.stage.FileChooser.ExtensionFilter;
+import javax.imageio.ImageIO;
 
 /**
  * Analysefenster der App.
@@ -22,6 +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 heatmapImage;
+    private static LineChart<Number, Number> verlaufLineChart;
 
     /**
      * Startet die App.
@@ -53,6 +70,12 @@ public static void setAnalyseType(AnalyseType analyseType) {
         diaConfig = new DiagramConfig();
 
         controller.errorLabel.setVisible(false);
+        controller.statusLabel.setVisible(false);
+        controller.exportButton.setDisable(true);
+        controller.exportRawButton.setDisable(true);
+        controller.analysePane.getChildren().clear();
+        heatmapImage = null;
+        verlaufLineChart = null;
 
         if (Analyzer.analyseType != AnalyseType.COMPHEATMAP) {
             trialComp = null;
@@ -83,9 +106,15 @@ public static void setTrialId() {
                 controller.analyseButton.setDisable(true);
                 controller.selectCompTrialButton.setVisible(false);
                 controller.analyseTypMenuButton.setText("Analyse-Typ");
+                controller.errorLabel.setVisible(false);
+                controller.statusLabel.setVisible(false);
+                controller.exportButton.setDisable(true);
+                controller.exportRawButton.setDisable(true);
+                controller.analysePane.getChildren().clear();
+                heatmapImage = null;
+                verlaufLineChart = null;
                 hmConfig = new HeatmapConfig();
                 diaConfig = new DiagramConfig();
-                controller.errorLabel.setVisible(false);
             }
             controller.analyseTypMenuButton.setDisable(false);
             Logger.info("trialId set to " + trial.trialId);
@@ -104,7 +133,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);
         }
     }
@@ -113,12 +142,14 @@ public static void setTrialIdComp() {
      * Setzt die Konfiguration für Heatmap bzw. Diagramm Analyse
      */
     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");
         }
@@ -136,6 +167,157 @@ public static void analyse() {
                 hmConfig.toString(),
                 diaConfig.toString());
         Logger.info(output);
+
+        controller.statusLabel.setVisible(false);
+
+        switch (analyseType) {
+            case HEATPMAP:
+                heatmapImage = Heatmap.createHeatmap(trial, hmConfig);
+                break;
+            case COMPHEATMAP:
+                heatmapImage = Heatmap.createHeatmapComp(trial, trialComp, hmConfig);
+                break;
+            case VERLAUF:
+                verlaufLineChart = Verlauf.createVerlauf(trial);
+                break;
+            case RELDEPTHDISTR:
+                break;
+            default:
+                // sollte niemals eintreten
+                break;
+        }
+        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 (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);
+        }
+    }
+
+    /**
+     * Exportiert erstelltes Bild oder Diagramm.
+     */
+    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
+        String location = fileChooser.showSaveDialog(Main.primaryStage).getAbsolutePath();
+        if (location != null) {
+            if (analyseType.equals(AnalyseType.HEATPMAP)) {
+                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(
+                            "Diagramm unter %s gesepeichert", location));
+                } else {
+                    controller.setExportStatus("Diagramm konnte nicht gespeichert werden");
+                }
+            }
+        }
+    }
+
+    // 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(heatmapImage));
+            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;
+    }
+
+    // TODO: in util verschieben?
+    /**
+     * Speichert Diagramm als Bild unter location.
+     *
+     * @param location - Speicherort
+     * @return Erfolgsboolean
+     */
+    private static boolean saveAsPng(String location) {
+        WritableImage image = controller.analysePane.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;
+    }
+
+    /**
+     * 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();
+        }
+
     }
 
     /**
@@ -148,10 +330,17 @@ public static void reset() {
         controller.exportButton.setDisable(true);
         controller.exportRawButton.setDisable(true);
         controller.selectCompTrialButton.setVisible(false);
+        controller.exportButton.setDisable(true);
+        controller.exportRawButton.setDisable(true);
+        controller.errorLabel.setVisible(false);
+        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.heatmapImage = null;
+        Analyzer.verlaufLineChart = null;
     }
 }