Changeset 2054 for branches

Timestamp:

03/18/11 16:02:54 (13 years ago)

Author:

Kana Sugimoto

Message:

merged a bug fix in trunk(r2053)

Location:

branches/casa-prerelease/pre-asap/python

Files:

• asapplotter.py (modified) (5 diffs)
• casatoolbar.py (modified) (3 diffs)

branches/casa-prerelease/pre-asap/python/asapplotter.py

@@ -55 +55 @@
         self._ipanel = -1
         self._panelrows = []
-        self._headstring = None
-        self._headsize = None
+        self._headtext={'string': None, 'textobj': None}
 
     def _translate(self, instr):
@@ -847 +846 @@
 
     def _reset_header(self):
-        self._headsize = None
-        self._headstring = None
+        self._headtext={'string': None, 'textobj': None}
 
     def _plot(self, scan):
@@ -1384 +1382 @@
     # printing header information
     @asaplog_post_dec
-    def print_header(self, plot=True, fontsize=None, logger=False, selstr='', extrastr=''):
+    def print_header(self, plot=True, fontsize=9, logger=False, selstr='', extrastr=''):
         """
         print data (scantable) header on the plot and/or logger.
         Parameters:
             plot:      whether or not print header info on the plot.
-            fontsize:  header font size (valid only plot=True) default: 9
+            fontsize:  header font size (valid only plot=True)
             logger:    whether or not print header info on the logger.
             selstr:    additional selection string (not verified)
-            extrastr:  additional string to print (not verified)
+            extrastr:  additional string to print at the beginning (not verified)
         """
         if not plot and not logger:
@@ -1402 +1400 @@
         ssum=self._data.__str__()
         # Print Observation header to the upper-left corner of plot
-        if self._headstring:
-            headstr = self._headstring
-            if extrastr != '': headstr[0]=extrastr+'\n'+headstr[0]
-            if selstr != '': headstr[2] += selstr
-            fontsize = fontsize or self._headsize
-        else:
-            headstr=[ssum[ssum.find('Observer:'):ssum.find('Flux Unit:')]]
-            headstr.append(ssum[ssum.find('Beams:'):ssum.find('Observer:')]
-                           +ssum[ssum.find('Rest Freqs:'):ssum.find('Abcissa:')])
-            if extrastr != '': headstr[0]=extrastr+'\n'+headstr[0]
-            ssel='***Selections***\n'+(selstr+self._data.get_selection().__str__() or 'none')
-            headstr.append(ssel)
-            del ssel
-        fontsize = fontsize or 9
-        self._headsize = fontsize
-        self._headstring = headstr
+        headstr=[ssum[ssum.find('Observer:'):ssum.find('Flux Unit:')]]
+        headstr.append(ssum[ssum.find('Beams:'):ssum.find('Observer:')]
+                       +ssum[ssum.find('Rest Freqs:'):ssum.find('Abcissa:')])
+        if extrastr != '':
+            headstr[0]=extrastr+'\n'+headstr[0]
+            self._headtext['extrastr'] = extrastr
+        if selstr != '': self._headtext['selstr'] = selstr
+        ssel=(selstr+self._data.get_selection().__str__() or 'none')
+        headstr.append('***Selections***\n'+ssel)
 
         if plot:
             self._plotter.hold()
-            nstcol=len(headstr)
-            for i in range(nstcol):
-                self._plotter.figure.text(0.03+float(i)/nstcol,0.98,
-                             headstr[i],
-                             horizontalalignment='left',
-                             verticalalignment='top',
-                             fontsize=fontsize)
+            self._header_plot(headstr,fontsize=fontsize)
             import time
             self._plotter.figure.text(0.99,0.0,
@@ -1435 +1420 @@
             self._plotter.release()
         if logger:
-            sextra = headstr[0][0:headstr[0].find('Observer:')].rstrip('\n')
-            selstr = "Selections:    "+(headstr[2].lstrip('***Selections***\n') or 'none')+"\n \n"
-                
+            selstr = "Selections:    "+ssel
             asaplog.push("----------------\n  Plot Summary\n----------------")
-            asaplog.push(sextra)
+            asaplog.push(extrastr)
             asaplog.push(ssum[ssum.find('Beams:'):ssum.find('Selection:')]\
                          + selstr + ssum[ssum.find('Scan Source'):])
-        del ssum, headstr
-
-#     def clear_header(self):
-#         if not self._headstring or len(self._plotter.figure.texts) == 0:
-#             asaplog.push("No header has been plotted. Exit without any operation")
-#             asaplog.post("WARN")
-#         else:
-#             self._plotter.hold()
-#             for textobj in self._plotter.figure.texts:
-#                 if textobj.get_text() in self._headstring:
-#                     try:
-#                         textobj.remove()
-#                     except NotImplementedError:
-#                         self._plotter.figure.texts.pop(self._plotter.figure.texts.index(textobj))
-#             self._plotter.release()
-#         self._reset_header()
+        self._headtext['string'] = headstr
+        del ssel, ssum, headstr
+
+    def _header_plot(self, texts, fontsize=9):
+        self._headtext['textobj']=[]
+        nstcol=len(texts)
+        for i in range(nstcol):
+            self._headtext['textobj'].append(
+                self._plotter.figure.text(0.03+float(i)/nstcol,0.98,
+                                          texts[i],
+                                          horizontalalignment='left',
+                                          verticalalignment='top',
+                                          fontsize=fontsize))
+
+    def clear_header(self):
+        if not self._headtext['textobj']:
+            asaplog.push("No header has been plotted. Exit without any operation")
+            asaplog.post("WARN")
+        else:
+            self._plotter.hold()
+            for textobj in self._headtext['textobj']:
+                #if textobj.get_text() in self._headstring:
+                try:
+                    textobj.remove()
+                except NotImplementedError:
+                    self._plotter.figure.texts.pop(self._plotter.figure.texts.index(textobj))
+            self._plotter.release()
+        self._reset_header()

branches/casa-prerelease/pre-asap/python/casatoolbar.py

@@ -182 +182 @@
     def _new_page(self,goback=False):
         top = None
+        header = self.plotter._headtext
+        reset = False
+        doheader = (isinstance(header['textobj'],list) and \
+                    len(header['textobj']) > 0)
         if self.plotter._startrow <= 0:
             msg = "The page counter is reset due to chages of plot settings. "
@@ -187 +191 @@
             asaplog.push(msg)
             asaplog.post('WARN')
+            reset = True
             goback = False
-        else:
+            if doheader:
+                extrastr = selstr = ''
+                if header.has_key('extrastr'):
+                    extrastr = header['extrastr']
+                if header.has_key('selstr'):
+                    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()
@@ -197 +210 @@
         self.plotter._plot(self.plotter._data)
         self.set_pagecounter(self._get_pagenum())
-        self.plotter._plotter.release()
-        self.plotter._plotter.tidy()
-        if self.plotter._headstring:
+        # Plot header information
+        if header['textobj']:
             if top and top != self.plotter._margins[3]:
                 # work around for sdplot in CASA. complete checking in future?
                 self.plotter._plotter.figure.subplots_adjust(top=top)
-            self.plotter.print_header()
+            if reset:
+                self.plotter.print_header(plot=True,fontsize=fontsize,selstr=selstr, extrastr=extrastr)
+            else:
+                self.plotter._header_plot(header['string'],fontsize=fontsize)
+        self.plotter._plotter.release()
+        self.plotter._plotter.tidy()
         self.plotter._plotter.show(hardrefresh=False)
         del top