Changeset 2697

Timestamp:

12/14/12 13:48:22 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: iterate pages

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description: An attempt to speed-up page iterations in ASAP plotter.

Location:

trunk/python

Files:

• asaplotbase.py (modified) (1 diff)
• asapplotter.py (modified) (8 diffs)
• customgui_base.py (modified) (5 diffs)

trunk/python/asaplotbase.py

@@ -94 +94 @@
         """
 
-        for i in range(len(self.lines)):
-           self.delete(i)
+        #for i in range(len(self.lines)):
+        #   self.delete(i)
         self.axes.clear()
         self.color = 0
         self.lines = []
+        self.subplots[self.i]['lines'] = self.lines
 
     def palette(self, color, colormap=None, linestyle=0, linestyles=None):

trunk/python/asapplotter.py

@@ -193 +193 @@
             msg = "Input is not a scantable"
             raise TypeError(msg)
-        self._startrow = 0
-        self._ipanel = -1
-        self._reset_header()
-        self._panelrows = []
 
         self._assert_plotter(action="reload")
-        if self.casabar_exists():
-            self._plotter.figmgr.casabar.set_pagecounter(1)
-
         self._plotter.hold()
+        self._reset_counter()
         #self._plotter.clear()
         if scan: 
@@ -969 +963 @@
         self._headtext={'string': None, 'textobj': None}
 
+    def _reset_counter(self):
+        self._startrow = 0
+        self._ipanel = -1
+        self._reset_header()
+        self._panelrows = []
+        if self.casabar_exists():
+            self._plotter.figmgr.casabar.set_pagecounter(1)
+
     def _plot(self, scan):
         savesel = scan.get_selection()
@@ -1004 +1006 @@
         #n = min(n-self._ipanel-1,maxpanel)
         n = n-self._ipanel-1
-
-        ganged = False
-        if n > 1:
-            ganged = rcParams['plotter.ganged']
-            if self._panelling == 'i':
-                ganged = False
-            if self._rows and self._cols:
-                n = min(n,self._rows*self._cols)
+        # the number of panels in this page
+        if self._rows and self._cols:
+            n = min(n,self._rows*self._cols)
+        else:
+            n = min(n,maxpanel)
+
+        firstpage = (self._ipanel < 0)
+        #ganged = False
+        ganged = rcParams['plotter.ganged']
+        if self._panelling == 'i':
+            ganged = False
+        if not firstpage:
+            # not the first page just clear the axis
+            nx = self._plotter.cols
+            ipaxx = n - nx - 1 #the max panel id to supress x-label
+            for ip in xrange(len(self._plotter.subplots)):
+                self._plotter.subplot(ip)
+                self._plotter.clear()
+                self._plotter.axes.set_visible((ip<n))
+                if ganged:
+                    self._plotter.axes.xaxis.label.set_visible((ip > ipaxx))
+                    if ip <= ipaxx:
+                        map(lambda x: x.set_visible(False), \
+                            self._plotter.axes.get_xticklabels())
+                    self._plotter.axes.yaxis.label.set_visible((ip % nx)==0)
+                    if ip % nx:
+                        map(lambda y: y.set_visible(False), \
+                            self._plotter.axes.get_yticklabels())
+        elif (n > 1 and self._rows and self._cols):
                 self._plotter.set_panels(rows=self._rows,cols=self._cols,
                                          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)
         else:
-            self._plotter.set_panels(margin=self._margins)
+            self._plotter.set_panels(rows=n,cols=0,nplots=n,
+                                     margin=self._margins,ganged=ganged)
         #r = 0
         r = self._startrow
@@ -1172 +1192 @@
         if self._fp is not None and getattr(self._plotter.figure,'findobj',False):
             for o in self._plotter.figure.findobj(Text):
-                o.set_fontproperties(self._fp)
+                if not self._headtext['textobj'] or \
+                   not (o in self._headtext['textobj']):
+                    o.set_fontproperties(self._fp)
 
     def _get_sortstring(self, lorders):
@@ -1400 +1422 @@
         self._assert_plotter(action="reload")
         self._plotter.hold()
+        self._reset_counter()
         if self.casabar_exists():
-            self._plotter.figmgr.casabar.set_pagecounter(1)
             self._plotter.figmgr.casabar.disable_button()
         # for now, only one plot
@@ -1667 +1689 @@
             self._plotter.hold()
             self._header_plot(headstr,fontsize=fontsize)
-            import time
-            self._plotter.figure.text(0.99,0.01,
-                            time.strftime("%a %d %b %Y  %H:%M:%S %Z"),
-                            horizontalalignment='right',
-                            verticalalignment='bottom',fontsize=8)
+            #import time
+            #self._plotter.figure.text(0.99,0.01,
+            #                time.strftime("%a %d %b %Y  %H:%M:%S %Z"),
+            #                horizontalalignment='right',
+            #                verticalalignment='bottom',fontsize=8)
             self._plotter.release()
         if logger:
@@ -1867 +1889 @@
         self._assert_plotter(action="reload")
         self._plotter.hold()
-        #self._plotter.clear() #all artists are cleared at set_panels
+        self._reset_counter()
         self._plotter.legend()
 
@@ -1876 +1898 @@
                                  nplots=ntotpl,margin=self._margins,ganged=True)        
         if self.casabar_exists():
-            self._plotter.figmgr.casabar.set_pagecounter(1)
             self._plotter.figmgr.casabar.enable_button()
         # Plot helper

trunk/python/customgui_base.py

@@ -326 +326 @@
         doheader = (isinstance(header['textobj'],list) and \
                     len(header['textobj']) > 0)
+        if doheader:
+            top = self.plotter._plotter.figure.subplotpars.top
+            fontsize = header['textobj'][0].get_fontproperties().get_size()
         if self.plotter._startrow <= 0:
             msg = "The page counter is reset due to chages of plot settings. "
@@ -340 +343 @@
                     selstr = header['selstr']
             self.plotter._reset_header()
-        if doheader:
-            top = self.plotter._plotter.figure.subplotpars.top
-            fontsize = header['textobj'][0].get_fontproperties().get_size()
 
         self.plotter._plotter.hold()
@@ -349 +349 @@
         #self.plotter._plotter.clear()
         self.plotter._plot(self.plotter._data)
-        self.set_pagecounter(self._get_pagenum())
+        pagenum = self._get_pagenum()
+        self.set_pagecounter(pagenum)
         # Plot header information
-        if header['textobj']:
+        #if header['textobj']:
+        if doheader and pagenum == 1:
             if top and top != self.plotter._margins[3]:
                 # work around for sdplot in CASA. complete checking in future?
@@ -403 +405 @@
 
     def _get_pagenum(self):
-        maxpanel = 16
         # get the ID of last panel in the current page
         idlastpanel = self.plotter._ipanel
-        if self.plotter._rows and self.plotter._cols:
-            ppp = self.plotter._rows*self.plotter._cols
-        else:
-            ppp = maxpanel
+        # max panels in a page
+        ppp = self.plotter._plotter.rows*self.plotter._plotter.cols
         return int(idlastpanel/ppp)+1
 
@@ -1239 +1238 @@
 
     def _get_pagenum(self):
-        maxpanel = 25
         # get the ID of last panel in the current page
         idlastpanel = self.plotter._ipanel
-        if self.plotter._rows and self.plotter._cols:
-            ppp = self.plotter._rows*self.plotter._cols
-        else:
-            ppp = maxpanel
+        # max panels in a page
+        ppp = self.plotter._plotter.rows*self.plotter._plotter.cols
         return int(idlastpanel/ppp)+1