Merge branch 'mf2' into mf

EasyScience · Sep 5, 2023 · 0a1f8a6 · 0a1f8a6
2 parents 5d4b520 + ea90e64
commit 0a1f8a6
Show file tree

Hide file tree

Showing 3 changed files with 228 additions and 213 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 This is a test version of EasyDiffraction with improved GUI and overall performance. This version temporarily does not use the EasyScience framework, contains only CrysPy as calculation engine and uses only Lmfit for minimization.  
 
+# Version 0.9.0-alpha4 (27 Aug 2023)
+
+This is a test version of EasyDiffraction with improved GUI and overall performance. This version temporarily does not use the EasyScience framework, contains only CrysPy as calculation engine and uses only Lmfit for minimization.  
+
+# Version 0.9.0-alpha5 (25 Aug 2023)
+
+This is a test version of EasyDiffraction with improved GUI and overall performance. This version temporarily does not use the EasyScience framework, contains only CrysPy as calculation engine and uses only Lmfit for minimization.  
+
 
 # Version 0.8.5-beta (29 Mar 2023)
 

diff --git a/easyDiffractionApp/Gui/Components/GuiTestsController.qml b/easyDiffractionApp/Gui/Components/GuiTestsController.qml
@@ -19,11 +19,14 @@ EaElements.RemoteController {
 
     property int exitCode: 0
     property var res: []
+    property string savedLoggingLevel
 
     Timer {
         running: true
         interval: 1000
         onTriggered: {
+            savedLoggingLevel = EaGlobals.Vars.loggingLevel
+            EaGlobals.Vars.loggingLevel = "Debug"
             runBasicGuiTest()
             processTestResults()
         }
@@ -36,6 +39,7 @@ EaElements.RemoteController {
         onTriggered: {
             console.debug(`Starting forced exit timer`)
             console.debug(`Calling python exit app helper from within QML with code ${exitCode}`)
+            EaGlobals.Vars.loggingLevel = savedLoggingLevel
             Globals.Proxies.main.backendHelpers.exitApp(exitCode)
         }
     }