Changeset 2052 for branches

Timestamp:

03/17/11 18:46:12 (14 years ago)

Author:

Kana Sugimoto

Message:

merged a bug fix in trunk(r2051)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/asapplotter.py (modified) (5 diffs)
• python/casatoolbar.py (modified) (3 diffs)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

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

@@ -55 +55 @@
         self._ipanel = -1
         self._panelrows = []
+        self._headstring = None
+        self._headsize = None
 
     def _translate(self, instr):
@@ -842 +844 @@
         self._offset = None
         self.set_selection(None, False)
+        self._reset_header()
+
+    def _reset_header(self):
+        self._headsize = None
+        self._headstring = None
 
     def _plot(self, scan):
@@ -1377 +1384 @@
     # printing header information
     @asaplog_post_dec
-    def print_header(self, plot=True, fontsize=9, logger=False, selstr='', extrastr=''):
+    def print_header(self, plot=True, fontsize=None, 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)
+            fontsize:  header font size (valid only plot=True) default: 9
             logger:    whether or not print header info on the logger.
             selstr:    additional selection string (not verified)
@@ -1395 +1402 @@
         ssum=self._data.__str__()
         # Print Observation header to the upper-left corner of plot
-        if 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:')])
+                           +ssum[ssum.find('Rest Freqs:'):ssum.find('Abcissa:')])
             if extrastr != '': headstr[0]=extrastr+'\n'+headstr[0]
-            #headstr[1]='Data File:     '+(filestr or 'unknown')+'\n'+headstr[1]
             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
+
+        if plot:
+            self._plotter.hold()
             nstcol=len(headstr)
-
-            self._plotter.hold()
             for i in range(nstcol):
                 self._plotter.figure.text(0.03+float(i)/nstcol,0.98,
@@ -1418 +1434 @@
                             verticalalignment='bottom',fontsize=8)
             self._plotter.release()
-            del headstr, ssel
         if logger:
+            sextra = headstr[0][0:headstr[0].find('Observer:')].rstrip('\n')
+            selstr = "Selections:    "+(headstr[2].lstrip('***Selections***\n') or 'none')+"\n \n"
+                
             asaplog.push("----------------\n  Plot Summary\n----------------")
-            asaplog.push(extrastr)
-            asaplog.push(ssum[ssum.find('Beams:'):])
-        del ssum
+            asaplog.push(sextra)
+            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()

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

@@ -181 +181 @@
     ### actual plotting of the new page
     def _new_page(self,goback=False):
+        top = None
         if self.plotter._startrow <= 0:
             msg = "The page counter is reset due to chages of plot settings. "
@@ -187 +188 @@
             asaplog.post('WARN')
             goback = False
-            
+        else:
+            top = self.plotter._plotter.figure.subplotpars.top
+
         self.plotter._plotter.hold()
         if goback:
@@ -196 +199 @@
         self.plotter._plotter.release()
         self.plotter._plotter.tidy()
+        if self.plotter._headstring:
+            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()
         self.plotter._plotter.show(hardrefresh=False)
+        del top
 
     ### calculate the panel ID and start row to plot the previous page