Changeset 8a7a21b in sasview

Timestamp:

Jan 16, 2009 5:45:20 PM (15 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:

ea20505

Parents:

568e1a5

Message:

working on slicer event for plotter2D

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (3 diffs)
• plotting.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -216 +216 @@
         
         id = wx.NewId()
-        slicerpop.Append(id, '&Box averaging')
-        wx.EVT_MENU(self, id, self.onBoxavg) 
+        slicerpop.Append(id, '&Box averaging in Qx')
+        wx.EVT_MENU(self, id, self.onBoxavgX) 
+        
+        id = wx.NewId()
+        slicerpop.Append(id, '&Box averaging in Qy')
+        wx.EVT_MENU(self, id, self.onBoxavgY) 
         if self.slicer !=None:
             id = wx.NewId()
@@ -386 +390 @@
         self.onClearSlicer(event)
         wx.PostEvent(self.parent, InternalEvent(slicer= BoxSum))
-        from SlicerParameters import SlicerParameterPanel
-       
-        dialog = SlicerParameterPanel(self.parent, -1, "Slicer Parameters")
-       
-        if dialog.ShowModal() == wx.ID_OK:
-            dialog.Destroy()
-            
-    def onBoxavg(self,event):
-        from boxSlicer import BoxInteractor
-        self.onClearSlicer(event)
-        wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor))
         
         from slicerpanel import SlicerPanel
@@ -403 +396 @@
         from sans.guicomm.events import SlicerParameterEvent 
         wx.PostEvent(self.parent, SlicerParameterEvent (panel= new_panel))
-        
-        
+            
+    def onBoxavgX(self,event):
+        from boxSlicer import BoxInteractorX
+        self.onClearSlicer(event)
+        wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractorX))
+        
+        from slicerpanel import SlicerPanel
+        new_panel = SlicerPanel(self.parent, -1, style=wx.RAISED_BORDER)
+        
+        from sans.guicomm.events import SlicerParameterEvent 
+        wx.PostEvent(self.parent, SlicerParameterEvent (panel= new_panel))
+        
+    def onBoxavgY(self,event):
+        from boxSlicer import BoxInteractorY
+        self.onClearSlicer(event)
+        wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractorY))
+        
+        from slicerpanel import SlicerPanel
+        new_panel = SlicerPanel(self.parent, -1, style=wx.RAISED_BORDER)
+        
+        from sans.guicomm.events import SlicerParameterEvent 
+        wx.PostEvent(self.parent, SlicerParameterEvent (panel= new_panel))
+         
     def onClearSlicer(self, event):
         """

guiframe/local_perspectives/plotting/plotting.py

@@ -17 +17 @@
 from sans.guicomm.events import EVT_NEW_PLOT
 from sans.guicomm.events import StatusEvent 
-from sans.guicomm.events import EVT_SLICER_PARS
+
 
 class Plugin:
@@ -60 +60 @@
         # Connect to plotting events
         self.parent.Bind(EVT_NEW_PLOT, self._on_plot_event)
-        self.parent.Bind(EVT_SLICER_PARS, self._on_slicer_event)
         # We have no initial panels for this plug-in
         return []
@@ -88 +87 @@
     def _on_show_panel(self, event):
         print "_on_show_panel"
-    def _on_slicer_event(self, event):
-        print "slicer event ", event.panel
-        new_panel = event.panel
-        # Set group ID if available
-        event_id = self.parent.popup_panel(new_panel)
-        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
-       
-        self.plot_panels.append(new_panel) 
-        return        
+   
     def _on_plot_event(self, event):
         """