Changeset 9817207 in sasview

Timestamp:

Nov 23, 2018 8:48:03 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9c05f22

Parents:

72651df

Message:

Added polydisp. and magnetic parameters to the Report Result page.
SASVIEW-1190

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -673 +673 @@
         unit = ""
         if model.item(row, 4+column_shift) is not None:
-            unit = model.item(row, 4+column_shift).text()
-
+            u = model.item(row, 4+column_shift).text()
+            # This isn't a unit if it is a number (polyd./magn.)
+            unit = "" if isNumber(u) else u
         param.append([checkbox_state, param_name, value, "",
-                        [error_state, error_value],
-                        [min_state, min_value],
-                        [max_state, max_value], unit])
+                     [error_state, error_value],
+                     [min_state, min_value],
+                     [max_state, max_value], unit])
 
     return param
+
+def isNumber(s):
+    """
+    Checks if string 's' is an int/float
+    """
+    if s.isdigit():
+        # check int
+        return True
+    else:
+        try:
+            # check float
+            _ = float(s)
+        except ValueError:
+            return False
+    return True
 
 def getOrientationParam(kernel_module=None):

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -3533 +3533 @@
             index = self.theory_item
         params = FittingUtilities.getStandardParam(self._model_model)
+        poly_params = []
+        magnet_params = []
+        if self.chkPolydispersity.isChecked() and self._poly_model.rowCount() > 0:
+            poly_params = FittingUtilities.getStandardParam(self._poly_model)
+        if self.chkMagnetism.isChecked() and self.canHaveMagnetism() and self._magnet_model.rowCount() > 0:
+            magnet_params = FittingUtilities.getStandardParam(self._magnet_model)
         report_logic = ReportPageLogic(self,
                                        kernel_module=self.kernel_module,
                                        data=self.data,
                                        index=index,
-                                       params=params)
+                                       params=params+poly_params+magnet_params)
 
         return report_logic.reportList()