Changeset 1153 for trunk/python/asaplotbase.py

Timestamp:

08/21/06 10:48:45 (18 years ago)

Author:

mar637

Message:

lots of changes to support soft refresh, for things like text overlays, linecatlogs etc. reworked plot_lines to to auto-peak detection. added forwarding functions to matplotlib.axes. drawing functions

File:

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

trunk/python/asaplotbase.py

@@ -454 +454 @@
         if what[-6:] == 'colour': what = what[:-6] + 'color'
 
-        newargs = {}
-
-        for k, v in kwargs.iteritems():
-            k = k.lower()
-            if k == 'colour': k = 'color'
-            newargs[k] = v
-
-        getattr(self.axes, "set_%s"%what)(*args, **newargs)
-
-        self.show()
+        key = "colour"
+        if kwargs.has_key(key):
+            val = kwargs.pop(key)
+            kwargs["color"] = val
+
+        getattr(self.axes, "set_%s"%what)(*args, **kwargs)
+
+        self.show(hardrefresh=False)
 
 
@@ -485 +483 @@
 
         getattr(self.figure, "set_%s"%what)(*args, **newargs)
-        self.show()
+        self.show(hardrefresh=False)
 
 
@@ -552 +550 @@
                     self.attributes[k] = v
 
-        if redraw: self.show()
+        if redraw: self.show(hardrefresh=False)
 
 
@@ -613 +611 @@
             for i in range(nplots):
                 self.subplots.append({})
-                self.subplots[i]['axes'] = self.figure.add_subplot(rows,
+                self.subplots[i]['lines'] = []
+                if not ganged:
+                    self.subplots[i]['axes'] = self.figure.add_subplot(rows,
                                                 cols, i+1)
-                self.subplots[i]['lines'] = []
-
-                if ganged:
+                else:
+                    if i == 0:
+                        self.subplots[i]['axes'] = self.figure.add_subplot(rows,
+                                                cols, i+1)
+                    else:
+                        self.subplots[i]['axes'] = self.figure.add_subplot(rows,
+                                                cols, i+1,
+                                                sharex=self.subplots[0]['axes'],
+                                                sharey=self.subplots[0]['axes'])
                     # Suppress tick labelling for interior subplots.
                     if i <= (rows-1)*cols - 1:
@@ -623 +629 @@
                             # Suppress x-labels for frames width
                             # adjacent frames
-                            self.subplots[i]['axes'].xaxis.set_major_locator(NullLocator())
+                            for tick in self.subplots[i]['axes'].xaxis.majorTicks:
+                                tick.label1On = False
                             self.subplots[i]['axes'].xaxis.label.set_visible(False)
                     if i%cols:
@@ -631 +638 @@
                         self.subplots[i]['axes'].yaxis.label.set_visible(False)
                     # disable the first tick of [1:ncol-1] of the last row
-                    if (nplots-cols) < i <= nplots-1:
-                        self.subplots[i]['axes'].xaxis.set_major_formatter(MyFormatter())
+                    #if i+1 < nplots:
+                    #    self.subplots[i]['axes'].xaxis.majorTicks[0].label1On = False
                 self.rows = rows
                 self.cols = cols
             self.subplot(0)
 
+    def tidy(self):
+        # this needs to be exceuted after the first "refresh"
+        nplots = len(self.subplots)
+        if nplots == 1: return
+        for i in xrange(nplots):
+            ax = self.subplots[i]['axes']
+            if i%self.cols:
+                ax.xaxis.majorTicks[0].label1On = False
+            else:
+                if i != 0:
+                    ax.yaxis.majorTicks[-1].label1On = False
+
+
     def set_title(self, title=None):
         """
@@ -648 +668 @@
 
 
-    def show(self):
+    def show(self, hardrefresh=True):
         """
         Show graphics dependent on the current buffering state.
         """
+        if not hardrefresh: return
         if not self.buffering:
             if self.loc is not None: