Changeset 7c487846 in sasview for src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py

Timestamp:

Nov 14, 2017 6:04:41 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

fa81e94

Parents:

f1f3e6a

Message:

Fixes to the Invariant perspective

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py

@@ -81 +81 @@
         self.txtQDataErr.setText(self._model.item(WIDGETS.W_INVARIANT_ERR).text())
 
+        # Reset progress counters
+        self.progress_low_qstar = 0.0
+        self.progress_high_qstar = 0.0
+        self.progress_qstar = 100.0
+
         # Low-Q
         if self._model.item(WIDGETS.W_ENABLE_LOWQ).text() == "true":
@@ -147 +152 @@
         if self.progress_qstar == 'error':
             msg += 'Error occurred when computing invariant from data.\n '
-        if self.progress_qstar > 100:
-            msg += "Invariant Q contribution is greater than 100% .\n"
+        try:
+            if float(self.progress_qstar) > 100:
+                msg += "Invariant Q contribution is greater than 100% .\n"
+        except ValueError:
+            # Text message, skip msg update
+            pass
 
         if self.progress_low_qstar == 'error':