Changeset 2697 for trunk/python/customgui_base.py

Timestamp:

12/14/12 13:48:22 (11 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.

File:

• trunk/python/customgui_base.py (modified) (5 diffs)

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