Changeset 0bd2cd8 in sasview for guiframe/local_perspectives

Timestamp:

Feb 10, 2009 1:54:48 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:

96d7959

Parents:

07aeb8a

Message:

closing onf slicerpnale fixed

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (4 diffs)
• boxSum.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -17 +17 @@
 from danse.common.plottools.PlotPanel import PlotPanel
 from danse.common.plottools.plottables import Graph,Data1D
-from sans.guicomm.events import EVT_NEW_PLOT,EVT_SLICER_PARS_UPDATE
+from sans.guicomm.events import EVT_NEW_PLOT
 from sans.guicomm.events import EVT_SLICER_PARS
 from sans.guicomm.events import StatusEvent ,NewPlotEvent,SlicerEvent
@@ -89 +89 @@
         #self.Bind(boxSum.EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PARS)
         self.Bind(EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
-        self.Bind(EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PANEL)
+       
         
         
@@ -97 +97 @@
         from sans.guicomm.events import SlicerPanelEvent
         wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer))
-        
-        
-    def _onEVT_SLICER_PANEL(self, event):
-        #print "box move plotter2D", event.type, event.params
-        self.panel_slicer.set_slicer(event.type, event.params)
-        from sans.guicomm.events import SlicerPanelEvent
-        wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer)) 
         
     def _onEVT_1DREPLOT(self, event):
@@ -433 +426 @@
         #new_panel.set_slicer(self.slicer.__class__.__name__,
         new_panel.window_caption=self.slicer.__class__.__name__+" "+ str(self.data2D.name)
-       
+        new_panel.window_name = self.slicer.__class__.__name__+" "+ str(self.data2D.name)
         self.panel_slicer= new_panel
-        
-        wx.PostEvent(self.panel_slicer, event)
+        self.slicer.set_panel_name( name= new_panel.window_caption)
+        #wx.PostEvent(self.panel_slicer, event)
         from sans.guicomm.events import SlicerPanelEvent
         wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer))

guiframe/local_perspectives/plotting/boxSum.py

@@ -67 +67 @@
             
         #self.connect_markers([])
-                      
+        self.panel_name=""      
         self.update()
         self._post_data()
@@ -74 +74 @@
         #print "box sum  self.base.parent",self.base.parent
         self.base.parent.Bind(SlicerParameters.EVT_SLICER_PARS, self._onEVT_SLICER_PARS)
-       
+    def set_panel_name(self, name):
+        self.panel_name= name
     def _onEVT_SLICER_PARS(self, event):
         #printEVT("AnnulusSlicer._onEVT_SLICER_PARS")
@@ -166 +167 @@
         self.type= self.__class__.__name__
         params= self.get_params()
-        event = SlicerParamUpdateEvent(type=self.type, params=params)
-        wx.PostEvent(self.base, event)
+        event = SlicerParamUpdateEvent(type=self.type, params=params,
+                                       panel_name= self.panel_name)
+        wx.PostEvent(self.base.parent, event)