Changeset debf5c3 in sasview for src/sas/qtgui/SlitSizeCalculator.py

Timestamp:

Dec 14, 2016 12:19:57 AM (7 years ago)

Author:

wojciech

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:

ab9984e

Parents:

3a0ce4f

Message:

Addded tests for raised exceptions

File:

• src/sas/qtgui/SlitSizeCalculator.py (modified) (10 diffs)

src/sas/qtgui/SlitSizeCalculator.py

@@ -3 +3 @@
 from UI.SlitSizeCalculator import Ui_SlitSizeCalculator
 from sas.sascalc.dataloader.loader import Loader
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator
 
@@ -11 +9 @@
 
 class SlitSizeCalculator(QtGui.QDialog, Ui_SlitSizeCalculator):
+    """
+    Provides the slit length calculator GUI.
+    """
     def __init__(self, parent=None):
         super(SlitSizeCalculator, self).__init__()
@@ -31 +32 @@
     def onHelp(self):
         """
-        Bring up the Kiessig fringe calculator Documentation whenever
+        Bring up the Slit Size Calculator calculator Documentation whenever
         the HELP button is clicked.
         Calls DocumentationWindow with the path of the location within the
@@ -48 +49 @@
     def onBrowse(self):
         """
-        Execute the computation of thickness
+        Browse the file and calculate slit lenght upon loading
         """
         path_str = self.chooseFile()
@@ -57 +58 @@
 
         self.data_file.setText(os.path.basename(path_str))
-        #We are loading data for one model only therefor index 0
         self.calculateSlitSize(data)
 
@@ -70 +70 @@
                 "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)", None,
                 QtGui.QFileDialog.DontUseNativeDialog)
+
         if path is None:
             return
@@ -86 +87 @@
     def calculateSlitSize(self, data=None):
         """
-            Complete the loading and compute the slit size
+        Computes slit lenght from given 1D data
         """
 
@@ -93 +94 @@
             raise RuntimeError, msg
 
-        if isinstance(data, Data2D) or data.__class__.__name__ == 'Data2D':
+        if data.__class__.__name__ == 'Data2D':
             msg = "Slit Length cannot be computed for 2D Data"
             raise Exception, msg
@@ -101 +102 @@
              x = data.x
              y = data.y
-             if x == [] or  x is None or y == [] or y is None:
+             if x == [] or x is None or y == [] or y is None:
                  msg = "The current data is empty please check x and y"
                  raise ValueError, msg
@@ -113 +114 @@
         slit_length_str = "{:.5f}".format(slit_length)
         self.slit_length_out.setText(slit_length_str)
-        #Display unit
+
+        #Display unit, which most likely needs to be 1/Ang but needs to be confirmed
         self.unit_out.setText("[Unknown]")