Changeset f7d14a1 in sasview

Timestamp:

Oct 25, 2017 4:23:01 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:

dc57b4f, 02f1d12, fca1f50

Parents:

d3475fe

Message:

Fixed failing unit tests

Location:

src/sas

Files:

• _config.py (modified) (1 diff)
• qtgui/MainWindow/UnitTesting/DataExplorerTest.py (modified) (2 diffs)
• qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)
• qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (3 diffs)

src/sas/_config.py

@@ -110 +110 @@
         try:
             module = load_module_from_path('sas.custom_config', path)
-            logger.info("GuiManager loaded %s", path)
+            #logger.info("GuiManager loaded %s", path)
             return module
         except Exception as exc:

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -37 +37 @@
             def allowBatch(self):
                 return False
-            def setData(self, data_item=None):
+            def setData(self, data_item=None, is_batch=False):
                 return None
             def title(self):
@@ -170 +170 @@
 
         # Populate the model
-        filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"]
+        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "cyl_400_20.txt"]
         self.form.readData(filename)
 

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

@@ -146 +146 @@
     def data(self, value):
         """ data setter """
+        # Value is either a list of indices for batch fitting or a simple index
+        # for standard fitting. Assure we have a list, regardless.
         if isinstance(value, list):
             self.is_batch_fitting = True
@@ -159 +161 @@
 
         # Update logics with data items
+        # Logics.data contains only a single Data1D/Data2D object
         self.logic.data = GuiUtils.dataFromItem(value[0])
 
@@ -164 +167 @@
         self.is2D = True if isinstance(self.logic.data, Data2D) else False
 
+        # Let others know we're full of data now
         self.data_is_loaded = True
 
@@ -357 +361 @@
 
         # Reload the model
-        self.onSelectModel()
+        self.onSelectModel()
 
         # Smearing tab

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(), [1, 2, 3, 4, 5])
+        self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
         self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
@@ -629 +629 @@
         updateModelItem(item, [test_data], "test")
         # Force same data into logic
-        self.widget.logic.data = item
+        self.widget.data = item
         category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
@@ -678 +678 @@
         updateModelItem(item, [test_data], "test")
         # Force same data into logic
-        self.widget.logic.data = item
+        self.widget.data = item
         category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)