Changeset 2277 for trunk/python/asapplotter.py

Timestamp:

08/17/11 10:58:44 (13 years ago)

Author:

Malte Marquarding

Message:

revert accidental changes

File:

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

trunk/python/asapplotter.py

@@ -914 +914 @@
                 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)
@@ -974 +972 @@
                     
             #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):
@@ -983 +980 @@
                 # flag application
                 mr = scan._getflagrow(r)
-                #mr = False
                 from numpy import ma, array
                 if mr:
@@ -991 +987 @@
                     from numpy import logical_not, logical_and
                     if self._maskselection and len(self._usermask) == len(m):
-                        if d[self._stacking](r) in \
-                                self._maskselection[self._stacking]:
+                        if d[self._stacking](r) in self._maskselection[self._stacking]:
                             m = logical_and(m, self._usermask)
-                    y = ma.masked_array(y,mask=logical_not(array(m,
-                                                                 copy=False)))
+                    y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
 
                 x = array(scan._getabcissa(r))