Changeset 702 for trunk/python

Timestamp:

10/20/05 16:56:42 (19 years ago)

Author:

mar637

Message:

merges from Release-2-fixes

Location:

trunk/python

Files:

• asaplot.py (modified) (7 diffs)
• asapplotter.py (modified) (1 diff)

trunk/python/asaplot.py

@@ -17 +17 @@
 from matplotlib.numerix import sqrt
 from matplotlib import rc, rcParams
+from asap import rcParams as asaprcParams
 
 # Force use of the newfangled toolbar.
@@ -58 +59 @@
             self.set_panels(rows, cols)
 
-
-        # Set matplotlib default colour sequence.
-        self.colormap = ['blue', 'green', 'red', 'cyan', 'magenta', 'yellow', 'black', 'purple', 'orange', 'pink']
+        # Set matplotlib default colour sequence.
+        self.colormap = "green red black cyan magenta orange blue purple yellow pink".split()
+        
+        c = asaprcParams['plotter.colours']
+        if isinstance(c,str) and len(c) > 0:
+            self.colormap = c.split()
+
+        self.lsalias = {"line":  [1,0],
+                        "dashdot": [4,2,1,2],
+                        "dashed" : [4,2,4,2],
+                        "dotted" : [1,2],
+                        "dashdotdot": [4,2,1,2,1,2],
+                        "dashdashdot": [4,2,4,2,1,2]
+                        }
+
+        styles = "line dashed dotted dashdot".split()
+        c = asaprcParams['plotter.linestyles']
+        if isinstance(c,str) and len(c) > 0:
+            styles = c.split()
+        s = []
+        for ls in styles:
+            if self.lsalias.has_key(ls):
+                s.append(self.lsalias.get(ls))
+            else:
+                s.append('-')
+        self.linestyles = s
+
         self.color = 0;
+        self.linestyle = 0;
         self.attributes = {}
         self.loc = 0
@@ -80 +106 @@
         self.axes.clear()
         self.color = 0
+        self.linestyle = 0
         self.lines = []
 
-
-    def palette(self, color, colormap=None):
+    def palette(self, color, colormap=None, linestyle=0, linestyles=None):
         if colormap:
-            self.colormap = colormap
+            if isinstance(colormap,list):
+                self.colormap = colormap
+            elif isinstance(colormap,str):
+                self.colormap = colormap.split()
         if 0 <= color < len(self.colormap):
             self.color = color
+        if linestyles:
+            self.linestyles = []
+            if isinstance(linestyles,list):
+                styles = linestyles
+            elif isinstance(linestyles,str):
+                styles = linestyles.split()
+            for ls in styles:
+                if self.lsalias.has_key(ls):
+                    self.linestyles.append(self.lsalias.get(ls))
+                else:
+                    self.linestyles.append(self.lsalias.get('line'))
+        if 0 <= linestyle < len(self.linestyles):
+            self.linestyle = linestyle
 
     def delete(self, numbers=None):
@@ -244 +286 @@
             for segment in self.lines[i]:
                 getattr(segment, "set_color")(self.colormap[self.color])
-
+                if len(self.colormap)  == 1:
+                    getattr(segment, "set_dashes")(self.linestyles[self.linestyle])
             self.color += 1
             if self.color >= len(self.colormap):
                 self.color = 0
+
+            if len(self.colormap) == 1:
+                self.linestyle += 1
+            if self.linestyle >= len(self.linestyles):
+                self.linestyle = 0               
 
         self.show()
@@ -380 +428 @@
 
 
-    def save(self, fname=None, orientation='landscape'):
+    def save(self, fname=None, orientation=None):
         """
         Save the plot to a file.
@@ -401 +449 @@
         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 +480 @@
         else:
             print "Invalid image type. Valid types are:"
-            print "ps, eps, png"
+            print "'ps', 'eps', 'png'"
 
 

trunk/python/asapplotter.py

@@ -212 +212 @@
         else:
             self._plotter.set_panels()
-
         for scan in scans:
             self._plotter.palette(0)