Changeset 2650 for trunk/python

Timestamp:

09/27/12 14:10:27 (12 years ago)

Author:

Malte Marquarding

Message:

Issue #278: don't reset plotter on set_selection; use combined data and plotter selection to plot.

File:

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

trunk/python/asapplotter.py

@@ -209 +209 @@
                               linestyle=0,linestyles=self._linestyles)
         self._plotter.legend(self._legendloc)
-
         self._plot(self._data)
         if self._minmaxy is not None:
@@ -981 +980 @@
              'r': int}#, '_r': int}
 
-        polmodes = dict(zip(self._selection.get_pols(),
-                            self._selection.get_poltypes()))
+        polmodes = dict(zip(sel.get_pols(), sel.get_poltypes()))
         # this returns either a tuple of numbers or a length  (ncycles)
         # convert this into lengths
@@ -1015 +1013 @@
                 n = min(n,self._rows*self._cols)
                 self._plotter.set_panels(rows=self._rows,cols=self._cols,
-                                         nplots=n,margin=self._margins,ganged=ganged)
+                                         nplots=n,margin=self._margins,
+                                         ganged=ganged)
             else:
                 n = min(n,maxpanel)
-                self._plotter.set_panels(rows=n,cols=0,nplots=n,margin=self._margins,ganged=ganged)
+                self._plotter.set_panels(rows=n,cols=0,nplots=n,
+                                         margin=self._margins,ganged=ganged)
         else:
             self._plotter.set_panels(margin=self._margins)
@@ -1073 +1073 @@
                     
             #if (b > b0 or newpanel) and stackcount < nstack:
-            if stackcount < nstack and (newpanel or rowstack or (a == a0 and b > b0)):
+            if stackcount < nstack and (newpanel or \
+                                            rowstack or (a == a0 and b > b0)):
                 y = []
                 if len(polmodes):
@@ -1216 +1217 @@
         if order:
             self._selection.set_order(order)
-        if refresh and self._data: self.plot(self._data)
+        if refresh and self._data: 
+            self.plot()
 
     def _get_selected_n(self, scan):