Changeset 7ab9241 in sasview

Timestamp:

Jan 6, 2009 2:22:33 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:

78ed1ad

Parents:

cd68f8c

Message:

small change on annulus

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (1 diff)
• Plotter2D.py (modified) (3 diffs)
• boxSlicer.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -41 +41 @@
                       
         self.update()
-        #self._post_data()
+        self._post_data()
         
         # Bind to slice parameter events

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -202 +202 @@
         slicerpop.Append(id, '&Annulus [Phi view ]')
         wx.EVT_MENU(self, id, self.onSectorPhi) 
-      
+        
+        id = wx.NewId()
+        slicerpop.Append(id, '&Box Sum')
+        wx.EVT_MENU(self, id, self.onBoxSum) 
+        
         id = wx.NewId()
         slicerpop.Append(id, '&Box averaging')
@@ -370 +374 @@
         wx.PostEvent(self.parent, InternalEvent(slicer= AnnulusInteractor))
         
-    def onBoxavg(self,event):
-        from boxSlicer import BoxInteractor
-        self.onClearSlicer(event)
-        wx.PostEvent(self.parent, InternalEvent(slicer= BoxInteractor))
+    def onBoxSum(self,event):
+        from boxSum import BoxSum
+        self.onClearSlicer(event)
+        wx.PostEvent(self.parent, InternalEvent(slicer= BoxSum))
         """
         self.onClearSlicer(event)
@@ -386 +390 @@
         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/boxSlicer.py

@@ -264 +264 @@
         self.axes = axes
         
-        self.y=y
-        self.save_y=y
-        
-        self.xmin=xmin
-        self.save_xmin=xmin
-        self.xmax=xmax
-        self.save_xmax=xmax
-        self.theta2= theta2
-        self.radius1= math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2))
-        self.radius2= math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2))
+        self.y = y
+        self.save_y = y 
+        
+        self.xmin = xmin
+        self.save_xmin = xmin
+        self.xmax = xmax
+        self.save_xmax = xmax
+        self.theta2 = theta2
+        self.radius1 = math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2))
+        self.radius2 = math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2))
         
        
@@ -373 +373 @@
         """
         self.y=y
-        self.radius1= math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2))
-        self.radius2= math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2))
-        
-        self.theta_right= math.atan2(self.y,self.xmin)
-        self.theta_left= math.atan2(self.y,self.xmax)
-        
-        self.phi_left= self.theta_left - self.theta2
-        self.phi_right=  self.theta_right -  self.theta2 
+        #self.radius1= math.sqrt(math.pow(self.xmin, 2)+ math.pow(self.y, 2))
+        #self.radius2= math.sqrt(math.pow(self.xmax, 2)+ math.pow(self.y, 2))
+        
+        #self.theta_right= math.atan2(self.y,self.xmin)
+        #self.theta_left= math.atan2(self.y,self.xmax)
+        
+        #self.phi_left= self.theta_left - self.theta2
+        #self.phi_right=  self.theta_right -  self.theta2 
         
         self.has_move=True