Changeset 1643d8ed in sasview

Timestamp:

Jun 14, 2017 3:18:03 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:

144ec831

Parents:

2d0e0c1

Message:

code review fixes SASVIEW-594

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (7 diffs)

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

@@ -487 +487 @@
             # Is the parameter checked for fitting?
             value = item.checkState()
-            parameter_name = parameter_name+'.width'
+            parameter_name = parameter_name + '.width'
             if value == QtCore.Qt.Checked:
                 self.parameters_to_fit.append(parameter_name)
@@ -501 +501 @@
                 return
 
-            property_name = str(self._poly_model.headerData(model_column, 1).toPyObject()).lower() # Value, min, max, etc.
-            # print "%s(%s) => %d" % (parameter_name, property_name, value)
             current_details = self.kernel_module.details[parameter_name]
             current_details[model_column-1] = value
@@ -514 +512 @@
                 # Can't be converted properly, bring back the old value and exit
                 return
-            property_name = str(self._poly_model.headerData(model_column, 1).toPyObject()).lower() # Value, min, max, etc.
 
             # Update the sasmodel
@@ -1294 +1291 @@
     def setPolyModelParameters(self, row, param):
         """
-        Creates a checked row of for a polydisperse parameter
+        Creates a checked row for a polydisperse parameter
         """
         # Not suitable for multishell
@@ -1326 +1323 @@
         def updateFunctionCaption(row):
             # Utility function for update of polydispersity function name in the main model
-            param_name = str(self._model_model.item(row, 0).text())# +'.width'
+            param_name = str(self._model_model.item(row, 0).text())
             if param_name !=  param.name:
                 return
@@ -1368 +1365 @@
         if not datafile:
             logging.info("No weight data chosen.")
-            return
+            raise IOError
         values = []
         weights = []
@@ -1386 +1383 @@
             [appendData(line) for line in column_data]
 
+        # If everything went well - update the sasmodel values
         self.disp_model = POLYDISPERSITY_MODELS['array']()
         self.disp_model.set_weights(np.array(values), np.array(weights))