From 3280f526729084892854d39fa643c54b25cc3ead Mon Sep 17 00:00:00 2001
From: Yannik Schmidt <yannik.schmidt@thermoscan.de>
Date: Fri, 26 Feb 2021 13:01:01 +0100
Subject: [PATCH] improve info outputs

---
 src/main/python/localization/de.py |  4 ++++
 src/main/python/main.py            | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/python/localization/de.py b/src/main/python/localization/de.py
index c195ce6..33dce3a 100644
--- a/src/main/python/localization/de.py
+++ b/src/main/python/localization/de.py
@@ -37,3 +37,7 @@ info_output_path    = "INFO: Output wird gespeichert nach: {}"
 
 # imageutils.py
 info_divergence     = "INFO: Seitenverhältnisabweichung zu A4: {:.2f}%"
+
+success             = "INFO: Fertig."
+testing_input       = "Info: Eingabedatei wird geprüft..."
+testing_input_suc   = "Info: Eingabedatei akzeptiert."
diff --git a/src/main/python/main.py b/src/main/python/main.py
index c52463c..7b7aec4 100755
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -199,11 +199,14 @@ class WidgetGallery(QDialog):
         self.truePath = plot.plot(self.datapoints, path=target,
                             date1=startDateTime,
                             date2=endDateTime,
-                            forcePath=forcePath)
+                            forcePath=forcePath,
+                            qtTextBrowser=self.infoTextBox)
 
         self.buttonGo.setText(self.localization.button_go)
         self.buttonGo.setDisabled(False)
 
+        self.infoTextBox.append(self.localization.success)
+
         doneDialog = QMessageBox(self)
         doneDialog.setAttribute(PyQt5.QtCore.Qt.WA_DeleteOnClose)
         doneDialog.setText(self.localization.done_text)
@@ -222,10 +225,7 @@ class WidgetGallery(QDialog):
         if not self.srcFileString:
             return
 
-        waitDialog = QMessageBox(self)
-        waitDialog.setAttribute(PyQt5.QtCore.Qt.WA_DeleteOnClose)
-        waitDialog.setText(self.localization.wait_dialog_text)
-        waitDialog.show()
+        self.infoTextBox.append(self.localization.testing_input)
 
         try:
             self.datapoints = input_backend.read_in_file(self.srcFileString,
@@ -234,7 +234,6 @@ class WidgetGallery(QDialog):
                                                     plotOutsideHum=False,
                                                     qtTextBrowser=self.infoTextBox)
         except Exception as e:
-            waitDialog.close()
             errorBox = QMessageBox(self)
             errorBox.setAttribute(PyQt5.QtCore.Qt.WA_DeleteOnClose)
             errorBox.setText(self.localization.error_read_in)
@@ -242,7 +241,6 @@ class WidgetGallery(QDialog):
             errorBox.show()
             return
 
-        waitDialog.close()
 
         start = self.datapoints[cp.CFG("plot_temperatur_key")].getFirstTime()
         self.startDateEdit.setDateTime(start)
@@ -258,6 +256,8 @@ class WidgetGallery(QDialog):
         self.startTimeEdit.setDisabled(False)
         self.endTimeEdit.setDisabled(False)
 
+        self.infoTextBox.append(self.localization.testing_input_suc)
+
     def selectTargetFile(self):
         '''Function to select a target-file'''
         self.targetFileString = QFileDialog.getSaveFileName(self,