Changeset 1c9419f4 in sasview for guiframe

Timestamp:

Oct 9, 2008 1:45:38 PM (16 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:

2139c3f

Parents:

126a761

Message:

add togle scale on plotting module , allows loading data2D

Location:

guiframe

Files:

• data_loader.py (modified) (3 diffs)
• local_perspectives/plotting/plotting.py (modified) (2 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 danse.common.plottools.plottables import Data1D, Theory1D, Data2D
     from DataLoader.loader import  Loader
+    import numpy
     #Instantiate a loader 
     L=Loader()
@@ -72 +75 @@
         wx.PostEvent(parent, StatusEvent(status="Problem loading file: %s" % sys.exc_value))
         return
-        
-    if type(output).__name__=='list':
-        for i in range(len(output)):
-            _plot_single_data(parent, output[i], path, name, str(i))
+    if hasattr(data):
+        new_plot = Data2D(image= output.data)
+        new_plot.setValues(output)
     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)
-    else:
-        new_plot = Data1D(output.x, output.y, dy=output.dy)
+        if output.dy==None:
+            new_plot = Theory1D(output.x, output.y)
+        else:
+            new_plot = Data1D(output.x, output.y, dy=output.dy)
         
     filename = os.path.basename(path)
-    if index is not None:
-        filename += "(%s)" % index
         
     new_plot.name = name
@@ -104 +94 @@
     new_plot.group_id = filename
         
-    title = filename
-    if len(output.title) > 0:
-        title = filename+'['+output.title+']'
-
-    wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=title))
+    wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))

guiframe/local_perspectives/plotting/plotting.py

@@ -12 +12 @@
 import wx
 import sys
-from sans.guitools.PlotPanel import PlotPanel
-from sans.guitools.plottables import Graph
+#from sans.guitools.PlotPanel import PlotPanel
+import danse.common.plottools
+from danse.common.plottools.PlotPanel import PlotPanel
+#from sans.guitools.plottables import Graph
+from danse.common.plottools.plottables import Graph
 from sans.guicomm.events import EVT_NEW_PLOT
 
@@ -209 +212 @@
                 slicerpop.Append(id, '&Linear fit')
                 wx.EVT_MENU(self, id, self.onFitting)
+                
+        id = wx.NewId()
+        slicerpop.Append(id, '&Toggle Linear/Log scale')
+        wx.EVT_MENU(self, id,  self._onToggleScale)
 
         id = wx.NewId()