Changeset 2110 for branches

Timestamp:

04/06/11 15:58:02 (14 years ago)

Author:

Kana Sugimoto

Message:

merged bug fixes in trunk (r2108)

Location:

branches/casa-prerelease/pre-asap/python

Files:

• . (modified) (1 prop)
• interactivemask.py (modified) (15 diffs)

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

@@ -2 +2 @@
 from asap.utils import _n_bools, mask_and, mask_or
 from asap.scantable import scantable
+from asap.logging import asaplog, asaplog_post_dec
 
 class interactivemask:
@@ -30 +31 @@
                 # Return if GUI is not active
                 if not rcParams['plotter.gui']:
-                        print 'GUI plotter is disabled.\n'
-                        print 'Exit interactive mode.'
+                        msg = 'GUI plotter is disabled.\n'
+                        msg += 'Exit interactive mode.'
+                        asaplog.push(msg)
+                        asaplog.post("ERROR")
                         return
                 # Verify input parameters
@@ -70 +73 @@
 
                 Parameters:
-                    masklist:  [[min, max], [min2, max2], ...]
-                               A list of pairs of start/end points (inclusive)
-                               specifying the regions to be masked
-                    invert:    optional argument. If specified as True,
-                               return an inverted mask, i.e. the regions
-                               specified are excluded
+                        masklist:  [[min, max], [min2, max2], ...]
+                                           A list of pairs of start/end points (inclusive)
+                                                           specifying the regions to be masked
+                        invert: optional argument. If specified as True,
+                                           return an inverted mask, i.e. the regions
+                                   specified are excluded
                 You can reset the mask selection by running this method with
                 the default parameters.
@@ -88 +91 @@
                 if ( len(masklist) > 0 ):
                         self.mask=self.scan.create_mask(masklist,invert=invert)
-                elif invert==True:
+                elif invert==True:
                         self.mask=_n_bools(self.scan.nchan(),False)
                 else:
@@ -99 +102 @@
 
                 Parameters:
-                    event: 'button_press_event' object to be inherited to
-                           start interactive region selection .
+                        event: 'button_press_event' object to be inherited to
+                                   start interactive region selection .
                 """
                 from matplotlib.backend_bases import MouseEvent
@@ -112 +115 @@
                 """
                 Set callback function to run when finish_selection() is executed.
-                    callback: The post processing function to run after
-                              the mask selections are completed.
-                              This will be overwritten if callback is defined in
-                              finish_selection(callback=func)
+                        callback: The post processing function to run after
+                                          the mask selections are completed.
+                                  This will be overwritten if callback is defined in
+                                  finish_selection(callback=func)
                 """
                 self.callback=callback
@@ -128 +131 @@
 
                 Parameters:
-                    once:     If specified as True, you can modify masks only
-                              once. Else if False, you can modify them repeatedly.
-                    showmask: If specified as True, the masked regions are plotted
-                              on the plotter.
-                              Note this parameter is valid only when once=True.
-                              Otherwise, maskes are forced to be plotted for reference.
+                        once:    If specified as True, you can modify masks only
+                                          once. Else if False, you can modify them repeatedly.
+                        showmask: If specified as True, the masked regions are plotted
+                                          on the plotter.
+                                  Note this parameter is valid only when once=True.
+                                  Otherwise, maskes are forced to be plotted for reference.
                 """
                 # Return if GUI is not active
                 if not rcParams['plotter.gui']:
-                        print 'GUI plotter is disabled.\n'
-                        print 'Exit interactive mode.'
+                        msg = 'GUI plotter is disabled.\n'
+                        msg += 'Exit interactive mode.'
+                        asaplog.push(msg)
+                        asaplog.post("ERROR")
                         return
 
@@ -145 +150 @@
                         self.showmask=showmask
                 else:
-                        if not showmask: print 'Warning: showmask spcification is ignored. Mask regions are plotted anyway.'
+                        if not showmask:
+                                asaplog.post()
+                                asaplog.push('showmask spcification is ignored. Mask regions are plotted anyway.')
+                                asaplog.post("WARN")
                         self.showmask=True
 
                 #if not self.p._plotter or self.p._plotter.is_dead:
                 if not self.p or self.p._plotter.is_dead:
-                        print 'A new ASAP plotter will be loaded'
+                        asaplog.push('A new ASAP plotter will be loaded')
+                        asaplog.post()
                         from asap.asapplotter import asapplotter
                         self.p=asapplotter()
                         self.newplot=True
 
-                # Plot selected spectra if needed
+                # Plot selected spectra if needed
                 if self.scan != self.p._data:
+                        if len(self.scan.getifnos()) > 16:
+                                asaplog.post()
+                                asaplog.push("Number of panels > 16. Plotting the first 16...")
+                                asaplog.post("WARN")
                         # Need replot
+                        self.p._plotter.legend(1)
                         self.p.plot(self.scan)
                         # disable casa toolbar
-                        if self.p._plotter.figmgr.casabar:  self.p._plotter.figmgr.casabar.disable_button()
+                        if self.p._plotter.figmgr.casabar:
+                                self.p._plotter.figmgr.casabar.disable_button()
+                                self.p._plotter.figmgr.casabar.disable_prev()
+                                self.p._plotter.figmgr.casabar.disable_next()
                         for panel in self.p._plotter.subplots:
                                 xmin, xmax = panel['axes'].get_xlim()
@@ -195 +212 @@
                 # Select mask/unmask region with mask
                 self.rect = {'button': event.button, 'axes': event.inaxes,
-                             'x': event.x, 'y': event.y,
-                             'world': [event.xdata, event.ydata,
-                                       event.xdata, event.ydata],
-                             'pixel': [event.x, event.y,
-                                       event.x, event.y]}
+                                 'x': event.x, 'y': event.y,
+                                 'world': [event.xdata, event.ydata,
+                                           event.xdata, event.ydata],
+                                 'pixel': [event.x, event.y,
+                                           event.x, event.y]}
                 self.p._plotter.register('motion_notify', self._region_draw)
                 self.p._plotter.register('button_release', self._region_end)
@@ -261 +278 @@
                         invmask=True
                         mflg='UNmask'
-                print mflg+': ',newlist
+                asaplog.push(mflg+': '+str(newlist))
+                asaplog.post()
                 newmask=self.scan.create_mask(newlist,invert=invmask)
                 # Logic operation to update mask
@@ -274 +292 @@
         # Plot masked regions
         def _plot_mask(self):
-                msks = []
-                msks = self.scan.get_masklist(self.mask,row=0)
+                msks = []
+                msks = self.scan.get_masklist(self.mask,row=0)
                 # Get projection masks for multi-IF
                 ifs=self.scan.getifnos()
@@ -287 +305 @@
                                                 projs.append(self.scan.get_masklist(self.mask,row=row))
                                                 break
-                if len(self._polygons)>0:
+                if len(self._polygons)>0:
                         # Remove old polygons
                         for polygon in self._polygons: polygon.remove()
@@ -310 +328 @@
 
                 Parameters:
-                    callback: The post processing function to run after
-                              the mask selections are completed.
-                              Specifying the callback function here will overwrite
-                              the one set by set_callback(func)
+                        callback: The post processing function to run after
+                                          the mask selections are completed.
+                                  Specifying the callback function here will overwrite
+                                  the one set by set_callback(func)
 
                 Note this function is automatically called at the end of
@@ -336 +354 @@
                 Erase masks plots from the plotter.
                 """
-                if len(self._polygons)>0:
+                if len(self._polygons)>0:
                         # Remove old polygons
                         for polygon in self._polygons: polygon.remove()
@@ -347 +365 @@
                 Get the interactively selected channel mask.
                 Returns:
-                    A list of channel mask.
+                        A list of channel mask.
                 """
                 return self.mask