Changes in trunk/python/asaplotbase.py [1946:1836]

File:

• trunk/python/asaplotbase.py (modified) (8 diffs)

trunk/python/asaplotbase.py

@@ -14 +14 @@
 
 from asap.parameters import rcParams as asaprcParams
-from asap.logging import asaplog
+from asap.logging import asaplog, print_log
 
 # API change in mpl >= 0.98
@@ -25 +25 @@
     #print "Warning: matplotlib version < 0.87. This might cause errors. Please upgrade."
     asaplog.push( "matplotlib version < 0.99. This might cause errors. Please upgrade." )
-    asaplog.post( 'WARN' )
+    print_log( 'WARN' )
 
 class asaplotbase:
@@ -417 +417 @@
             fname = 'asap'+dstr+'.png'
 
-        d = ['png','.ps','eps', 'svg']
+        d = ['png','.ps','eps']
 
         from os.path import expandvars
@@ -456 +456 @@
             except IOError, msg:
                 #print 'Failed to save %s: Error msg was\n\n%s' % (fname, err)
-                asaplog.post()
+                print_log()
                 asaplog.push('Failed to save %s: Error msg was\n\n%s' % (fname, str(msg)))
-                asaplog.post( 'ERROR' )
+                print_log( 'ERROR' )
                 return
         else:
@@ -464 +464 @@
             #print "'ps', 'eps', 'png'"
             asaplog.push( "Invalid image type. Valid types are:" )
-            asaplog.push( "'ps', 'eps', 'png', 'svg'" )
-            asaplog.post('WARN')
+            asaplog.push( "'ps', 'eps', 'png'" )
+            print_log('WARN')
 
 
@@ -669 +669 @@
                             for tick in self.subplots[i]['axes'].xaxis.majorTicks:
                                 tick.label1On = False
-                            #self.subplots[i]['axes'].xaxis.label.set_visible(False)
+                            self.subplots[i]['axes'].xaxis.label.set_visible(False)
                     if i%cols:
                         # Suppress y-labels for frames not in the left column.
                         for tick in self.subplots[i]['axes'].yaxis.majorTicks:
                             tick.label1On = False
-                        #self.subplots[i]['axes'].yaxis.label.set_visible(False)
+                        self.subplots[i]['axes'].yaxis.label.set_visible(False)
                     # disable the first tick of [1:ncol-1] of the last row
                     #if i+1 < nplots:
                     #    self.subplots[i]['axes'].xaxis.majorTicks[0].label1On = False
-                # set axes label state for interior subplots.
-                if i%cols:
-                    self.subplots[i]['axes'].yaxis.label.set_visible(False)
-                if (i <= (rows-1)*cols - 1) and (i+cols < nplots):
-                    self.subplots[i]['axes'].xaxis.label.set_visible(False)
-            self.rows = rows
-            self.cols = cols
+                self.rows = rows
+                self.cols = cols
             self.subplot(0)
         del rows,cols,n,nplots,layout,ganged,i
-
 
     def tidy(self):
@@ -700 +694 @@
                 if i != 0:
                     ax.yaxis.majorTicks[-1].label1On = False
-            ## set axes label state for interior subplots.
-            #innerax=False
-            #if i%self.cols:
-            #    ax.yaxis.label.set_visible(innerax)
-            #if (i <= (self.rows-1)*self.cols - 1) and (i+self.cols < nplots):
-            #    ax.xaxis.label.set_visible(innerax)
-            
+
 
     def set_title(self, title=None):
@@ -745 +733 @@
                         sp['axes'].legend(tuple(lines), tuple(labels),
                                           self.loc, prop=fp)
-                    #else:
-                    #    sp['axes'].legend((' '))
+                    else:
+                        sp['axes'].legend((' '))
 
             from matplotlib.artist import setp