Changeset 1981 for trunk/python/asapplotter.py

Timestamp:

01/28/11 17:34:32 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1822/ASAP-204)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: Added "-" page button and page counter to the ASAP plotter

Test Programs: plot spectra and press Page: "+" and "-" button to go

back and forth between the pages

Put in Release Notes: Yes

Module(s): asapplotter and sdplot (CASA)

Description:

Added "-" page button and page counter to the ASAP plotter.
Renamed "+ page" button to "+" button.
You can plot multi-page plots and move back and forth between pages.

File:

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

trunk/python/asapplotter.py

@@ -52 +52 @@
         self._panellayout = self.set_panellayout(refresh=False)
         self._offset = None
-        self._rowcount = 0
-        self._panelcnt = 0
+        self._startrow = 0
+        self._ipanel = -1
+        self._panelrows = []
 
     def _translate(self, instr):
@@ -96 +97 @@
             are consistent e.g. all 'channel' or all 'velocity' etc.
         """
-        self._rowcount = self._panelcnt = 0
+        self._startrow = 0
+        self._ipanel = -1
         if self._plotter.is_dead:
             if hasattr(self._plotter.figmgr,'casabar'):
@@ -102 +104 @@
             self._plotter = self._newplotter()
             self._plotter.figmgr.casabar=self._newcasabar()
+        if self._plotter.figmgr.casabar:
+            self._plotter.figmgr.casabar.set_pagenum(1)
+        self._panelrows = []
         self._plotter.hold()
         #self._plotter.clear()
@@ -361 +366 @@
             if md == 'r':
                 self._stacking = '_r'
+            # you need to reset counters for multi page plotting
+            self._reset_counters()
             return True
         return False
@@ -396 +403 @@
             if md == 'r':
                 self._panelling = '_r'
+            # you need to reset counters for multi page plotting
+            self._reset_counters()
             return True
         return False
+
+    def _reset_counters(self):
+        self._startrow = 0
+        self._ipanel = -1
+        self._panelrows = []
 
     def set_range(self,xstart=None,xend=None,ystart=None,yend=None,refresh=True, offset=None):
@@ -853 +867 @@
             asaplog.post('WARN')
             nstack = min(nstack,maxstack)
-        n = min(n,maxpanel)
+        #n = min(n,maxpanel)
+        n = min(n-self._ipanel-1,maxpanel)
             
         if n > 1:
@@ -871 +886 @@
             self._plotter.set_panels(layout=self._panellayout)
         #r = 0
-        r = self._rowcount
+        r = self._startrow
         nr = scan.nrow()
         a0,b0 = -1,-1
         allxlim = []
         allylim = []
-        newpanel=True
+        #newpanel=True
+        newpanel=False
         panelcount,stackcount = 0,0
+        # If this is not the first page
+        if r > 0:
+            # panelling value of the prev page 
+            a0 = d[self._panelling](r-1)
+            # set the initial stackcount large not to plot
+            # the start row automatically
+            stackcount = nstack
+
         while r < nr:
             a = d[self._panelling](r)
@@ -906 +930 @@
                 stackcount = 0
                 panelcount += 1
+                # save the start row to plot this panel for future revisit.
+                if self._panelling != 'r' and \
+                       len(self._panelrows) < self._ipanel+1+panelcount:
+                    self._panelrows += [r]
+                    
             #if (b > b0 or newpanel) and stackcount < nstack:
             if stackcount < nstack and (newpanel or (a == a0 and b > b0)):
@@ -954 +983 @@
                     allylim += ylim
                 stackcount += 1
+                a0=a
+                b0=b
                 # last in colour stack -> autoscale x
                 if stackcount == nstack and len(allxlim) > 0:
@@ -962 +993 @@
 
             newpanel = False
-            a0=a
-            b0=b
+            #a0=a
+            #b0=b
             # ignore following rows
-            if (panelcount == n) and (stackcount == nstack):
+            if (panelcount == n and stackcount == nstack) or (r == nr-1):
                 # last panel -> autoscale y if ganged
                 if rcParams['plotter.ganged'] and len(allylim) > 0:
@@ -972 +1003 @@
                 break
             r+=1 # next row
-        ###-S
-        self._rowcount = r+1
-        self._panelcnt += panelcount
+
+        # save the current counter for multi-page plotting
+        self._startrow = r+1
+        self._ipanel += panelcount
         if self._plotter.figmgr.casabar:
-            if self._panelcnt >= nptot-1:
+            if self._ipanel >= nptot-1:
                 self._plotter.figmgr.casabar.disable_next()
             else:
                 self._plotter.figmgr.casabar.enable_next()
-            #if self._panelcnt - panelcount > 0:
-            #    self._plotter.figmgr.casabar.enable_prev()
-            #else:
-            #    self._plotter.figmgr.casabar.disable_prev()
-        ###-E
+            if self._ipanel + 1 - panelcount > 0:
+                self._plotter.figmgr.casabar.enable_prev()
+            else:
+                self._plotter.figmgr.casabar.disable_prev()
+
         #reset the selector to the scantable's original
         scan.set_selection(savesel)