Changeset 671 for branches/Release-2-fixes

Timestamp:

09/09/05 13:59:41 (19 years ago)

Author:

mar637

Message:

Fixed ps bug, where aspect ratios and sizes weren't handled properly. NOTE. A4 is hardcoded. This needs to be changed.

Location:

branches/Release-2-fixes/python

Files:

• asaplot.py (modified) (3 diffs)
• asapplotter.py (modified) (2 diffs)

branches/Release-2-fixes/python/asaplot.py

@@ -380 +380 @@
 
 
-    def save(self, fname=None, orientation='landscape'):
+    def save(self, fname=None, orientation=None):
         """
         Save the plot to a file.
@@ -401 +401 @@
         if fname[-3:].lower() in d:
             try:
-                self.canvas.print_figure(fname,orientation=orientation)
-                print 'Written file %s' % (fname)
+                if fname[-3:].lower() == ".ps":
+                    w = self.figure.figwidth.get()
+                    h = self.figure.figheight.get()                        
+                    a4w = 8.25
+                    a4h = 11.25
+                    
+                    if orientation is None:
+                        # auto oriented
+                        if w > h:
+                            orientation = 'landscape'
+                        else:
+                            orientation = 'portrait'
+                    ds = None
+                    if orientation == 'landscape':
+                        ds = min(a4h/w,a4w/h)
+                        #self.figure.set_figsize_inches((a4h,a4w))
+                    else:
+                        ds = min(a4w/w,a4h/h)
+                    ow = ds * w
+                    oh = ds * h
+                    self.figure.set_figsize_inches((ow,oh))
+                    self.canvas.print_figure(fname,orientation=orientation)
+                    print 'Written file %s' % (fname)
+                else:                    
+                    self.canvas.print_figure(fname)
+                    print 'Written file %s' % (fname)
             except IOError, msg:
                 print 'Failed to save %s: Error msg was\n\n%s' % (fname, err)
@@ -408 +432 @@
         else:
             print "Invalid image type. Valid types are:"
-            print "ps, eps, png"
+            print "'ps', 'eps', 'png'"
 
 

branches/Release-2-fixes/python/asapplotter.py

@@ -514 +514 @@
         return
 
-    def save(self, filename=None, orientation='landscape'):
+    def save(self, filename=None, orientation=None):
         """
         Save the plot to a file. The know formats are 'png', 'ps', 'eps'.
@@ -523 +523 @@
                           called 'yyyymmdd_hhmmss.png' is created in the
                           current directory.
-             orientation: optional parameter for postscript. 'landscape'
-                          (default) and 'portrait' are valid.
+             orientation: optional parameter for postscript only (not eps).
+                          'landscape', 'portrait' or None (default) are valid.
+                          If None is choosen for 'ps' output, the plot is
+                          automatically oriented to fill the page.
         """
         self._plotter.save(filename,orientation)