Changeset 92c2345 in sasview

Timestamp:

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

a5aaec9

Parents:

e23a20c

Message:

working on boxslicer

Location:

guiframe/local_perspectives/plotting

Files:

• BoxParameters.py (moved) (moved from guiframe/local_perspectives/plotting/boxDialog.py)
• Plotter2D.py (modified) (6 diffs)
• boxSum.py (modified) (7 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
         """
         

guiframe/local_perspectives/plotting/boxSum.py

@@ -74 +74 @@
                       
         self.update()
-        #self._post_data()
+        self._post_data()
         
         # Bind to slice parameter events
@@ -84 +84 @@
         event.Skip()
         if event.type == self.__class__.__name__:
-            #self.set_params(event.params)
+            self.set_params(event.params)
             self.base.update()
 
@@ -180 +180 @@
         y_max= self.top_line.y
         box =  Boxavg (x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max)
-       
-        self.count, self.error= box(self.base.data2D)
-        
-        
-              
+        self.count, self.error = box(self.base.data2D)
+        print "count, error",self.count, self.error
+        
                                        
     def moveend(self, ev):
@@ -192 +190 @@
         event = SlicerParameters.SlicerParameterEvent()
         event.type = self.__class__.__name__
-        #event.params = self.get_params()
+        print "event type boxsum: ", event.type
+        event.params = self.get_params()
+        
         wx.PostEvent(self.base.parent, event)
 
@@ -209 +209 @@
         """
         print "in move"
-        if self.xmin <= x and x<= self.xmax:
+        if self.xmin <= x and x <= self.xmax:
             print "has move whole", x
         
@@ -221 +221 @@
         params["y_min"] = self.bottom_line.y
         params["y_max"] = self.top_line.y
-        params["count"] = self.count
-        params["error"] = self.error
-        params["center_x"] = self.center_x
-        params["center_y"] = self.center_y
+       
         return params
     
+    
+    def get_result(self):
+        """
+            return the result of box summation
+        """
+        result={}
+        result["count"] = self.count
+        result["error"] = self.error
+        return result
+        
+        
     def set_params(self, params):
         
-        x_min = params["x_min"] 
-        x_max = params["x_max"] 
-        y_min = params["y_min"]
-        y_max = params["y_max"] 
-        theta = params["theta"]
-        center_x = params["center_x"]
-        center_y = params["center_y"]
-        
+        x_min = -math.fabs(params["x_min"] )
+        x_max = math.fabs(params["x_max"] )
+        y_min = -math.fabs(params["y_min"])
+        y_max = math.fabs(params["y_max"]) 
+        
+        self.left_line.update(ymin= y_min ,ymax= y_max , x= x_min)
+        self.right_line.update(ymin= y_min ,ymax= y_max, x= x_max)
+        self.top_line.update( xmin= x_min ,xmax= x_max, y= y_max)
+        self.bottom_line.update(xmin= x_min ,xmax= x_max, y=y_min)
+        """
         self.left_line.update(mline= [center_x, center_y],ymin= y_min ,ymax= y_max)
         self.right_line.update(mline= [center_x, center_y],ymin= y_min ,ymax= y_max)
         self.top_line.update(mline= [center_x, center_y], xmin= x_min ,xmax= xmax)
         self.bottom_line.update(mline= [center_x, center_y],xmin= xmin ,xmax= xmax)
-        
+        """
         
         self._post_data()
@@ -363 +373 @@
         params["radius"] = self.xmin
         params["theta"] = self.xmax
+        
         return params