Changeset 0bd125d in sasview

Timestamp:

Feb 10, 2009 2:48:44 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:

39c3263

Parents:

96d7959

Message:

slicer close panel fixed and find problem on sector slicermotion

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (2 diffs)
• Plotter2D.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -192 +192 @@
     def get_params(self):
         params = {}
-        params["inner_radius"] = self.inner_circle._inner_mouse_x
-        params["outer_radius"] = self.outer_circle._inner_mouse_x
+        params["inner_radius"] = math.fabs(self.inner_circle._inner_mouse_x)
+        params["outer_radius"] = math.fabs(self.outer_circle._inner_mouse_x)
         params["nbins"] = self.nbins
         return params
@@ -199 +199 @@
     def set_params(self, params):
         
-        inner = params["inner_radius"] 
-        outer = params["outer_radius"] 
+        inner = math.fabs(params["inner_radius"] )
+        outer = math.fabs(params["outer_radius"] )
         self.nbins = int(params["nbins"])
         self.inner_circle.set_cursor(inner, self.inner_circle._inner_mouse_y)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -88 +88 @@
         self.graph.render(self)
         #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, self._onEVT_SLICER_PARS)
        
         
         
     def _onEVT_SLICER_PARS(self, event):
-        #print "paramaters entered on slicer panel", event.type, event.params
+        print "paramaters entered on slicer panel", event.type, event.params
         self.slicer.set_params(event.params)
-        from sans.guicomm.events import SlicerPanelEvent
-        wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer))
+        #from sans.guicomm.events import SlicerPanelEvent
+        #wx.PostEvent(self.parent, SlicerPanelEvent (panel= self.panel_slicer))
         
     def _onEVT_1DREPLOT(self, event):
@@ -425 +425 @@
                                  params=event.params, style=wx.RAISED_BORDER)
         #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)
+        new_panel.window_caption=str(self.slicer_z)+self.slicer.__class__.__name__+" "+ str(self.data2D.name)
+        new_panel.window_name = str(self.slicer_z)+self.slicer.__class__.__name__+" "+ str(self.data2D.name)
         self.panel_slicer= new_panel
         self.slicer.set_panel_name( name= new_panel.window_caption)