Changeset 1021 for trunk/python

Timestamp:

04/19/06 11:03:02 (19 years ago)

Author:

mar637

Message:

decimate threshold 1024 -> 2048; added histogram plotting; function documentation updates

File:

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

trunk/python/asapplotter.py

@@ -37 +37 @@
         self._maskselection = None
         self._selection = selector()
-
+        self._hist = None
+        if rcParams['plotter.histogram']: self._hist = "steps"
+        else: self._hist = "-"
+        
     def _translate(self, instr):
         keys = "s b i p t".split()
@@ -218 +221 @@
         Set the y-axis label of the plot. If multiple panels are plotted,
         multiple labels have to be specified.
+        Parameters:
+            ordinate:    a list of ordinate labels. None (default) let
+                         data determine the labels
         Example:
              # two panels are visible on the plotter
@@ -230 +236 @@
         Set the x-axis label of the plot. If multiple panels are plotted,
         multiple labels have to be specified.
+        Parameters:
+            abcissa:     a list of abcissa labels. None (default) let
+                         data determine the labels
         Example:
              # two panels are visible on the plotter
@@ -242 +251 @@
         Set the colors to be used. The plotter will cycle through
         these colors when lines are overlaid (stacking mode).
+        Parameters:
+            colormap:     a list of colour names
         Example:
              plotter.set_colors("red green blue")
@@ -253 +264 @@
         if self._data: self.plot(self._data)
 
+    def set_histogram(self, hist=True):
+        """
+        Enable/Disable histogram-like plotting.
+        Parameters:
+            hist:        True (default) or False. The fisrt default
+                         is taken from the .asaprc setting
+                         plotter.histogram
+        """
+        if hist: self._hist = "steps"
+        else: self._hist = "-"
+        if self._data: self.plot(self._data)
+            
     def set_linestyles(self, linestyles):
         """
@@ -441 +464 @@
                     y = y[s:e]
                     m = m[s:e]
-                if len(x) > 1024 and True:#rcParams['plotter.decimate']:
-                    fac = len(x)/1024
+                if len(x) > 2048 and rcParams['plotter.decimate']:
+                    fac = len(x)/2048
                     x = x[::fac]
                     m = m[::fac]
@@ -455 +478 @@
                         llbl = self._get_label(scan, r, self._stacking, None)
                 self._plotter.set_line(label=llbl)
+                self._plotter.set_line(linestyle=self._hist)
                 self._plotter.plot(x,y,m)
                 xlim= self._minmaxx or [min(x),max(x)]