Changeset 2276 for trunk/python/asapplotter.py
- Timestamp:
- 08/17/11 10:54:03 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/python/asapplotter.py
r2173 r2276 914 914 n = min(n,self._rows*self._cols) 915 915 self._plotter.set_panels(rows=self._rows,cols=self._cols, 916 nplots=n,margin=self._margins,ganged=ganged) 916 nplots=n,margin=self._margins, 917 ganged=ganged) 917 918 else: 918 919 n = min(n,maxpanel) 919 self._plotter.set_panels(rows=n,cols=0,nplots=n,margin=self._margins,ganged=ganged) 920 self._plotter.set_panels(rows=n,cols=0,nplots=n, 921 margin=self._margins,ganged=ganged) 920 922 else: 921 923 self._plotter.set_panels(margin=self._margins) … … 972 974 973 975 #if (b > b0 or newpanel) and stackcount < nstack: 974 if stackcount < nstack and (newpanel or rowstack or (a == a0 and b > b0)): 976 if stackcount < nstack and (newpanel or rowstack 977 or (a == a0 and b > b0)): 975 978 y = [] 976 979 if len(polmodes): … … 980 983 # flag application 981 984 mr = scan._getflagrow(r) 985 #mr = False 982 986 from numpy import ma, array 983 987 if mr: … … 987 991 from numpy import logical_not, logical_and 988 992 if self._maskselection and len(self._usermask) == len(m): 989 if d[self._stacking](r) in self._maskselection[self._stacking]: 993 if d[self._stacking](r) in \ 994 self._maskselection[self._stacking]: 990 995 m = logical_and(m, self._usermask) 991 y = ma.masked_array(y,mask=logical_not(array(m,copy=False))) 996 y = ma.masked_array(y,mask=logical_not(array(m, 997 copy=False))) 992 998 993 999 x = array(scan._getabcissa(r))
Note:
See TracChangeset
for help on using the changeset viewer.