Changeset 15550f4 in sasview

Timestamp:

Mar 27, 2009 3:23:35 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

ca94880

Parents:

2c0f2a5

Message:

working on tiff reader and plotter

File:

• guiframe/local_perspectives/plotting/Plotter2D.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -101 +101 @@
         ## Update self.data2d with the current plot
         self.data2D = event.plot
+        
         #TODO: Check for existence of plot attribute
         
@@ -162 +163 @@
             @param event: wx context event
         """
+        
         slicerpop = PanelMenu()
         slicerpop.set_plots(self.plots)
         slicerpop.set_graph(self.graph)
-        
              
         id = wx.NewId()
@@ -198 +199 @@
         wx.EVT_MENU(self, id, self._onEditDetector) 
         
-        id = wx.NewId()
-        slicerpop.Append(id, '&Perform circular average')
-        wx.EVT_MENU(self, id, self.onCircular) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Sector [Q view]')
-        wx.EVT_MENU(self, id, self.onSectorQ) 
-        
-        id = wx.NewId()
-        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 in Qx')
-        wx.EVT_MENU(self, id, self.onBoxavgX) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Box averaging in Qy')
-        wx.EVT_MENU(self, id, self.onBoxavgY) 
-        
-        if self.slicer !=None :
+        if not hasattr(self.data2D,"pictype"):
             id = wx.NewId()
-            slicerpop.Append(id, '&Clear slicer')
-            wx.EVT_MENU(self, id,  self.onClearSlicer) 
-            
-            if self.slicer.__class__.__name__ !="BoxSum":
+            slicerpop.Append(id, '&Perform circular average')
+            wx.EVT_MENU(self, id, self.onCircular) 
+            
+            id = wx.NewId()
+            slicerpop.Append(id, '&Sector [Q view]')
+            wx.EVT_MENU(self, id, self.onSectorQ) 
+            
+            id = wx.NewId()
+            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 in Qx')
+            wx.EVT_MENU(self, id, self.onBoxavgX) 
+            
+            id = wx.NewId()
+            slicerpop.Append(id, '&Box averaging in Qy')
+            wx.EVT_MENU(self, id, self.onBoxavgY) 
+            
+            if self.slicer !=None :
                 id = wx.NewId()
-                slicerpop.Append(id, '&Edit Slicer Parameters')
-                wx.EVT_MENU(self, id, self._onEditSlicer) 
+                slicerpop.Append(id, '&Clear slicer')
+                wx.EVT_MENU(self, id,  self.onClearSlicer) 
                 
-        slicerpop.AppendSeparator() 
+                if self.slicer.__class__.__name__ !="BoxSum":
+                    id = wx.NewId()
+                    slicerpop.Append(id, '&Edit Slicer Parameters')
+                    wx.EVT_MENU(self, id, self._onEditSlicer) 
+                    
+            slicerpop.AppendSeparator() 
        
         id = wx.NewId()