Changeset 488c49d in sasview

Timestamp:

Jun 8, 2016 7:56:28 AM (9 years ago)

Author:

Piotr Rozyczko <piotr.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:

5032ea68

Parents:

f721030

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (06/08/16 07:53:59)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (06/08/16 07:56:28)

Message:

Hold data objects in model. Added more Data Explorer functionality. Added unit tests.

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (4 diffs)
• Dec07031.ASC (added)
• Perspectives/Invariant/UI/InvariantDetailsUI.py (modified) (1 diff)
• Perspectives/Invariant/UI/TabbedInvariantUI.py (modified) (3 diffs)
• Perspectives/Invariant/UI/TabbedInvariantUI.ui (modified) (2 diffs)
• UI/Invariant.py (deleted)
• UI/Invariant.ui (deleted)
• UI/InvariantDetails.py (deleted)
• UI/InvariantDetailsUI.py (deleted)
• UI/InvariantDetailsUI.ui (deleted)
• UI/InvariantUI.py (deleted)
• UI/Invariant_old.ui (deleted)
• UI/TabbedInvariantUI.py (deleted)
• UI/TabbedInvariantUI.ui (deleted)
• UI/invariant_test.py (deleted)
• UI/invariant_test.ui (deleted)
• UI/tabbedInvariant.py (deleted)
• UnitTesting/DataExplorerTest.py (modified) (2 diffs)
• UnitTesting/GuiManagerTest.py (modified) (1 diff)
• UnitTesting/TestUtils.py (modified) (4 diffs)
• UnitTesting/TestUtilsTest.py (added)
• UnitTesting/WelcomePanelTest.py (modified) (1 diff)
• WelcomePanel.py (modified) (1 diff)
• run_tests.sh (modified) (1 diff)

src/sas/qtgui/DataExplorer.py

@@ -15 +15 @@
 
 # UI
-#from UI.DataExplorerUI import DataExplorerUI
 from UI.TabbedFileLoadUI import DataLoadWidget
 
@@ -39 +38 @@
         self.cmdDelete.clicked.connect(self.deleteFile)
         self.cmdSendTo.clicked.connect(self.sendData)
+
+        # Connect the comboboxes
+        self.cbSelect.currentIndexChanged.connect(self.selectData)
 
         # Communicator for signal definitions
@@ -222 +224 @@
 
         return wlist
-           
+
+    def selectData(self, index):
+        """
+        Callback method for modifying the TreeView on Selection Options change
+        """
+        if not isinstance(index, int):
+            msg = "Incorrect type passed to DataExplorer.selectData()"
+            raise AttributeError, msg
+
+        # Respond appropriately
+        if index == 0:
+            # Select All
+            for index in range(self.model.rowCount()):
+                item = self.model.item(index)
+                if item.isCheckable() and item.checkState() == QtCore.Qt.Unchecked:
+                    item.setCheckState(QtCore.Qt.Checked)
+        elif index == 1:
+            # De-select All
+            for index in range(self.model.rowCount()):
+                item = self.model.item(index)
+                if item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
+                    item.setCheckState(QtCore.Qt.Unchecked)
+
+        elif index == 2:
+            # Select All 1-D
+            for index in range(self.model.rowCount()):
+                item = self.model.item(index)
+                item.setCheckState(QtCore.Qt.Unchecked)
+
+                try:
+                    is1D = item.child(0).data().toPyObject().__class__.__name__ == 'Data1D'
+                except AttributeError:
+                    msg = "Bad structure of the data model."
+                    raise RuntimeError, msg
+
+                if is1D:
+                    item.setCheckState(QtCore.Qt.Checked)
+
+        elif index == 3:
+            # Unselect All 1-D
+            for index in range(self.model.rowCount()):
+                item = self.model.item(index)
+
+                try:
+                    is1D = item.child(0).data().toPyObject().__class__.__name__ == 'Data1D'
+                except AttributeError:
+                    msg = "Bad structure of the data model."
+                    raise RuntimeError, msg
+
+                if item.isCheckable() and item.checkState() == QtCore.Qt.Checked and is1D:
+                    item.setCheckState(QtCore.Qt.Unchecked)
+
+        elif index == 4:
+            # Select All 2-D
+            for index in range(self.model.rowCount()):
+                item = self.model.item(index)
+                item.setCheckState(QtCore.Qt.Unchecked)
+                try:
+                    is2D = item.child(0).data().toPyObject().__class__.__name__ == 'Data2D'
+                except AttributeError:
+                    msg = "Bad structure of the data model."
+                    raise RuntimeError, msg
+
+                if is2D:
+                    item.setCheckState(QtCore.Qt.Checked)
+
+        elif index == 5:
+            # Unselect All 2-D
+            for index in range(self.model.rowCount()):
+                item = self.model.item(index)
+
+                try:
+                    is2D = item.child(0).data().toPyObject().__class__.__name__ == 'Data2D'
+                except AttributeError:
+                    msg = "Bad structure of the data model."
+                    raise RuntimeError, msg
+
+                if item.isCheckable() and item.checkState() == QtCore.Qt.Checked and is2D:
+                    item.setCheckState(QtCore.Qt.Unchecked)
+
+        else:
+            msg = "Incorrect value in the Selection Option"
+            # Change this to a proper logging action
+            raise Exception, msg
+
 
     def loadComplete(self, output, message=""):
@@ -262 +348 @@
         object_item.setData(QtCore.QVariant(data))
 
+        checkbox_item.setChild(0, object_item)
+
         # Add rows for display in the view
         self.addExtraRows(info_item, data)
 
         # Set info_item as the only child
-        checkbox_item.setChild(0, info_item)
+        checkbox_item.setChild(1, info_item)
 
         # New row in the model

src/sas/qtgui/Perspectives/Invariant/UI/InvariantDetailsUI.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'InvariantDetails.ui'
+# Form implementation generated from reading ui file 'InvariantDetailsUI.ui'
 #
 # Created by: PyQt4 UI code generator 4.11.4

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.py

@@ -27 +27 @@
         tabbedInvariantUI.setObjectName(_fromUtf8("tabbedInvariantUI"))
         tabbedInvariantUI.resize(465, 408)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/res/ball.ico")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        tabbedInvariantUI.setWindowIcon(icon)
         self.gridLayout_11 = QtGui.QGridLayout(tabbedInvariantUI)
         self.gridLayout_11.setObjectName(_fromUtf8("gridLayout_11"))
@@ -315 +312 @@
 
         self.retranslateUi(tabbedInvariantUI)
-        self.tabWidget.setCurrentIndex(1)
+        self.tabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(tabbedInvariantUI)
 
@@ -374 +371 @@
         self.pushButton_3.setText(_translate("tabbedInvariantUI", "Help", None))
 
-import main_resources_rc
 
 class tabbedInvariantUI(QtGui.QDialog, Ui_tabbedInvariantUI):

src/sas/qtgui/Perspectives/Invariant/UI/TabbedInvariantUI.ui

@@ -13 +13 @@
   <property name="windowTitle">
    <string>Dialog</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="main_resources.qrc">
-    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_11">
@@ -582 +578 @@
   </layout>
  </widget>
- <resources>
-  <include location="main_resources.qrc"/>
- </resources>
  <connections/>
 </ui>

src/sas/qtgui/UnitTesting/DataExplorerTest.py

@@ -45 +45 @@
 
         self.assertEqual(self.form.cbSelect.count(), 6)
+        self.assertEqual(self.form.cbSelect.currentIndex(), 0)
 
         # Class is in the default state even without pressing OK
@@ -100 +101 @@
         # Assure the model contains no items
 
+    def testDataSelection(self):
+        """
+        Tests the functionality of the Selection Option combobox
+        """
+        # Populate the model with 1d and 2d data
+        filename = ["cyl_400_20.txt", "Dec07031.ASC"]
+        self.form.readData(filename)
+
+        # Unselect all data
+        self.form.cbSelect.setCurrentIndex(1)
+
+        # Test the current selection
+        item1D = self.form.model.item(0)
+        item2D = self.form.model.item(1)
+        self.assertTrue(item1D.checkState() == QtCore.Qt.Unchecked)
+        self.assertTrue(item2D.checkState() == QtCore.Qt.Unchecked)        
+
+        # Select all data
+        self.form.cbSelect.setCurrentIndex(0)
+
+        # Test the current selection
+        self.assertTrue(item1D.checkState() == QtCore.Qt.Checked)
+        self.assertTrue(item2D.checkState() == QtCore.Qt.Checked)        
+
+        # select 1d data
+        self.form.cbSelect.setCurrentIndex(2)
+
+        # Test the current selection
+        self.assertTrue(item1D.checkState() == QtCore.Qt.Checked)
+        self.assertTrue(item2D.checkState() == QtCore.Qt.Unchecked)        
+
+        # unselect 1d data
+        self.form.cbSelect.setCurrentIndex(3)
+
+        # Test the current selection
+        self.assertTrue(item1D.checkState() == QtCore.Qt.Unchecked)
+        self.assertTrue(item2D.checkState() == QtCore.Qt.Unchecked)        
+
+        # select 2d data
+        self.form.cbSelect.setCurrentIndex(4)
+
+        # Test the current selection
+        self.assertTrue(item1D.checkState() == QtCore.Qt.Unchecked)
+        self.assertTrue(item2D.checkState() == QtCore.Qt.Checked)        
+
+        # unselect 2d data
+        self.form.cbSelect.setCurrentIndex(5)
+
+        # Test the current selection
+        self.assertTrue(item1D.checkState() == QtCore.Qt.Unchecked)
+        self.assertTrue(item2D.checkState() == QtCore.Qt.Unchecked)        
+
+        # choose impossible index and assure the code raises
+        #with self.assertRaises(Exception):
+        #    self.form.cbSelect.setCurrentIndex(6)
+
     def testReadData(self):
         """

src/sas/qtgui/UnitTesting/GuiManagerTest.py

@@ +1 @@
+import sys
+import unittest
+
+from PyQt4.QtGui import *
+from PyQt4.QtTest import QTest
+from PyQt4.QtCore import *
+from mock import MagicMock
+
+# Local
+from GuiManager import GuiManager
+
+#app = QApplication(sys.argv)
+
+class GuiManagerTest(unittest.TestCase):
+    '''Test the WelcomePanel'''
+    def setUp(self):
+        '''Create the tested object'''
+
+        self.manager = GuiManager(None)
+
+    def tearDown(self):
+        '''Destroy the GUI'''
+        self.manager = None
+
+    def testDefaults(self):
+        '''Test the object in its default state'''
+        pass
+        
+    def testUpdatePerspective(self):
+        """
+        """
+        pass
+
+    def testUpdateStatusBar(self):
+        """
+        """
+        pass
+
+    def testSetData(self):
+        """
+        """
+        pass
+
+    def testSetData(self):
+        """
+        """
+        pass
+
+    def testActions(self):
+        """
+        """
+        pass
+
+    # test each action separately
+       
+if __name__ == "__main__":
+    unittest.main()
+

src/sas/qtgui/UnitTesting/TestUtils.py

@@ -12 +12 @@
         super(QtSignalSpy, self).__init__(parent)
 
-        self._connector = {}
+        self._recorder = {}
         self._count = 0
-        self._signal = [None, None]
+        self._signal = []
 
         # Assign our own slot to the emitted signal
-        if isinstance(signal, pyqtBoundSignal):
-            signal.connect(self.slot)
-        elif hasattr(widget, signal):
-            getattr(widget, signal).connect(self.slot)
-        else:
-            widget.signal.connect(slot)
+        try:
+            if isinstance(signal, pyqtBoundSignal):
+                signal.connect(self.slot)
+            elif hasattr(widget, signal):
+                getattr(widget, signal).connect(self.slot)
+            else:
+                widget.signal.connect(slot)
+        except AttributeError:
+            msg = "Wrong construction of QtSignalSpy instance"
+            raise RuntimeError, msg
 
     def slot(self, *args, **kwargs):
@@ -28 +32 @@
         Record emitted signal.
         """
-        self._connector[self._count] = {
+        self._recorder[self._count] = {
             'args'   : args,
             'kwargs' : kwargs,
@@ -37 +41 @@
 
     def signal(self, index=None):
-        """
-        """
         if index == None:
             return self._signal
@@ -45 +47 @@
 
     def count(self):
-        """
-        """
         return self._count
 
     def called(self):
-        """
-        """
-        return self._connector
+        return self._recorder

src/sas/qtgui/UnitTesting/WelcomePanelTest.py

@@ +1 @@
+import sys
+import unittest
+
+from PyQt4.QtGui import *
+from PyQt4.QtTest import QTest
+from PyQt4.QtCore import *
+
+# Local
+from WelcomePanel import WelcomePanel
+
+app = QApplication(sys.argv)
+
+class WelcomePanelTest(unittest.TestCase):
+    '''Test the WelcomePanel'''
+    def setUp(self):
+        '''Create the WelcomePanel'''
+
+        self.widget = WelcomePanel(None)
+
+    def tearDown(self):
+        '''Destroy the GUI'''
+        self.widget.close()
+        self.widget = None
+
+    def testDefaults(self):
+        '''Test the GUI in its default state'''
+        self.assertIsInstance(self.widget, QDialog)
+        self.assertEqual(self.widget.windowTitle(), "Welcome")
+        
+    def testVersion(self):
+        """
+        """
+        version = self.widget.lblVersion
+        self.assertIsInstance(version, QLabel)
+        ver_text = "\nSasView 4.0.0-alpha\nBuild: 1\n(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and IL"
+        #self.assertEqual(str(version.text()), ver_text)
+        self.assertIn("SasView", str(version.text()))
+        self.assertIn("Build:", str(version.text()))
+       
+if __name__ == "__main__":
+    unittest.main()

src/sas/qtgui/WelcomePanel.py

@@ -18 +18 @@
         build = sas.sasview.__build__
 
-        self.lblVersion = "\nSasView %s\nBuild: %s" % (version, build)
-        self.lblVersion += "\n(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and IL"
+        ver = "\nSasView %s\nBuild: %s" % (version, build)
+        ver += "\n(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and IL"
+
+        self.lblVersion.setText(ver)

src/sas/qtgui/run_tests.sh

@@ +1 @@
+python -m UnitTesting.TestUtilsTest
+python -m UnitTesting.WelcomePanelTest
 python -m UnitTesting.DataExplorerTest
 python -m UnitTesting.MainWindowTest