Changeset acb1ad1 in sasview

Timestamp:

Jul 18, 2008 3:36:55 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:

a3084ada

Parents:

202f93a

Message:

allow multiple loaded data plots

Location:

guiframe

Files:

• data_loader.py (modified) (3 diffs)
• gui_manager.py (modified) (1 diff)
• license.txt (modified) (1 diff)

guiframe/data_loader.py

@@ -7 +7 @@
         location = os.getcwd()
        
-    dlg = wx.FileDialog(parent, "Choose a file", location, "","*", wx.OPEN)
+    dlg = wx.FileDialog(parent, "Choose a file", location, "","*.*", wx.OPEN)
     if dlg.ShowModal() == wx.ID_OK:
         path = dlg.GetPath()
@@ -71 +71 @@
     else:
         new_plot = Data1D(output.x, output.y, dy=output.dy)
+        
+    filename = os.path.basename(path)
+        
     new_plot.name = name
     new_plot.interactive = True
@@ -77 +80 @@
     new_plot.xaxis("\\rm{Q}", 'A^{-1}')
     new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
+    new_plot.group_id = filename
         
-    wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title="Loaded data"))
+    wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))

guiframe/gui_manager.py

@@ -685 +685 @@
             @param panels: list of panels
         """
-        print "gui_mng.set_perspective"
         for item in self.panels:
             # Check whether this is a sticky panel

guiframe/license.txt

@@ -7 +7 @@
 the following paper in your publication:
 
-P. Butler, M. Doucet, G. Alina, J. Zhou, "SANS analysis software", 
-to be published.
+P. Butler, M. Doucet, G. Alina, R. Cortes Hernandez, J. Zhou, P. Kienzle,
+"SANS analysis software", to be published.
 
 See the DANSE project web site for license information: