Changeset fb8d4050 in sasview for guiframe

Timestamp:

Oct 2, 2008 3:41:38 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:

7d0c1a8

Parents:

cfbe9b5

Message:

Allow multiple data sets to be loaded

File:

• guiframe/data_loader.py (modified) (4 diffs)

guiframe/data_loader.py

@@ -62 +62 @@
 def plot_data(parent, path, name="Loaded Data"):
     from sans.guicomm.events import NewPlotEvent, StatusEvent
-    from sans.guitools.plottables import Data1D, Theory1D
     from DataLoader.loader import  Loader
-    import numpy
     #Instantiate a loader 
     L=Loader()
@@ -75 +73 @@
         return
         
+    if type(output).__name__=='list':
+        for i in range(len(output)):
+            _plot_single_data(parent, output[i], path, name, str(i))
+    else:
+        _plot_single_data(parent, output, path, name)
+        
+def _plot_single_data(parent, output, path, name="Loaded Data", index=None):
+    """
+        Plot a single data set
+        @param output: data set to plot
+    """
+    from sans.guicomm.events import NewPlotEvent
+    from sans.guitools.plottables import Data1D, Theory1D
+    
     if output.dy==None:
         new_plot = Theory1D(output.x, output.y)
@@ -81 +93 @@
         
     filename = os.path.basename(path)
+    if index is not None:
+        filename += "(%s)" % index
         
     new_plot.name = name
@@ -90 +104 @@
     new_plot.group_id = filename
         
-    wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))
+    title = filename
+    if len(output.title) > 0:
+        title = filename+'['+output.title+']'
+
+    wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))