Changeset 50bfab0 in sasview

Timestamp:

Dec 4, 2017 8:43:06 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:

9387fe3

Parents:

200bd7e

Message:

Initial unit tests for inversion - SASVIEW-609

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs)
• Perspectives/Corfunc/CorfuncPerspective.py (modified) (1 diff)
• Perspectives/Invariant/InvariantPerspective.py (modified) (1 diff)
• Perspectives/Inversion/InversionPerspective.py (modified) (4 diffs)
• Perspectives/Inversion/UnitTesting/InversionPerspectiveTest.py (added)
• Perspectives/Inversion/UnitTesting/__init__.py (added)

src/sas/qtgui/GUITests.py

@@ -59 +59 @@
 from Perspectives.Invariant.UnitTesting import InvariantPerspectiveTest
 from Perspectives.Invariant.UnitTesting import InvariantDetailsTest
+#  Inversion
+from Perspectives.Inversion.UnitTesting import InversionPerspectiveTest
 
 
@@ -115 +117 @@
         unittest.makeSuite(InvariantPerspectiveTest.InvariantPerspectiveTest,  'test'),
         unittest.makeSuite(InvariantDetailsTest.InvariantDetailsTest,     'test'),
+        #  Inversion
+        unittest.makeSuite(InversionPerspectiveTest.InversionTest,  'test'),
      )
     return unittest.TestSuite(suites)

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

@@ -368 +368 @@
             self.setClosable(value=False)
             # Tell the MdiArea to close the container
-            self.parentWidget().close()
+            if self.parent:
+                self.parentWidget().close()
             event.accept()
         else:

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -63 +63 @@
         self._model_item = QtGui.QStandardItem()
 
-        self._helpView = QtWebKit.QWebView()
+        #self._helpView = QtWebKit.QWebView()
         self.detailsDialog = DetailsDialog(self)
         self.detailsDialog.cmdOK.clicked.connect(self.enabling)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -25 +25 @@
         return 0.0
 
+NUMBER_OF_TERMS = 10
+REGULARIZATION = 0.0001
+BACKGROUND_INPUT = 0.0
+MAX_DIST = 140.0
 
 # TODO: Modify plot references, don't just send new
@@ -227 +231 @@
         item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_FILENAME, item)
-        item = QtGui.QStandardItem('0.0')
+        item = QtGui.QStandardItem(str(BACKGROUND_INPUT))
         self.model.setItem(WIDGETS.W_BACKGROUND_INPUT, item)
         item = QtGui.QStandardItem("")
@@ -237 +241 @@
         item = QtGui.QStandardItem("")
         self.model.setItem(WIDGETS.W_SLIT_HEIGHT, item)
-        item = QtGui.QStandardItem("10")
+        item = QtGui.QStandardItem(str(NUMBER_OF_TERMS))
         self.model.setItem(WIDGETS.W_NO_TERMS, item)
-        item = QtGui.QStandardItem("0.0001")
+        item = QtGui.QStandardItem(str(REGULARIZATION))
         self.model.setItem(WIDGETS.W_REGULARIZATION, item)
-        item = QtGui.QStandardItem("140.0")
+        item = QtGui.QStandardItem(str(MAX_DIST))
         self.model.setItem(WIDGETS.W_MAX_DIST, item)
         item = QtGui.QStandardItem("")
@@ -439 +443 @@
     def getNFunc(self):
         """Get the n_func value from the GUI object"""
-        return int(self.noOfTermsInput.text())
+        try:
+            nfunc = int(self.noOfTermsInput.text())
+        except ValueError:
+            logging.error("Incorrect number of terms specified: %s" %self.noOfTermsInput.text())
+            self.noOfTermsInput.setText(str(NUMBER_OF_TERMS))
+            nfunc = NUMBER_OF_TERMS
+        return nfunc
 
     def setCurrentData(self, data_ref):