Changeset 7dca26e in sasview for calculatorview/perspectives/calculator

Timestamp:

Mar 31, 2010 4:56:54 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f338d3b

Parents:

8d97277

Message:

small change on slit length calculator

Location:

calculatorview/perspectives/calculator

Files:

• load_thread.py (modified) (3 diffs)
• slit_length_calculator_panel.py (modified) (5 diffs)

calculatorview/perspectives/calculator/load_thread.py

@@ -12 +12 @@
             Load a data given a filename
     """
-    def __init__(self, path, filename='',completefn=None,
+    def __init__(self, path, completefn=None,
                  updatefn   = None,
                  yieldtime  = 0.01,
@@ -21 +21 @@
                  yieldtime,
                  worktime)
-        self.filename = filename
         self.path = path
         #Instantiate a loader 
@@ -45 +44 @@
             data =  self.loader.load(self.path)
             elapsed = time.time() - self.starttime
-            self.complete(data=data, filename=self.filename)
+            self.complete(data=data)
         except KeyboardInterrupt:
             # Thread was interrupted, just proceed and re-raise.

calculatorview/perspectives/calculator/slit_length_calculator_panel.py

@@ -151 +151 @@
         dlg.Destroy()
         
-        return path, filename
+        return path
 
     def on_close(self, event):
@@ -162 +162 @@
         """
             Open a file dialog to allow the user to select a given file.
-            The user can allow load file with extension .DAT or .dat.
+            The user is only allow to load file with extension .DAT or .dat.
             Display the slit size corresponding to the loaded data.
         """
-        path, filename = self.choose_data_file(location=self._default_save_location)
-        
-        if path is None or filename == '':
+        path = self.choose_data_file(location=self._default_save_location)
+        
+        if path is None:
             return 
         self._default_save_location = path
@@ -180 +180 @@
                                 type="progress"))
             self.reader = DataReader(path=path,
-                                     filename=filename,
                                     completefn=self.complete_loading,
                                     updatefn=None)
@@ -195 +194 @@
             Complete the loading and compute the slit size
         """
-        if data is not None and data.__class__.__name__ == 'Data2D':
+        if data is None or data.__class__.__name__ == 'Data2D':
             if self.parent.parent is None:
                 return 
@@ -201 +200 @@
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg, type='stop'))
             return 
-        self.data_name_tcl.SetValue(str(filename))
+        self.data_name_tcl.SetValue(str(data.filename))
         #compute the slit size
         try: