Changeset a5ca7ef in sasview

Timestamp:

Apr 17, 2010 4:35:05 PM (15 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:

7f66617

Parents:

7068cc7

Message:

cleaned up a bit

File:

• guiframe/local_perspectives/plotting/masking.py (modified) (18 diffs)

guiframe/local_perspectives/plotting/masking.py

@@ -12 +12 @@
 copyright 2008, University of Tennessee
 """
+##Todo: cleaning up, improving the maskplotpanel initialization, and testing.
 import wx
 import sys
@@ -17 +18 @@
 import copy,numpy
 from danse.common.plottools.PlotPanel import PlotPanel
+from danse.common.plottools.plottables import Graph
 from binder import BindArtist
 from sans.guiframe.dataFitting import Data2D
@@ -79 +81 @@
 
             # Panel for 2D plot
-            self.plotpanel    = SANSplotpanel(self, -1, style=wx.TRANSPARENT_WINDOW)
+            self.plotpanel    = Maskplotpanel(self, -1, style=wx.TRANSPARENT_WINDOW)
             self.cmap = DEFAULT_CMAP
             ## Create Artist and bind it
@@ -208 +210 @@
         self.update()
         self.slicer_mask = self.slicer.update()
-
-        #wx.PostEvent(self, InternalEvent(slicer= BoxMask))
         
     
@@ -228 +228 @@
         self.update()
         self.slicer_mask = self.slicer.update()
-        #wx.PostEvent(self, InternalEvent(slicer= BoxMask))
 
         
@@ -245 +244 @@
         self.subplot.set_xlim(self.data.xmin, self.data.xmax)   
 
-        #mask = self.slicer.update()   
         self.update()
         self.slicer_mask = self.slicer.update() 
-        #wx.PostEvent(self, InternalEvent(slicer= SectorMask))
+
         
     def onOuterSectorMask(self,event=None):
@@ -266 +264 @@
         self.update()     
         self.slicer_mask = self.slicer.update()   
-        #wx.PostEvent(self, InternalEvent(slicer= SectorMask))
+
         
     def onInnerRingMask(self, event=None):
@@ -281 +279 @@
         self.subplot.set_ylim(self.data.ymin, self.data.ymax)
         self.subplot.set_xlim(self.data.xmin, self.data.xmax)   
-        #mask = self.slicer.update()   
+
         self.update()
         self.slicer_mask = self.slicer.update() 
- 
-        #wx.PostEvent(self, InternalEvent(slicer= AnnulusInteractor))
+
         
     def onOuterRingMask(self, event=None):
@@ -314 +311 @@
 
             self._check_display_mask(data.mask, event)
-            # Post slicer None event
-            #event = self._getEmptySlicerEvent()
-            #wx.PostEvent(self, event)
             
     def _check_display_mask(self, mask, event):
@@ -335 +329 @@
             mask[self.slicer_mask==False] = True
 
-            #event = self._getEmptySlicerEvent()
-            #wx.PostEvent(self, event)
             self._check_display_mask(mask, event)
             
@@ -352 +344 @@
         self.data.mask = mask
 
-        # Post slicer None event
-        #event = self._getEmptySlicerEvent()
-        #wx.PostEvent(self, event)
         # update mask plot
         self._check_display_mask(mask, event)
@@ -370 +359 @@
         mask = numpy.ones(len(self.data.mask), dtype=bool)
         self.data.mask = mask
-        
-        # Post slicer None event
-        #event = self._getEmptySlicerEvent()
-        #wx.PostEvent(self, event)
+
         # update mask plot
         self._check_display_mask(mask, event)
@@ -385 +371 @@
             self.subplot.figure.canvas.draw()
             self.slicer = None
-        
-            # Post slicer None event
-            #event = self._getEmptySlicerEvent()
-            #wx.PostEvent(self, event)
 
             
@@ -464 +446 @@
         
         #replot
-        
+        ##This method not alway updating the plot(?): use manual plot 
+        #self.newplot=Data2D(image=temp_data.data)
+        #self.newplot.setValues(temp_data)
+        #self.plotpanel.add_image(self.newplot)
+        #use this method
         plot = self.plotpanel.image(data= temp_mask,
                        qx_data=self.data.qx_data,
@@ -515 +501 @@
         pass  
            
-class SANSplotpanel(PlotPanel):
+class Maskplotpanel(PlotPanel):
     
     def __init__(self, parent, id = -1, color = None,\
@@ -527 +513 @@
         # doesn't have a dictionary of handles for the plottables)
         self.plots = {}
+        self.graph = Graph()
         
     def add_toolbar(self):
@@ -544 +531 @@
     def add_image(self, plot):
         self.plots[plot.name] = plot
-        
+        #init graph
+        self.gaph = Graph()
+        #add plot
         self.graph.add(plot)
+        #add axes
         self.graph.xaxis('\\rm{Q}_{x} ', 'A^{-1}')
         self.graph.yaxis('\\rm{Q}_{y} ', 'A^{-1}')
+        #draw
         self.graph.render(self)
         self.subplot.figure.canvas.draw_idle()
-        #self.onResetGraph(None)
+        
     def onMouseMotion(self, event):
         """
@@ -576 +567 @@
 
 
-
-
-from DataLoader.readers.IgorReader import Reader
-        
-class ViewApp(wx.App):
-    def OnInit(self):
-        frame = MaskPanel(None, -1, 'Mask Editor') 
-        data = Data2D()
-        data = Reader().read('/test/MAR07232_rest.ASC')
-        panel = frame(self, data=data)  
-        panel.Show(True)
-        self.SetTopWindow(panel)
-        
-        return True
-        
-
 if __name__ == "__main__": 
     app = ViewApp(0)