Changeset aa1b747 in sasview for guiframe/local_perspectives

Timestamp:

Jan 14, 2009 5:23:45 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:

a19cd4d

Parents:

212417e

Message:

worling on slicer panel

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter2D.py (modified) (2 diffs)
• boxSlicer.py (modified) (4 diffs)
• plotting.py (modified) (3 diffs)
• slicerpanel.py (added)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -240 +240 @@
         pos = self.ScreenToClient(pos)
         self.PopupMenu(slicerpop, pos)
-   
+        
     def _setSlicer(self, slicer):
         # Clear current slicer
@@ -405 +405 @@
         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
-        """
+        
+        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/boxSlicer.py

@@ -177 +177 @@
         from DataLoader.manipulations import  Boxavg
         radius = math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
-        x_min= self.left_line.x1
-        x_max= self.right_line.x1 
-        y_min= self.bottom_line.y1
-        y_max= self.top_line.y1
-        box =  Boxavg (x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max)
+        self.x= math.fabs(self.right_line.x1)
+        self.y= math.fabs(self.top_line.y1 )
+       
+        box =  Boxavg (x_min=-self.x, x_max=self.x, y_min=-self.y, y_max=self.y)
        
         self.count, self.error= box(self.base.data2D)
@@ -220 +219 @@
         params = {}
         params["x_max"]= math.fabs(self.right_line.x1)
-        params["y_max"]= math.fabs(self.top_line.x1)
+        params["y_max"]= math.fabs(self.top_line.y1)
         
         params["errors"] = self.error
@@ -227 +226 @@
     
     def set_params(self, params):
+        
         self.x = float(math.fabs(params["x_max"]))
         self.y = float(math.fabs(params["y_max"] ))
@@ -248 +248 @@
                                  ymin= -1*self.y,
                                  ymax= -1*self.y)
+       
         self._post_data()
     def freeze_axes(self):

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:
@@ -59 +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 []
@@ -87 +88 @@
     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):
         """