Changeset 8068b52 in sasview for guiframe

Timestamp:

May 25, 2009 4:42:21 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

fd4b6f8

Parents:

588f84f

Message:

guiframe: repair a breaking change with bad assumptions about Data1D. Allow to specify a file when using the choose_file method in order to re-use the code elsewhere.

Location:

guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)

guiframe/gui_manager.py

@@ -796 +796 @@
         self._mgr.Update()
         
-    def choose_file(self):
+    def choose_file(self, path=None):
         """ 
             Functionality that belongs elsewhere
@@ -803 +803 @@
         #TODO: clean this up
         from data_loader import choose_data_file
-        path = choose_data_file(self, self._default_save_location)
+        
+        # Choose a file path
+        if path==None:
+            path = choose_data_file(self, self._default_save_location)
+            
         if not path==None:
             try:

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -289 +289 @@
             
             if selected_plot.__class__.__name__=="Data1D":
-               
+                # Make sure that we can pass a basic Data1D
+                dxl = None
+                dxw = None
+                if hasattr(selected_plot, "dxl"):
+                    dxl = selected_plot.dxl
+                if hasattr(selected_plot, "dxw"):
+                    dxw = selected_plot.dxw
                 new_plot = dataFitting.Data1D( x=selected_plot.x,
                               y= selected_plot.y,
                                dx=selected_plot.dx,
                               dy=dy,
-                              dxl=selected_plot.dxl,
-                              dxw=selected_plot.dxw)
+                              dxl=dxl,
+                              dxw=dxw)
                             
             else:
@@ -365 +371 @@
             ## Create a new plottable data1D
             if selected_plot.__class__.__name__=="Data1D":
+                # Make sure that we can pass a basic Data1D
+                dxl = None
+                dxw = None
+                if hasattr(selected_plot, "dxl"):
+                    dxl = selected_plot.dxl
+                if hasattr(selected_plot, "dxw"):
+                    dxw = selected_plot.dxw
                 new_plot = dataFitting.Data1D( x=selected_plot.x,
                                                y= selected_plot.y,
                                                dx=selected_plot.dx,
                                                dy=dy,
-                                               dxl=selected_plot.dxl,
-                                               dxw=selected_plot.dxw)
+                                               dxl=dxl,
+                                               dxw=dxw)
             else:
                 ## Create a new plottable Theory1D