Changeset 7764b41 in sasview for guiframe

Timestamp:

Oct 15, 2008 4:16:39 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:

fee780b

Parents:

00353b4

Message:

modify panel for data2d purposed

Location:

guiframe

Files:

• data_loader.py (modified) (4 diffs)
• local_perspectives/plotting/plotting.py (modified) (11 diffs)

guiframe/data_loader.py

@@ -1 +1 @@
 import os, sys
 import wx
+from danse.common.plottools.plottables import Data1D, Theory1D, Data2D
 from DataLoader.loader import Loader
+class MetaData1D(Data1D):
+    def __init__(self, output):
+        self.datainfo = output
+        Data1D.__init__(self,x=output.x, y=output.y, dy=output.dy)
+        
+class MetaTheory1D(Theory1D):
+    def __init__(self, output):
+        self.datainfo = output
+        Theory1D.__init__(self, x=output.x, y=output.y)
+        
 
+class MetaData2D(Data2D):
+    def __init__(self, output):
+        self.datainfo = output
+        Data2D.__init__(self,image= output.data,err_image=output.err_data,
+                       xmin=output.xmin,xmax=output.xmax,ymin=output.ymin,ymax=output.ymax)
+class MetaTheory2D(Data2D):
+    def __init__(self, output):
+        self.datainfo = output
+        Data2D.__init__(self,image= output.data,err_image=output.err_data,
+                       xmin=output.xmin,xmax=output.xmax,ymin=output.ymin,ymax=output.ymax)
+        
+        
+    
 def choose_data_file(parent, location=None):
     path = None
@@ -62 +86 @@
 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
@@ -75 +98 @@
         wx.PostEvent(parent, StatusEvent(status="Problem loading file: %s" % sys.exc_value))
         return
-    if hasattr(data):
-        new_plot = Data2D(image= output.data)
-        new_plot.setValues(output)
+    if hasattr(output,'data'):
+        new_plot = MetaData2D(output)
     else:
         if output.dy==None:
-            new_plot = Theory1D(output.x, output.y)
+            new_plot = MetaTheory1D(output)
         else:
-            new_plot = Data1D(output.x, output.y, dy=output.dy)
+            new_plot = MetaData1D(output)
         
     filename = os.path.basename(path)
@@ -88 +110 @@
     new_plot.name = name
     new_plot.interactive = True
-    
     # If the data file does not tell us what the axes are, just assume...
-    new_plot.xaxis("\\rm{Q}", 'A^{-1}')
+    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=filename))

guiframe/local_perspectives/plotting/plotting.py

@@ -12 +12 @@
 import wx
 import sys
-#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 danse.common.plottools.plottables import Graph,Data1D
 from sans.guicomm.events import EVT_NEW_PLOT
 
@@ -28 +26 @@
     def set_graph(self, graph):
         self.graph = graph
-
-class View1DPanel(PlotPanel):
+        
+class View1DPanel1D(PlotPanel):
     """
         Plot panel for use with the GUI manager
@@ -145 +143 @@
             self.graph.render(self)
             self.subplot.figure.canvas.draw_idle()    
-            
             
 
@@ -199 +196 @@
         slicerpop.AppendSeparator()
         
-        #id = wx.NewId()
-        #slicerpop.Append(id, '&Toggle Linear/Log scale')
-        #wx.EVT_MENU(self, id, self._onToggleScale)
-
         if self.graph.selected_plottable in self.plots:
             if self.plots[self.graph.selected_plottable].__class__.__name__=="Theory1D":
@@ -213 +206 @@
                 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()
@@ -230 +221 @@
         self.PopupMenu(slicerpop, pos)
     
+    
     def _on_add_errors(self, evt):
         """
@@ -237 +229 @@
         import math
         import numpy
-        from sans.guitools.plottables import Data1D
         import time
         
@@ -250 +241 @@
                               dy=dy)
             new_plot.interactive = True
-            new_plot.name = self.plots[self.graph.selected_plottable].name #+" data"
+            new_plot.name = self.plots[self.graph.selected_plottable].name 
             if hasattr(self.plots[self.graph.selected_plottable], "group_id"):
                 new_plot.group_id = self.plots[self.graph.selected_plottable].group_id
@@ -324 +315 @@
             self.set_yscale('log')
         self.subplot.figure.canvas.draw_idle()    
-    
+        
+class View1DPanel2D( View1DPanel1D):
+    """
+        Plot panel for use with the GUI manager
+    """
+    
+    ## Internal name for the AUI manager
+    window_name = "plotpanel"
+    ## Title to appear on top of the window
+    window_caption = "Plot Panel"
+    ## Flag to tell the GUI manager that this panel is not
+    #  tied to any perspective
+    ALWAYS_ON = True
+    ## Group ID
+    group_id = None
+    
+    def __init__(self, parent, id = -1, color = None,\
+        dpi = None, style = wx.NO_FULL_REPAINT_ON_RESIZE, **kwargs):
+        """
+            Initialize the panel
+        """
+        View1DPanel1D.__init__(self, parent, id = id, style = style, **kwargs)
+        
+        ## Reference to the parent window
+        self.parent = parent
+        ## Plottables
+        self.plots = {}
+        
+        ## Unique ID (from gui_manager)
+        self.uid = None
+        
+        ## Action IDs for internal call-backs
+        self.action_ids = {}
+        
+        ## Graph        
+        self.graph = Graph()
+        self.graph.xaxis("\\rm{Q}", 'A^{-1}')
+        self.graph.yaxis("\\rm{Intensity} ","cm^{-1}")
+        self.graph.render(self)
+  
+    def _onEVT_1DREPLOT(self, event):
+        """
+            Data is ready to be displayed
+            @param event: data event
+        """
+        #TODO: Check for existence of plot attribute
+
+        # Check whether this is a replot. If we ask for a replot
+        # and the plottable no longer exists, ignore the event.
+        if hasattr(event, "update") and event.update==True \
+            and event.plot.name not in self.plots.keys():
+            return
+        
+        if hasattr(event, "reset"):
+            self._reset()
+        
+        is_new = True
+        if event.plot.name in self.plots.keys():
+            # Check whether the class of plottable changed
+            if not event.plot.__class__==self.plots[event.plot.name].__class__:
+                self.graph.delete(self.plots[event.plot.name])
+            else:
+                is_new = False
+        
+        if is_new:
+            self.plots[event.plot.name] = event.plot
+            self.graph.add(self.plots[event.plot.name])
+        else:
+            self.plots[event.plot.name].x = event.plot.x    
+            self.plots[event.plot.name].y = event.plot.y    
+            self.plots[event.plot.name].dy = event.plot.dy  
+            if hasattr(event.plot, 'dx') and hasattr(self.plots[event.plot.name], 'dx'):
+                self.plots[event.plot.name].dx = event.plot.dx    
+ 
+        
+        # Check axis labels
+        #TODO: Should re-factor this
+        #if event.plot._xunit != self.graph.prop["xunit"]:
+        self.graph.xaxis(event.plot._xaxis, event.plot._xunit)
+            
+        #if event.plot._yunit != self.graph.prop["yunit"]:
+        self.graph.yaxis(event.plot._yaxis, event.plot._yunit)
+      
+       
+        self.graph.render(self)
+        self.subplot.figure.canvas.draw_idle()
+
+
+    def onContextMenu(self, event):
+        """
+            1D plot context menu
+            @param event: wx context event
+        """
+        #slicerpop = wx.Menu()
+        slicerpop = PanelMenu()
+        slicerpop.set_plots(self.plots)
+        slicerpop.set_graph(self.graph)
+                
+        # Option to save the data displayed
+        
+       
+        # Various plot options
+        id = wx.NewId()
+        slicerpop.Append(id,'&Save image', 'Save image as PNG')
+        wx.EVT_MENU(self, id, self.onSaveImage)
+        
+        
+        item_list = self.parent.get_context_menu(self.graph)
+        if (not item_list==None) and (not len(item_list)==0):
+                slicerpop.AppendSeparator()
+                for item in item_list:
+                    try:
+                        id = wx.NewId()
+                        slicerpop.Append(id, item[0], item[1])
+                        wx.EVT_MENU(self, id, item[2])
+                    except:
+                        print sys.exc_value
+                        print RuntimeError, "View1DPanel2D.onContextMenu: bad menu item"
+        
+        slicerpop.AppendSeparator()
+       
+                
+        id = wx.NewId()
+        slicerpop.Append(id, '&Toggle Linear/Log scale')
+        wx.EVT_MENU(self, id,  self._onToggleScale)    
+
+        pos = event.GetPosition()
+        pos = self.ScreenToClient(pos)
+        self.PopupMenu(slicerpop, pos)
+    
+    
+  
+      
 class Plugin:
     """
@@ -423 +546 @@
         # Create a new plot panel if none was available        
         if not is_available:
-            new_panel = View1DPanel(self.parent, -1, style=wx.RAISED_BORDER)
+            if not hasattr(event.plot,'image'):
+                new_panel = View1DPanel1D(self.parent, -1, style=wx.RAISED_BORDER)
+            else:
+                new_panel = View1DPanel2D(self.parent, -1, style=wx.RAISED_BORDER)
             # Set group ID if available
             group_id_str = ''
@@ -440 +566 @@
             self.menu.Append(event_id, new_panel.window_caption, 
                              "Show %s plot panel" % new_panel.window_caption)
-            
             # Set UID to allow us to reference the panel later
             new_panel.uid = event_id
-            
             # Ship the plottable to its panel
             new_panel._onEVT_1DREPLOT(event)