Changeset 1989 for trunk/python

Timestamp:

02/14/11 17:21:55 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1306 and ASAP-205)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: enabled stack='r' and panel='r' in sdplot as well as

stacking='r' and panelling='r' in asapplotter.set_mode.

Test Programs: run sdplot with either stack='r' or panel='r'.

Or, asapplotter.set_mode with either stacking='r' or panelling='r',
and then asapplotter.plot

Put in Release Notes: Yes

Module(s): sdplot and asapplotter

Description: enabled row based stacking and panelling in sdplot and asapplotter.

File:

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

trunk/python/asapplotter.py

@@ -83 +83 @@
             from asap.casatoolbar import CustomToolbarTkAgg
             return CustomToolbarTkAgg(self)
+            #from asap.casatoolbar import CustomFlagToolbarTkAgg
+            #return CustomFlagToolbarTkAgg(self)
         else: return None
 
@@ -340 +342 @@
                  'scan' 'Scan' 's':     Scans
                  'time' 'Time' 't':     Times
+                 'row' 'Row' 'r':       Rows
+            When either 'stacking' or 'panelling' is set to 'row',
+            the other parameter setting is ignored.
         """
         msg = "Invalid mode"
@@ -345 +350 @@
                not self.set_stacking(stacking):
             raise TypeError(msg)
-        if self._panelling == 'r':
-            self._stacking = '_r'
-        elif self._stacking == 'r':
-            self._panelling = '_r'
+        #if self._panelling == 'r':
+        #    self._stacking = '_r'
+        #if self._stacking == 'r':
+        #    self._panelling = '_r'
         if refresh and self._data: self.plot(self._data)
         return
@@ -364 +369 @@
             self._panelling = md
             self._title = None
-            if md == 'r':
-                self._stacking = '_r'
+            #if md == 'r':
+            #    self._stacking = '_r'
             # you need to reset counters for multi page plotting
             self._reset_counters()
@@ -401 +406 @@
             self._stacking = md
             self._lmap = None
-            if md == 'r':
-                self._panelling = '_r'
+            #if md == 'r':
+            #    self._panelling = '_r'
             # you need to reset counters for multi page plotting
             self._reset_counters()
@@ -846 +851 @@
         scan.set_selection(sel)
         d = {'b': scan.getbeam, 's': scan.getscan,
-             #'i': scan.getif, 'p': scan.getpol, 't': scan._gettime,
              'i': scan.getif, 'p': scan.getpol, 't': scan.get_time,
-             'r': int, '_r': int}
+             'r': int}#, '_r': int}
 
         polmodes = dict(zip(self._selection.get_pols(),
@@ -859 +863 @@
         if isinstance(nstack0, int): nstack = nstack0
         else: nstack = len(nstack0)
+        # In case of row stacking
+        rowstack = False
+        titlemode = self._panelling
+        if self._stacking == "r" and self._panelling != "r":
+            rowstack = True
+            titlemode = '_r'
         nptot = n
         maxpanel, maxstack = 16,16
@@ -867 +877 @@
             asaplog.post('WARN')
             nstack = min(nstack,maxstack)
-        #n = min(n,maxpanel)
         n = min(n-self._ipanel-1,maxpanel)
-            
+        
         if n > 1:
             ganged = rcParams['plotter.ganged']
@@ -877 +886 @@
                 n = min(n,self._rows*self._cols)
                 self._plotter.set_panels(rows=self._rows,cols=self._cols,
-#                                         nplots=n,ganged=ganged)
                                          nplots=n,layout=self._panellayout,ganged=ganged)
             else:
-#                self._plotter.set_panels(rows=n,cols=0,nplots=n,ganged=ganged)
                 self._plotter.set_panels(rows=n,cols=0,nplots=n,layout=self._panellayout,ganged=ganged)
         else:
-#            self._plotter.set_panels()
             self._plotter.set_panels(layout=self._panellayout)
         #r = 0
@@ -918 +924 @@
                 self._plotter.set_axes('xlabel', xlab)
                 self._plotter.set_axes('ylabel', ylab)
-                lbl = self._get_label(scan, r, self._panelling, self._title)
-                #if self._panelling == 'r': lbl = ''
+                #lbl = self._get_label(scan, r, self._panelling, self._title)
+                lbl = self._get_label(scan, r, titlemode, self._title)
                 if isinstance(lbl, list) or isinstance(lbl, tuple):
                     if 0 <= panelcount < len(lbl):
@@ -925 +931 @@
                     else:
                         # get default label
-                        lbl = self._get_label(scan, r, self._panelling, None)
+                        #lbl = self._get_label(scan, r, self._panelling, None)
+                        lbl = self._get_label(scan, r, titlemode, None)
                 self._plotter.set_axes('title',lbl)
                 newpanel = True
@@ -936 +943 @@
                     
             #if (b > b0 or newpanel) and stackcount < nstack:
-            if stackcount < nstack and (newpanel or (a == a0 and b > b0)):
+            if stackcount < nstack and (newpanel or rowstack or (a == a0 and b > b0)):
                 y = []
                 if len(polmodes):
@@ -989 +996 @@
                     allxlim.sort()
                     self._plotter.subplots[panelcount-1]['axes'].set_xlim([allxlim[0],allxlim[-1]])
-                    # clear
-                    allxlim =[]
+                    if ganged:
+                        allxlim = [allxlim[0],allxlim[-1]]
+                    else:
+                        # clear
+                        allxlim =[]
 
             newpanel = False
@@ -998 +1008 @@
             if (panelcount == n and stackcount == nstack) or (r == nr-1):
                 # last panel -> autoscale y if ganged
-                if rcParams['plotter.ganged'] and len(allylim) > 0:
+                #if rcParams['plotter.ganged'] and len(allylim) > 0:
+                if ganged and len(allylim) > 0:
                     allylim.sort()
                     self._plotter.set_limits(ylim=[allylim[0],allylim[-1]])
@@ -1034 +1045 @@
             lsorts = []
             for order in lorders:
+                if order == "r":
+                    # don't sort if row panelling/stacking
+                    return None
                 ssort = d0[order]
                 if ssort:
@@ -1071 +1085 @@
         d1 = {'b': scan.getbeamnos, 's': scan.getscannos,
              'i': scan.getifnos, 'p': scan.getpolnos, 't': scan.ncycle,
-             'r': scan.nrow, '_r': False}
+             'r': scan.nrow}#, '_r': False}
         d2 = { 'b': self._selection.get_beams(),
                's': self._selection.get_scans(),
@@ -1077 +1091 @@
                'p': self._selection.get_pols(),
                't': self._selection.get_cycles(),
-               'r': False, '_r': 1}
+               'r': False}#, '_r': 1}
         n =  d2[self._panelling] or d1[self._panelling]()
         nstack = d2[self._stacking] or d1[self._stacking]()
+        # handle row panelling/stacking
+        if self._panelling == 'r':
+            nstack = 1
+        elif self._stacking == 'r':
+            n = 1
         return n,nstack