Changeset 2241130 in sasview

Timestamp:

May 15, 2017 5:40:12 AM (8 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:

00b3b40

Parents:

6011788

Message:

Added more unit tests for SASVIEW-569

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (3 diffs)
• UnitTesting/FittingWidgetTest.py (modified) (2 diffs)

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

@@ -80 +80 @@
         # Does the control support UNDO/REDO
         # temporarily off
-        self.support_undo = False
+        self.undo_supported = False
+        self.page_stack = []
 
         # Data for chosen model
@@ -369 +370 @@
 
         # Update state stack
-        if self.support_undo:
+        if self.undo_supported:
             state = self.currentState()
             self.pushFitPage(state)
@@ -877 +878 @@
         if model_column == 1:
             self.recalculatePlotData()
+
+        # Update state stack
+        if self.undo_supported:
+            state = self.currentState()
+            self.pushFitPage(state)
 
     def checkboxSelected(self, item):

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

@@ -606 +606 @@
         Push current state of fitpage onto stack
         """
-        pass
+        # Set data
+        test_data = Data1D(x=[1,2], y=[1,2])
+
+        # Force same data into logic
+        self.widget.logic.data = test_data
+        self.widget.data_is_loaded = True
+        category_index = self.widget.cbCategory.findText("Sphere")
+
+        # Asses the initial state of stack
+        self.assertEqual(self.widget.page_stack, [])
+
+        # Set the undo flag
+        self.widget.undo_supported = True
+        self.widget.cbCategory.setCurrentIndex(category_index)
+        self.widget.parameters_to_fit = ['scale']
+
+        # Check that the stack is updated
+        self.assertEqual(len(self.widget.page_stack), 1)
+
+        # Change another parameter
+        self.widget._model_model.item(2, 1).setText("3.0")
+        # Check that the stack is updated
+        self.assertEqual(len(self.widget.page_stack), 2)
 
     def testPopFitPage(self):
@@ -612 +634 @@
         Pop current state of fitpage from stack
         """
+        # TODO: to be added when implementing UNDO/REDO
         pass