Changeset 02f1d12 in sasview for src

Timestamp:

Oct 25, 2017 9:16:22 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

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:

e00b76e, e4ebcb9

Parents:

f7d14a1

Message:

Magnetism fixes

Made the magnetism parameters editable along with setting the correct parameters for these to be pushed to the calculations.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

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

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

@@ -644 +644 @@
             return
 
-        property_index = self._magnet_model.headerData(1, model_column).toInt()[0]-1 # Value, min, max, etc.
+        # p_i = self._magnet_model.headerData(0,1,2,3,4,5,6,7,8,9,10)
+        property_index = self._magnet_model.headerData(0, 1, model_column).toInt()[0]-1 # Value, min, max, etc.
 
         # Update the parameter value - note: this supports +/-inf as well

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

@@ -219 +219 @@
 
     def editableParameters(self):
-        return [self.mag_min, self.mag_max]
+        return [self.mag_value, self.mag_min, self.mag_max]
 
     def addErrorColumn(self):