Changeset 8222f171 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Sep 5, 2017 4:18:07 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:

9909967

Parents:

4d1eff2

Message:

SASVIEW-625: code review fixes. Corrected handling for cancelling the file open dialog, updated test cases.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 prop)
• FittingWidget.py (modified) (7 diffs)
• UnitTesting/FittingWidgetTest.py (modified) (3 diffs)

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

@@ -39 +39 @@
 from sas.qtgui.Perspectives.Fitting.ViewDelegate import PolyViewDelegate
 from sas.qtgui.Perspectives.Fitting.ViewDelegate import MagnetismViewDelegate
+
 
 TAB_MAGNETISM = 4
@@ -181 +182 @@
         self.page_stack = []
         self.all_data = []
+        # Polydisp widget table default index for function combobox
+        self.orig_poly_index = 3
 
         # Data for chosen model
@@ -1561 +1564 @@
         # For the given row, invoke the "array" combo handler
         array_caption = 'array'
-        self.onPolyComboIndexChange(array_caption, row_index)
+
         # Get the combo box reference
         ind = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_function)
         widget = self.lstPoly.indexWidget(ind)
+
         # Update the combo box so it displays "array"
         widget.blockSignals(True)
@@ -1570 +1574 @@
         widget.blockSignals(False)
 
+        # Invoke the file reader
+        self.onPolyComboIndexChange(array_caption, row_index)
+
     def onPolyComboIndexChange(self, combo_string, row_index):
         """
@@ -1578 +1585 @@
         file_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_function)
         combo_box = self.lstPoly.indexWidget(file_index)
-        orig_index = combo_box.currentIndex()
 
         def updateFunctionCaption(row):
@@ -1599 +1605 @@
                 return
             except IOError:
-                combo_box.setCurrentIndex(orig_index)
+                combo_box.setCurrentIndex(self.orig_poly_index)
                 # Pass for cancel/bad read
                 pass
@@ -1621 +1627 @@
 
         self.iterateOverModel(updateFunctionCaption)
+        self.orig_poly_index = combo_box.currentIndex()
 
     def loadPolydispArray(self, row_index):

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -99 +99 @@
         # test the delegate a bit
         delegate = fittingWindow.lstPoly.itemDelegate()
-        self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 4)
+        self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 5)
         self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
@@ -337 +337 @@
         # Check the poly model
         self.assertEqual(self.widget._poly_model.rowCount(), 4)
-        self.assertEqual(self.widget._poly_model.columnCount(), 7)
+        self.assertEqual(self.widget._poly_model.columnCount(), 8)
 
         # Test the header
-        self.assertEqual(self.widget.lstPoly.horizontalHeader().count(), 7)
+        self.assertEqual(self.widget.lstPoly.horizontalHeader().count(), 8)
         self.assertFalse(self.widget.lstPoly.horizontalHeader().stretchLastSection())
 
@@ -346 +346 @@
         for row in xrange(self.widget._poly_model.rowCount()):
             func_index = self.widget._poly_model.index(row, 6)
-            #self.assertTrue(isinstance(self.widget.lstPoly.indexWidget(func_index), QtGui.QComboBox))
+            self.assertTrue(isinstance(self.widget.lstPoly.indexWidget(func_index), QtGui.QComboBox))
             self.assertIn('Distribution of', self.widget._poly_model.item(row, 0).text())
         #self.widget.close()