Changeset 1779 for branches/mergetest/python/asaplotbase.py

Timestamp:

07/29/10 19:13:46 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (test merging alma branch)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description:

Location:

branches/mergetest

Files:

• . (modified) (1 prop)
• python/asaplotbase.py (modified) (16 diffs)

branches/mergetest/python/asaplotbase.py

@@ -21 +21 @@
     from matplotlib.transforms import blend_xy_sep_transform as blended_transform_factory
 
+from asap import asaplog
+
 if int(matplotlib.__version__.split(".")[1]) < 87:
-    print "Warning: matplotlib version < 0.87. This might cause errors. Please upgrade."
+    #print "Warning: matplotlib version < 0.87. This might cause errors. Please upgrade."
+    asaplog.push( "matplotlib version < 0.87. This might cause errors. Please upgrade." )
+    print_log( 'WARN' )
 
 class asaplotbase:
@@ -147 +151 @@
         from numpy import array
         from numpy.ma import MaskedArray
-
         if x is None:
             if y is None: return
@@ -168 +171 @@
             ymsk = y.mask
             ydat = y.data
-
         for i in range(l2):
             x2[i] = x[i/2]
@@ -280 +282 @@
 
 
-    def get_region(self):
-        pos = []
-        print "Please select the bottom/left point"
-        pos.append(self.figure.ginput(n=1, show_clicks=False)[0])
-        print "Please select the top/right point"
-        pos.append(self.figure.ginput(n=1, show_clicks=False)[0])
-        return pos
-
-    def get_point(self):
-        print "Please select the point"
-        pt = self.figure.ginput(n=1, show_clicks=False)
-        if pt:
-            return pt[0]
-        else:
-            return None
+#     def get_region(self):
+#         pos = []
+#         print "Please select the bottom/left point"
+#         pos.append(self.figure.ginput(n=1, show_clicks=False)[0])
+#         print "Please select the top/right point"
+#         pos.append(self.figure.ginput(n=1, show_clicks=False)[0])
+#         return pos
+
+#     def get_point(self):
+#         print "Please select the point"
+#         pt = self.figure.ginput(n=1, show_clicks=False)
+#         if pt:
+#             return pt[0]
+#         else:
+#             return None
 
     def region(self):
@@ -304 +306 @@
 
         def region_start(event):
-            height = self.canvas.figure.bbox.height()
-            self.rect = {'fig': None, 'height': height,
-                         'x': event.x, 'y': height - event.y,
+            self.rect = {'x': event.x, 'y': event.y,
                          'world': [event.xdata, event.ydata,
                                    event.xdata, event.ydata]}
@@ -314 +314 @@
 
         def region_draw(event):
-            self.canvas._tkcanvas.delete(self.rect['fig'])
-            self.rect['fig'] = self.canvas._tkcanvas.create_rectangle(
-                                self.rect['x'], self.rect['y'],
-                                event.x, self.rect['height'] - event.y)
-
+            self.figmgr.toolbar.draw_rubberband(event, event.x, event.y,
+                                                self.rect['x'], self.rect['y'])
+            
         def region_disable(event):
             self.register('motion_notify', None)
             self.register('button_release', None)
-
-            self.canvas._tkcanvas.delete(self.rect['fig'])
 
             self.rect['world'][2:4] = [event.xdata, event.ydata]
@@ -329 +325 @@
                 self.rect['world'][1], self.rect['world'][2],
                 self.rect['world'][3])
+            self.figmgr.toolbar.release(event)
 
         self.register('button_press', region_start)
@@ -381 +378 @@
                 self.events[type] = None
 
-                # It seems to be necessary to return events to the toolbar.
-                if type == 'motion_notify':
-                    self.canvas.mpl_connect(type + '_event',
-                        self.figmgr.toolbar.mouse_move)
-                elif type == 'button_press':
-                    self.canvas.mpl_connect(type + '_event',
-                        self.figmgr.toolbar.press)
-                elif type == 'button_release':
-                    self.canvas.mpl_connect(type + '_event',
-                        self.figmgr.toolbar.release)
+                # It seems to be necessary to return events to the toolbar. <-- Not ture. 2010.Jul.14.kana.
+                #if type == 'motion_notify':
+                #    self.canvas.mpl_connect(type + '_event',
+                #        self.figmgr.toolbar.mouse_move)
+                #elif type == 'button_press':
+                #    self.canvas.mpl_connect(type + '_event',
+                #        self.figmgr.toolbar.press)
+                #elif type == 'button_release':
+                #    self.canvas.mpl_connect(type + '_event',
+                #        self.figmgr.toolbar.release)
 
         else:
@@ -459 +456 @@
                     print 'Written file %s' % (fname)
             except IOError, msg:
-                print 'Failed to save %s: Error msg was\n\n%s' % (fname, msg)
+                #print 'Failed to save %s: Error msg was\n\n%s' % (fname, err)
+                print_log()
+                asaplog.push('Failed to save %s: Error msg was\n\n%s' % (fname, str(msg)))
+                print_log( 'ERROR' )
                 return
         else:
-            print "Invalid image type. Valid types are:"
-            print "'ps', 'eps', 'png'"
+            #print "Invalid image type. Valid types are:"
+            #print "'ps', 'eps', 'png'"
+            asaplog.push( "Invalid image type. Valid types are:" )
+            asaplog.push( "'ps', 'eps', 'png'" )
+            print_log('WARN')
 
 
@@ -575 +578 @@
 
 
-    def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, ganged=True):
+    #def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, ganged=True):
+    def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, layout=None,ganged=True):
         """
         Set the panel layout.
@@ -598 +602 @@
             self.set_title()
 
+        if layout:
+            lef, bot, rig, top, wsp, hsp = layout
+            self.figure.subplots_adjust(
+                left=lef,bottom=bot,right=rig,top=top,wspace=wsp,hspace=hsp)
+            del lef,bot,rig,top,wsp,hsp
+
         if rows < 1: rows = 1
 
@@ -610 +620 @@
         if 0 <= n < rows*cols:
             i = len(self.subplots)
+
             self.subplots.append({})
 
@@ -644 +655 @@
                                                 cols, i+1)
                         if asaprcParams['plotter.axesformatting'] != 'mpl':
-
+                            
                             self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
                     else:
@@ -671 +682 @@
                 self.cols = cols
             self.subplot(0)
+        del rows,cols,n,nplots,layout,ganged,i
 
     def tidy(self):
@@ -725 +737 @@
                         sp['axes'].legend((' '))
 
-
             from matplotlib.artist import setp
             fpx = FP(size=rcParams['xtick.labelsize'])
@@ -734 +745 @@
             fpat = FP(size=rcParams['axes.titlesize'])
             axsize =  fpa.get_size_in_points()
-            tsize =  fpat.get_size_in_points()
+            tsize =  fpat.get_size_in_points()-(self.cols)/2
             for sp in self.subplots:
                 ax = sp['axes']
-                off = 0
-                if len(self.subplots) > 1:
-                    off = self.cols+self.rows
-                ax.title.set_size(tsize-off)
+                ax.title.set_size(tsize)
                 setp(ax.get_xticklabels(), fontsize=xts)
                 setp(ax.get_yticklabels(), fontsize=yts)
                 off = 0
-                if self.cols > 1:
-                    off = self.cols
+                if self.cols > 1: off = self.cols
                 ax.xaxis.label.set_size(axsize-off)
-                if self.rows > 1:
-                    off = self.rows
+                off = 0
+                if self.rows > 1: off = self.rows
                 ax.yaxis.label.set_size(axsize-off)