Changeset 743d75c in sasview for guiframe

Timestamp:

Nov 6, 2008 1:02:27 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:

35d1092

Parents:

57668f8

Message:

plotting 2 d

Location:

guiframe

Files:

• data_loader.py (modified) (1 diff)
• local_perspectives/plotting/2plotting.py (added)
• local_perspectives/plotting/DataPanel.py (added)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)

guiframe/data_loader.py

@@ -92 +92 @@
     new_plot.name = filename
     new_plot.interactive = True
+    print "loader output.detector",output.detector
+    new_plot.detector =output.detector
     # If the data file does not tell us what the axes are, just assume...
     new_plot.xaxis(output._xaxis,output._xunit)

guiframe/local_perspectives/plotting/plotting.py

@@ -443 +443 @@
                    self.ymax_2D,self.zmin_2D ,self.zmax_2D )
         wx.PostEvent(self.parent, StatusEvent(status="Image is in %s scale"%self.scale))
-        
-class View1DModelPanel2D( View1DPanel2D):
-    """
-        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
-        """
-        View1DPanel2D.__init__(self, parent, id = id, style = style, **kwargs)
-        
-       
+      
 class Plugin:
     """
@@ -565 +542 @@
         # Create a new plot panel if none was available        
         if not is_available:
-            if event.plot.__class__.__name__=='Data1D':
+            if not hasattr(event.plot,'image'):
                 new_panel = View1DPanel1D(self.parent, -1, style=wx.RAISED_BORDER)
-            if event.plot.__class__.__name__=='Data2D':
+            else:
                 new_panel = View1DPanel2D(self.parent, -1, style=wx.RAISED_BORDER)
-            if event.plot.__class__.__name__=='Theory2D':
-                new_panel = View1DModelPanel2D(self.parent, -1, style=wx.RAISED_BORDER)
             # Set group ID if available
             group_id_str = ''