Changeset a8ec5b1 in sasview

Timestamp:

Dec 9, 2016 5:56:20 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:

253e7170

Parents:

d1fb22ee

Message:

Added data file loading

Location:

src/sas/qtgui

Files:

• GuiManager.py (modified) (3 diffs)
• SlitSizeCalculator.py (modified) (7 diffs)

src/sas/qtgui/GuiManager.py

@@ -26 +26 @@
 from sas.qtgui.DensityPanel import DensityPanel
 from sas.qtgui.KiessigPanel import KiessigPanel
+from sas.qtgui.SlitSizeCalculator import SlitSizeCalculator
 
 # Perspectives
@@ -139 +140 @@
         self.DVCalculator = DensityPanel(self)
         #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self)
-        self.KIESSIGCalculator =  KiessigPanel(self)
+        self.KIESSIGCalculator = KiessigPanel(self)
+        self.SlitSizeCalculator = SlitSizeCalculator(self._parent, self, manager=self._data_manager)
     def statusBarSetup(self):
         """
@@ -539 +541 @@
         """
         """
-        print("actionSlit_Size_Calculator TRIGGERED")
-        pass
+        self.SlitSizeCalculator.show()
 
     def actionSAS_Resolution_Estimator(self):

src/sas/qtgui/SlitSizeCalculator.py

@@ -2 +2 @@
 from PyQt4 import QtCore
 from UI.SlitSizeCalculator import Ui_SlitSizeCalculator
+from twisted.internet import threads
+import logging
 
 # sas-global
 from sas.sascalc.calculator.slit_length_calculator import SlitlengthCalculator
-
+from DataExplorer import DataExplorerWindow
 
 class SlitSizeCalculator(QtGui.QDialog, Ui_SlitSizeCalculator):
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, guimanager=None, manager=None):
         super(SlitSizeCalculator, self).__init__()
         self.setupUi(self)
@@ -14 +16 @@
         self.setWindowTitle("Slit Size Calculator")
         self._parent = parent
+        self._guimanager = guimanager
+        self._manager = manager
 
         self.thickness = SlitlengthCalculator()
@@ -34 +38 @@
         try:
             location = self._parent.HELP_DIRECTORY_LOCATION + \
-                "/user/sasgui/perspectives/calculator/slit_lenght_calculator.html"
+                "/user/sasgui/perspectives/calculator/slit_calculator_help.html"
 
             self._parent._helpView.load(QtCore.QUrl(location))
@@ -50 +54 @@
             return
         self.loadFromURL(path_str)
+        #Path_str is a list - it needs to be changed, so that only one file can be uploaded
+        self.deltaq_in.setText(path_str[0])
 
     def loadFromURL(self, url):
@@ -55 +61 @@
         Threaded file load
         """
-        load_thread = threads.deferToThread(self.readData, url)
-        load_thread.addCallback(self.loadComplete)
+        data_explorer = DataExplorerWindow(parent=self._parent, guimanager=self._guimanager)
+        load_thread = threads.deferToThread(data_explorer.readData, url)
+        load_thread.addCallback(data_explorer.loadComplete)
+        #On complete loading
 
     def chooseFiles(self):
@@ -66 +74 @@
         # But only with Qt built-in dialog (non-platform native)
         paths = QtGui.QFileDialog.getOpenFileNames(self, "Choose a file", "",
-                "Scattering data (*.DAT, *.dat)", None, QtGui.QFileDialog.DontUseNativeDialog)
+                "SAXSess Data 1D (*.txt *.TXT *.dat *.DAT)", None,
+                QtGui.QFileDialog.DontUseNativeDialog)
         if paths is None:
             return
@@ -83 +92 @@
         """
         self.close()
+
+    def complete_loading(self, data=None):
+        """
+            Complete the loading and compute the slit size
+        """
+        #TODO: Provided we have an access to data then it should be fairly easy
+        index = self.treeView.selectedIndexes()[0]
+        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        data = GuiUtils.dataFromItem(model_item)
+
+        if data is None or isinstance(data, Data2D):
+            #I guess this doesn't apply
+            if self.parent.parent is None:
+                return
+            msg = "Slit Length cannot be computed for 2D Data"
+            logging.info(msg)
+            return
+        self.data_name_tcl.SetValue(str(data.filename))
+        #compute the slit size
+        try:
+            x = data.x
+            y = data.y
+            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
+            slit_length_calculator = SlitlengthCalculator()
+            slit_length_calculator.set_data(x=x, y=y)
+            slit_length = slit_length_calculator.calculate_slit_length()
+        except:
+            if self.parent.parent is None:
+                return
+            msg = "Slit Size Calculator: %s" % (sys.exc_value)
+            logging.info(msg)
+            return
+        self.slit_size_tcl.SetValue(str(slit_length))
+        #Display unit
+        self.slit_size_unit_tcl.SetValue('[Unknown]')
+        if self.parent.parent is None:
+            return
+        msg = "Load Complete"
+        logging.info(msg)
+