Changeset 1888

Timestamp:

08/23/10 15:14:21 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (1801)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: A name of a button on toolbar changed to "notation"

Test Programs:

Put in Release Notes: No

Module(s): asap plotter

Description:

+ A name of a button on toolbar changed from "note" to "notation"
+ osx GUI handlings
+ workaround for old matplotlib

Location:

trunk/python

Files:

• casatoolbar.py (modified) (1 diff)
• notationwindow.py (modified) (5 diffs)

trunk/python/casatoolbar.py

@@ -200 +200 @@
                                    command=self.stat_cal)
         self.bNote=self._NewButton(master=self,
-                                   text=' note ',
+                                   text='notation',
                                    command=self.modify_note)
         self.bQuit=self._NewButton(master=self,

trunk/python/notationwindow.py

@@ -137 +137 @@
             #if axes.contains_point(pos): ### seems not working
             #    return axes
-            axbox = axes.get_position().get_points()
+            try:
+                axbox = axes.get_position().get_points()
+            except AttributeError: ### WORKAROUND for old matplotlib
+                axbox = self._oldpos2new(axes.get_position())
             if (axbox[0][0] <= pos[0] <= axbox[1][0]) and \
                (axbox[0][1] <= pos[1] <= axbox[1][1]):
                 return axes
         return None
+
+    ### WORKAROUND for old matplotlib
+    def _oldpos2new(self,oldpos=None):
+        return [[oldpos[0],oldpos[1]],[oldpos[0]+oldpos[2],oldpos[1]+oldpos[3]]]
         
     def _convert_pix2dat(self,pos,axes):
@@ -154 +161 @@
         # left-/bottom-pixel, and pixel width & height of the axes
         bbox = axes.get_position()
-        lbpos = bbox.get_points()[0]
-        wax = bbox.width
-        hax = bbox.height
+        try: 
+            axpos = bbox.get_points()
+        except AttributeError: ### WORKAROUND for old matplotlib
+            axpos = self._oldpos2new(bbox)
         # check pos value
-        if (pos[0] < lbpos[0]) or (pos[1] < lbpos[1]) \
-               or (pos[0] > (lbpos[0]+wax)) or (pos[1] > (lbpos[1]+hax)):
+        if (pos[0] < axpos[0][0]) or (pos[1] < axpos[0][1]) \
+               or (pos[0] > axpos[1][0]) or (pos[1] > axpos[1][1]):
             raise ValueError, "The position is out of the axes"
         xlims = axes.get_xlim()
@@ -165 +173 @@
         wdat = xlims[1] - xlims[0]
         hdat = ylims[1] - ylims[0]
-        xdat = xlims[0] + wdat*(pos[0] - lbpos[0])/wax
-        ydat = ylims[0] + hdat*(pos[1] - lbpos[1])/hax
+        xdat = xlims[0] + wdat*(pos[0] - axpos[0][0])/(axpos[1][0] - axpos[0][0])
+        ydat = ylims[0] + hdat*(pos[1] - axpos[0][1])/(axpos[1][1] - axpos[0][1])
         return (xdat, ydat)
 
@@ -298 +306 @@
         #twin.deiconify()
         #twin.minsize(width=twin.winfo_width(),height=twin.winfo_height())
+        twin.lift()
         twin.withdraw()
         return twin
@@ -440 +449 @@
                                  height=self.textwin.winfo_height())
             (w,h) = self.textwin.minsize()
+        self.textwin.lift()
         self.textwin.geometry("%sx%s+%s+%s"%(w,h,xpix,ypix))