Changeset 768656e in sasview

Timestamp:

Dec 10, 2008 4:47:56 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:

b2c3225

Parents:

45c1a35

Message:

fixe plotting more than2 data at the same time from xml file
add another interactor not connect to code yet

Location:

guiframe

Files:

• data_loader.py (modified) (2 diffs)
• local_perspectives/plotting/DataPanel.py (modified) (2 diffs)
• local_perspectives/plotting/SectorSlicer.py (modified) (2 diffs)
• local_perspectives/plotting/SectorSlicer2.py (added)

guiframe/data_loader.py

@@ -119 +119 @@
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))
     else:
-        i="res"
+        i=1
         for item in output:
             try:
@@ -144 +144 @@
             new_plot.group_id = filename
             wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=filename))
-            i="slit"
+            i+=1
            
             

guiframe/local_perspectives/plotting/DataPanel.py

@@ -451 +451 @@
         
         slicerpop.AppendSeparator()
-      
+        
+        id = wx.NewId()
+        slicerpop.Append(id, '&Perform circular average')
+        wx.EVT_MENU(self, id, self.onCircular) 
+        
         id = wx.NewId()
         slicerpop.Append(id, '&Sector')
         wx.EVT_MENU(self, id, self.onSector) 
+        
         
       
@@ -519 +524 @@
         #self.slicer.update()
         self.draw()
-            
-  
+    def onCircular(self, event):
+        """
+            perform circular averaging
+        """
+        from DataLoader.manipulations import CircularAverage
     def onSector(self, event):
-        
+        """
+            Perform sector averaging
+        """
         from SectorSlicer import SectorInteractor
               

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -208 +208 @@
         params = {}
         params["inner_radius"] = self.inner_circle._inner_mouse_x
-        #params["outer_radius"] = self.outer_circle._inner_mouse_x
+        params["outer_radius"] = self.outer_circle._inner_mouse_x
+        params["phi_min"] = self.inner_radious.get_radious()
+        params["phi_max"] = self.inner_radious.get_radious()
         params["nbins"] = self.nbins
         return params
@@ -219 +221 @@
         self.inner_circle.set_cursor(inner, self.inner_circle._inner_mouse_y)
         self.outer_circle.set_cursor(outer, self.outer_circle._inner_mouse_y)
-        #self._post_data()
+        self._post_data()
         
     def freeze_axes(self):