Changeset a90c9c5 in sasview

Timestamp:

Feb 5, 2018 5:33:02 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:

725d9c06

Parents:

14ec91c5

Message:

Minor corrections to GUI and unit tests

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (3 diffs)
• UI/ComplexConstraintUI.ui (modified) (1 diff)
• UI/MultiConstraintUI.ui (modified) (1 diff)
• UnitTesting/ComplexConstraintTest.py (modified) (1 diff)
• UnitTesting/ConstraintWidgetTest.py (modified) (5 diffs)

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

@@ -94 +94 @@
 
         # External signals
-        self.parent.tabsModifiedSignal.connect(self.onModifiedTabs)
+        self.parent.tabsModifiedSignal.connect(self.initializeFitList)
 
     def updateSignalsFromTab(self, tab=None):
@@ -283 +283 @@
         self.current_cell = self.tblTabList.item(row, column).data(0)
 
-    def onModifiedTabs(self):
-        """
-        Respond to tabs being deleted by deleting involved constraints
-
-        This should probably be done in FittingWidget as it is the owner of
-        all the fitting data, but I want to keep the FW oblivious about
-        dependence on other FW tabs, so enforcing the constraint deletion here.
-        """
-        # Get the list of all constraints from querying the table
-        #constraints = getConstraintsForModel()
-
-        # Get the current list of tabs
-        #tabs = ObjectLibrary.listObjects()
-
-        # Check if any of the constraint dependencies got deleted
-        # Check the list of constraints
-        self.initializeFitList()
-        pass
-
     def onFitComplete(self, result):
         """
@@ -677 +658 @@
         # Update the tab
         constrained_tab.addConstraintToRow(constraint, constrained_row)
-        pass

src/sas/qtgui/Perspectives/Fitting/UI/ComplexConstraintUI.ui

@@ -166 +166 @@
        </property>
        <property name="default">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>

src/sas/qtgui/Perspectives/Fitting/UI/MultiConstraintUI.ui

@@ -152 +152 @@
        </property>
        <property name="default">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>

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

@@ -18 +18 @@
 from sas.qtgui.Perspectives.Fitting.ComplexConstraint import ComplexConstraint
 
-#if not QtWidgets.QApplication.instance():
-#    app = QtWidgets.QApplication(sys.argv)
-app = QtWidgets.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class dummy_manager(object):

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

@@ -7 +7 @@
 from PyQt5 import QtGui, QtCore, QtWidgets
 from PyQt5 import QtWebKit
+from PyQt5.QtTest import QTest
 
 # set up import paths
@@ -12 +13 @@
 
 import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
+from sas.qtgui.Plotting.PlotterData import Data1D
 
 # Local
 from sas.qtgui.Perspectives.Fitting.ConstraintWidget import ConstraintWidget
 from sas.qtgui.Perspectives.Fitting.Constraint import Constraint
+from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 
 if not QtWidgets.QApplication.instance():
     app = QtWidgets.QApplication(sys.argv)
+#app = QtWidgets.QApplication(sys.argv)
 
 class ConstraintWidgetTest(unittest.TestCase):
@@ -24 +29 @@
     def setUp(self):
         '''Create ConstraintWidget dialog'''
-        class dummy_perspective(QtWidgets.QTabWidget):
-            tabsModifiedSignal = QtCore.pyqtSignal()
-            def __init__(self):
-                super(dummy_perspective, self).__init__()
-                pass
+        class dummy_manager(object):
+            def communicator(self):
+                return GuiUtils.Communicate()
+            def communicate(self):
+                return GuiUtils.Communicate()
 
-        self.widget = ConstraintWidget(parent=dummy_perspective())
+        '''Create the perspective'''
+        self.perspective = FittingWindow(dummy_manager())
+
+        self.widget = ConstraintWidget(parent=self.perspective)
 
         # Example constraint object
@@ -52 +60 @@
         self.assertEqual(self.widget.tblTabList.columnCount(), 4)
         self.assertEqual(self.widget.tblConstraints.columnCount(), 1)
+        # Data accept 
+        self.assertFalse(self.widget.acceptsData())
+        # By default, the constraint table is disabled
+        self.assertFalse(self.widget.tblConstraints.isEnabled())
 
-    def testLabels(self):
-        ''' various labels on the widget '''
-        # params related setup
-        pass
+    def testOnFitTypeChange(self):
+        ''' test the single/batch fit switch '''
+        self.widget.initializeFitList = MagicMock()
+        # Assure current type is Single
+        self.assertEqual(self.widget.currentType, "FitPage")
+        # click on "batch"
+        QTest.mouseClick(self.widget.btnBatch, QtCore.Qt.LeftButton)
+        app.processEvents()
+        # See what the current type is now
+        self.assertEqual(self.widget.currentType, "BatchPage")
+        # See if the list is getting initialized
+        self.assertTrue(self.widget.initializeFitList.called)
+        # Go back to single fit
+        QTest.mouseClick(self.widget.btnSingle, QtCore.Qt.LeftButton)
+        app.processEvents()
+        # See what the current type is now
+        self.assertEqual(self.widget.currentType, "FitPage")
 
-    def testTooltip(self):
-        ''' test the tooltip'''
+    def testGetTabsForFit(self):
+        ''' Test the fitting tab list '''
+        self.assertEqual(self.widget.getTabsForFit(),[])
+        # Add some tabs
         pass
 
@@ -69 +96 @@
 
         self.assertFalse(self.widget.isTabImportable(None))
-        self.assertTrue(self.widget.isTabImportable("FitTab333333"))
-        self.assertFalse(self.widget.isTabImportable("BatchTab"))
+        self.assertFalse(self.widget.isTabImportable("BatchTab1"))
         self.assertFalse(self.widget.isTabImportable("BatchTab"))
 
-        pass
+    def testOnTabCellEdit(self):
+        ''' test what happens on monicker edit '''
+        # Mock the datafromitem() call from FittingWidget
+        data = Data1D(x=[1,2], y=[1,2])
+        GuiUtils.dataFromItem = MagicMock(return_value=data)
+        item = QtGui.QStandardItem("test")
+        self.perspective.addFit([item])
 
     def testUpdateFitLine(self):