Changeset f41024f in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 26, 2017 3:34:06 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

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:

6fd89d4

Parents:

aae5f4c (diff), 9ea43c82 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of github.com:SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.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.
+        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/UnitTesting/FittingWidgetTest.py

@@ -100 +100 @@
         delegate = fittingWindow.lstPoly.itemDelegate()
         self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 5)
-        self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
+        self.assertEqual(delegate.editableParameters(), [1, 2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
+        self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
+
+    def testSelectMagnetism(self):
+        """
+        Test if models have been loaded properly
+        """
+        fittingWindow =  self.widget
+
+        self.assertIsInstance(fittingWindow.lstMagnetic.itemDelegate(), QtGui.QStyledItemDelegate)
+        #Test loading from json categories
+        fittingWindow.SASModelToQModel("cylinder")
+        mag_index = fittingWindow.lstMagnetic.model().index(0,0)
+        self.assertEqual(str(mag_index.data().toString()), "up:frac_i")
+        mag_index = fittingWindow.lstMagnetic.model().index(1,0)
+        self.assertEqual(str(mag_index.data().toString()), "up:frac_f")
+        mag_index = fittingWindow.lstMagnetic.model().index(2,0)
+        self.assertEqual(str(mag_index.data().toString()), "up:angle")
+        mag_index = fittingWindow.lstMagnetic.model().index(3,0)
+        self.assertEqual(str(mag_index.data().toString()), "M0:sld")
+        mag_index = fittingWindow.lstMagnetic.model().index(4,0)
+        self.assertEqual(str(mag_index.data().toString()), "mtheta:sld")
+        mag_index = fittingWindow.lstMagnetic.model().index(5,0)
+        self.assertEqual(str(mag_index.data().toString()), "mphi:sld")
+        mag_index = fittingWindow.lstMagnetic.model().index(6,0)
+        self.assertEqual(str(mag_index.data().toString()), "M0:sld_solvent")
+        mag_index = fittingWindow.lstMagnetic.model().index(7,0)
+        self.assertEqual(str(mag_index.data().toString()), "mtheta:sld_solvent")
+        mag_index = fittingWindow.lstMagnetic.model().index(8,0)
+        self.assertEqual(str(mag_index.data().toString()), "mphi:sld_solvent")
+
+        # test the delegate a bit
+        delegate = fittingWindow.lstMagnetic.itemDelegate()
+        self.assertEqual(delegate.editableParameters(), [1, 2, 3])
         self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
 

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):