Changeset 92c2345 in sasview for guiframe/local_perspectives/plotting/Plotter2D.py

Timestamp:

Jan 12, 2009 5:21:02 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:

a5aaec9

Parents:

e23a20c

Message:

working on boxslicer

File:

• guiframe/local_perspectives/plotting/Plotter2D.py (modified) (6 diffs)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -208 +208 @@
         slicerpop.Append(id, '&Annulus [Phi view ]')
         wx.EVT_MENU(self, id, self.onSectorPhi) 
-        
+       
         id = wx.NewId()
         slicerpop.Append(id, '&Box Sum')
@@ -216 +216 @@
         slicerpop.Append(id, '&Box averaging')
         wx.EVT_MENU(self, id, self.onBoxavg) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Clear slicer')
-        wx.EVT_MENU(self, id,  self.onClearSlicer) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Edit Slicer Parameters')
-        wx.EVT_MENU(self, id, self._onEditSlicer) 
+        if self.slicer !=None:
+            id = wx.NewId()
+            slicerpop.Append(id, '&Clear slicer')
+            wx.EVT_MENU(self, id,  self.onClearSlicer) 
+        
+        
+            id = wx.NewId()
+            slicerpop.Append(id, '&Edit Slicer Parameters')
+            wx.EVT_MENU(self, id, self._onEditSlicer) 
         
         slicerpop.AppendSeparator()
@@ -310 +311 @@
         event = self._getEmptySlicerEvent()
         event.type = self.slicer.__class__.__name__
+        print "event.type",event.type
         event.obj_class = self.slicer.__class__
         event.params = self.slicer.get_params()
+        try:
+            event.result= self.slicer.get_result()
+        except:
+            event.result= None
+        print "event.result", event.result
         wx.PostEvent(self.parent, event)
 
@@ -369 +376 @@
             Perform sector averaging on Q
         """
-        
         from SectorSlicer import SectorInteractor
         self.onClearSlicer(event)
@@ -386 +392 @@
         self.onClearSlicer(event)
         wx.PostEvent(self.parent, InternalEvent(slicer= BoxSum))
+        from BoxParameters 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))
         """
         self.onClearSlicer(event)
@@ -398 +415 @@
         wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor))
         print "onboxavg",self.slicer
-        """ 
-    def onBoxavg(self,event):
-        from boxSlicer import BoxInteractor
-        self.onClearSlicer(event)
-        wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor))
-        """
-        self.onClearSlicer(event)
-        self.slicer=BoxInteractor
-        from SlicerParameters import SlicerParameterPanel
-       
-        dialog = SlicerParameterPanel(self.parent, -1, "Slicer Parameters")
-        dialog.set_slicer(self.slicer.__name__,
-                        self.slicer.get_params())
-        if dialog.ShowModal() == wx.ID_OK:
-            dialog.Destroy()
-        wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor))
-        print "onboxavg",self.slicer
         """