Changeset 0532d7c1 in sasview for src/sas/qtgui/SlitSizeCalculator.py

Timestamp:

Dec 13, 2016 9:32:03 AM (8 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:

3a0ce4f

Parents:

8696721

Message:

Unit tests added

File:

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

src/sas/qtgui/SlitSizeCalculator.py

@@ -7 +7 @@
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator
 
-import sys
+import os
 
 class SlitSizeCalculator(QtGui.QDialog, Ui_SlitSizeCalculator):
-    def __init__(self, parent=None, guimanager=None, manager=None):
+    def __init__(self, parent=None):
         super(SlitSizeCalculator, self).__init__()
         self.setupUi(self)
@@ -16 +16 @@
         self.setWindowTitle("Slit Size Calculator")
         self._parent = parent
-        self._guimanager = guimanager
-        self._manager = manager
 
         self.thickness = SlitlengthCalculator()
@@ -28 +26 @@
         # no reason to have this widget resizable
         self.setFixedSize(self.minimumSizeHint())
+
 
     def onHelp(self):
@@ -56 +55 @@
         data = loader.load(path_str)
 
-        self.deltaq_in.setText(path_str)
+        self.data_file.setText(os.path.basename(path_str))
         #We are loading data for one model only therefor index 0
-        self.complete_loading(data)
-        #Complete loading here
+        self.calculateSlitSize(data)
 
     def chooseFile(self):
@@ -69 +67 @@
         # But only with Qt built-in dialog (non-platform native)
         path = QtGui.QFileDialog.getOpenFileName(self, "Choose a file", "",
-                "SAS data 1D (*.txt *.TXT *.dat *.DAT)", None,
+                "SAXSess 1D data (*.txt *.TXT *.dat *.DAT)", None,
                 QtGui.QFileDialog.DontUseNativeDialog)
         if path is None:
@@ -85 +83 @@
         self.close()
 
-    def complete_loading(self, data=None):
+    def calculateSlitSize(self, data=None):
         """
             Complete the loading and compute the slit size
@@ -112 +110 @@
              raise RuntimeError, msg
 
-        print("Slit lenght", slit_length)
-        self.lengthscale_out.setText(str(slit_length))
+        slit_length_str = "{:.5f}".format(slit_length)
+        self.slit_length_out.setText(slit_length_str)
         #Display unit
-        self.lineEdit.setText("[UNKNOWN]")
+        self.unit_out.setText("[Unknown]")