Changeset 693 for branches/Release-2-fixes

Timestamp:

09/29/05 16:35:59 (19 years ago)

Author:

mar637

Message:

added user customisable color and linestyles

Location:

branches/Release-2-fixes/python

Files:

• asaplot.py (modified) (4 diffs)
• asapplotter.py (modified) (11 diffs)

branches/Release-2-fixes/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()

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

@@ -193 +193 @@
                 
                 xlim=[min(x),max(x)]
+                if self._minmaxx is not None:
+                    xlim = self._minmaxx
                 self._plotter.axes.set_xlim(xlim)
             self._plotter.set_axes('xlabel',xlab)
@@ -200 +202 @@
 
     def _plot_scans(self, scans, colmode):
-        print "Can only plot one row per scan."
+        print "Plotting mode is scans across panels. Can only plot one row per scan."
         if colmode == 's':
             return
@@ -285 +287 @@
                 self._plotter.plot(x,y,m)
                 xlim=[min(x),max(x)]
+                if self._minmaxx is not None:
+                    xlim = self._minmaxx
                 self._plotter.axes.set_xlim(xlim)
 
@@ -410 +414 @@
                 self._plotter.plot(x,y,m)
                 xlim=[min(x),max(x)]
+                if self._minmaxx is not None:
+                    xlim = self._minmaxx
                 self._plotter.axes.set_xlim(xlim)
 
@@ -424 +430 @@
         Parameters:
             stacking:     tell the plotter which variable to plot
-                          as line colour overlays (default 'pol')
+                          as line color overlays (default 'pol')
             panelling:    tell the plotter which variable to plot
                           across multiple panels (default 'scan'
@@ -510 +516 @@
              mp:    a list of 'strings'. This should have the same length
                     as the number of elements on the legend and then maps
-                    to the indeces in order
+                    to the indeces in order. It is possible to uses latex
+                    math expression. These have to be enclosed in r'', e.g. r'$x^{2}$'
 
         Example:
@@ -516 +523 @@
              for CO and SiO:
              plotter.set_stacking('i')
-             plotter.set_legend_map(['CO','SiO'])
+             plotter.set_legend(['CO','SiO'])
              plotter.plot()
+             plotter.set_legend([r'$^{12}CO$', r'SiO'])
         """
         self._lmap = mp
@@ -524 +532 @@
 
     def set_title(self, title=None):
+        """
+        Set the title of the plot. If multiple panels are plotted,
+        multiple titles have to be specified.
+        Example:
+             # two panels are visible on the plotter
+             plotter.set_title(["First Panel","Second Panel"])
+        """
         self._title = title
         if self._data: self.plot()
@@ -529 +544 @@
 
     def set_ordinate(self, ordinate=None):
+        """
+        Set the y-axis label of the plot. If multiple panels are plotted,
+        multiple labels have to be specified.
+        Example:
+             # two panels are visible on the plotter
+             plotter.set_ordinate(["First Y-Axis","Second Y-Axis"])
+        """
         self._ordinate = ordinate
         if self._data: self.plot()
@@ -534 +556 @@
 
     def set_abcissa(self, abcissa=None):
+        """
+        Set the x-axis label of the plot. If multiple panels are plotted,
+        multiple labels have to be specified.
+        Example:
+             # two panels are visible on the plotter
+             plotter.set_ordinate(["First X-Axis","Second X-Axis"])
+        """
         self._abcissa = abcissa
         if self._data: self.plot()
         return
 
+    def set_colors(self, colormap):
+        """
+        Set the colors to be used. The plotter will cycle through
+        these colors when lines are overlaid (stacking mode).
+        Example:
+             plotter.set_colors("red green blue")
+             # If for example four lines are overlaid e.g I Q U V
+             # 'I' will be 'red', 'Q' will be 'green', U will be 'blue'
+             # and 'V' will be 'red' again.
+        """
+        self._plotter.palette(0,colormap=colormap)
+        if self._data: self.plot()
+
+    def set_linestyles(self, linestyles):
+        """
+        Parameters:
+             linestyles:     a list of linestyles to use.
+                             'line', 'dashed', 'dotted', 'dashdot',
+                             'dashdotdot' and 'dashdashdot' are
+                             possible
+                             
+        Set the linestyles to be used. The plotter will cycle through
+        these linestyles when lines are overlaid (stacking mode) AND
+        only one color has been set.
+        Example:
+             plotter.set_colors("black")
+             plotter.set_linestyles("line dashed dotted dashdot")
+             # If for example four lines are overlaid e.g I Q U V
+             # 'I' will be 'solid', 'Q' will be 'dashed',
+             # U will be 'dotted' and 'V' will be 'dashdot'.
+        """
+        self._plotter.palette(color=0,linestyle=0,linestyles=linestyles)
+        if self._data: self.plot()
+    
     def save(self, filename=None, orientation=None):
         """
@@ -619 +682 @@
         dstokes2 = {"I":0,"Plinear":1,"Pangle":2,"V":3}
         draw = {"XX":0, "YY":1,"Real(XY)":2, "Imag(XY)":3}
-        dcirc = { "RR":0,"LL":1}#,"Real(RL)":2,"Image(RL)":3}
+        dcirc = { "RR":0,"LL":1}#,"Real(RL)":2,"Imag(RL)":3}
         
         if pol is None: