Changeset 2067 for branches

Timestamp:

03/24/11 19:47:01 (14 years ago)

Author:

Kana Sugimoto

Message:

merged a bug fix in trunk (r2066)

Location:

branches/casa-prerelease/pre-asap/python

Files:

• . (modified) (1 prop)
• flagtoolbar.py (modified) (5 diffs)

branches/casa-prerelease/pre-asap/python/flagtoolbar.py

@@ -158 +158 @@
             return
         #print "add the region to selections"
-        self._thisregion = {'axes': event.inaxes,'xs': event.xdata,
+        #self._thisregion = {'axes': event.inaxes,'xs': event.xdata,
+        self._thisregion = {'axes': event.inaxes,'xs': event.x,
                             'worldx': [event.xdata,event.xdata]}
         self.plotter._plotter.register('button_press',None)
@@ -166 +167 @@
     def _xspan_draw(self,event):
         if event.inaxes == self._thisregion['axes']:
-            xnow = event.xdata
+            #xnow = event.xdata
+            xnow = event.x
             self.xdataold = xnow
         else:
@@ -172 +174 @@
         try: self.lastspan
         except AttributeError: pass
-        else: self.lastspan.remove()
-
-        self.lastspan = self._thisregion['axes'].axvspan(self._thisregion['xs'],xnow,facecolor='0.7')
+        #else: self.lastspan.remove()
+        else: self._remove_span(self.lastspan)
+
+        #self.lastspan = self._thisregion['axes'].axvspan(self._thisregion['xs'],xnow,facecolor='0.7')
+        self.lastspan = self._draw_span(self._thisregion['axes'],self._thisregion['xs'],xnow,fill="#555555",stipple="gray50")
         #self.plotter._plotter.show(False)
-        self.plotter._plotter.canvas.draw()
+        #self.plotter._plotter.canvas.draw()
         del xnow
 
+    def _draw_span(self,axes,x0,x1,**kwargs):
+        pass
+
+    def _remove_span(self,span):
+        pass
+
+    @asaplog_post_dec
     def _xspan_end(self,event):
         if not self.figmgr.toolbar.mode == '':
@@ -188 +199 @@
         except AttributeError: pass
         else:
-            self.lastspan.remove()
+            #self.lastspan.remove()
+            self._remove_span(self.lastspan)
             del self.lastspan
         if event.inaxes == self._thisregion['axes']:
@@ -809 +821 @@
         self._p.register('button_press',None)
         self._p.register('button_release',None)
+
+    def _draw_span(self,axes,x0,x1,**kwargs):
+        height = self._p.figure.bbox.height
+        y0 = height - axes.bbox.y0
+        y1 = height - axes.bbox.y1
+        return self._p.canvas._tkcanvas.create_rectangle(x0,y0,x1,y1,**kwargs)
+
+    def _remove_span(self,span):
+        self._p.canvas._tkcanvas.delete(span)