Changeset 652 for trunk/python/asapplotter.py

Timestamp:

06/22/05 15:54:38 (19 years ago)

Author:

mar637

Message:

removed color loading as mpl now supports named colors. some minor corrections on pol label handling. Also added orientation option for ps output.

File:

• trunk/python/asapplotter.py (modified) (7 diffs)

trunk/python/asapplotter.py

@@ -121 +121 @@
             self._plotter.set_panels()
         rows = self._cursor["t"]
-        self._plotter.palette(1)
+        self._plotter.palette(0)
         for rowsel in rows:
             i = self._cursor["t"].index(rowsel)
             if n > 1:
-                self._plotter.palette(1)
+                self._plotter.palette(0)
                 self._plotter.subplot(i)
             colvals = eval(cdict2.get(colmode))
@@ -214 +214 @@
 
         for scan in scans:
-            self._plotter.palette(1)
+            self._plotter.palette(0)
             if n > 1:
                 self._plotter.subplot(scans.index(scan))
-                self._plotter.palette(1)
             colvals = eval(cdict2.get(colmode))
             rowsel = self._cursor["t"][0]
@@ -302 +301 @@
         panels = self._cursor[self._panelling]        
         for i in panels:
-            self._plotter.palette(1)
+            self._plotter.palette(0)
             polmode = "raw"
             ii = self._cursor[self._panelling].index(i)
@@ -360 +359 @@
                     if self._title and len(self._title) > 0:
                         tlab = self._title[ii]
-                    else:                        
-                        tlab = self._ldict.get(self._panelling)+' '+str(i)
+                    else:
+                        if self._panelling == 'p':
+                            tlab = self._get_pollabel(scan, polmode)
+                        else:
+                            tlab = self._ldict.get(self._panelling)+' '+str(i)
                     if self._lmap and len(self._lmap) > 0:
                         llab = self._lmap[jj]
@@ -512 +514 @@
         return
 
-    def save(self, filename=None):
+    def save(self, filename=None, orientation='landscape'):
         """
         Save the plot to a file. The know formats are 'png', 'ps', 'eps'.
@@ -521 +523 @@
                           called 'yyyymmdd_hhmmss.png' is created in the
                           current directory.
-        """
-        self._plotter.save(filename)
+             orientation: optional parameter for postscript. 'landscape'
+                          (default) and 'portrait' are valid.
+        """
+        self._plotter.save(filename,orientation)
         return
     
@@ -614 +618 @@
                         polmode.append("circular")
                     else:
-                        "Pol type '%s' not valid" %i
+                        print "Pol type '%s' not valid" %i
                         return
                 elif 0 > i >= n: