Changeset 2000 for trunk/python

Timestamp:

02/18/11 12:50:32 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-1306/ASAP-205)

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: run flagplotter

Put in Release Notes: No

Module(s): flagtoolbar & flagplotter

Description:

Region selection and operation information will be printed on the logger
instead of the terminal.
Removed _statistics function in CustomFlagToolbarCommon and merged it to stat_cal function.

File:

• trunk/python/flagtoolbar.py (modified) (4 diffs)

trunk/python/flagtoolbar.py

@@ -118 +118 @@
 
 
-    ### Calculate statistics of the selected area.
+    ### Notation
+    def _mod_note(self,event):
+        # Do not fire event when in zooming/panning mode
+        if not self.figmgr.toolbar.mode == '':
+            return
+        if event.button ==1:
+            self.notewin.load_textwindow(event)
+        elif event.button == 3 and self._note_picked(event):
+            self.notewin.load_modmenu(event)
+        return
+
+    def _note_picked(self,event):
+        # just briefly check if any texts are picked
+        for textobj in self.canvas.figure.texts:
+            if textobj.contains(event)[0]:
+                return True
+        for ax in self.canvas.figure.axes:
+            for textobj in ax.texts:
+                if textobj.contains(event)[0]:
+                    return True
+        #print "No text picked"
+        return False
+
+    ### Region/Panel selection & oparations
+    ### add regions to selections
     @asaplog_post_dec
-    def _statistics(self):
+    def _add_region(self,event):
+        if not self.figmgr.toolbar.mode == '':
+            return
+        if event.button != 1 or event.inaxes == None:
+            return
+        # this row resolution assumes row panelling
+        irow = int(self._getrownum(event.inaxes))
+        if irow in self._selpanels:
+            msg = "The whole spectrum is already selected"
+            asaplog.post()
+            asaplog.push(msg)
+            asaplog.post('WARN')
+            return
+        #print "add the region to selections"
+        self._thisregion = {'axes': event.inaxes,'xs': event.xdata,
+                            'worldx': [event.xdata,event.xdata]}
+        self.plotter._plotter.register('button_press',None)
+        self.plotter._plotter.register('motion_notify', self._xspan_draw)
+        self.plotter._plotter.register('button_press', self._xspan_end)
+
+    def _xspan_draw(self,event):
+        if event.inaxes == self._thisregion['axes']:
+            xnow = event.xdata
+            self.xdataold = xnow
+        else:
+            xnow = self.xdataold
+        try: self.lastspan
+        except AttributeError: pass
+        else: self.lastspan.remove()
+
+        self.lastspan = self._thisregion['axes'].axvspan(self._thisregion['xs'],xnow,facecolor='0.7')
+        #self.plotter._plotter.show(False)
+        self.plotter._plotter.canvas.draw()
+        del xnow
+
+    def _xspan_end(self,event):
+        if not self.figmgr.toolbar.mode == '':
+            return
+        if event.button != 1:
+            return
+        
+        try: self.lastspan
+        except AttributeError: pass
+        else:
+            self.lastspan.remove()
+            del self.lastspan
+        if event.inaxes == self._thisregion['axes']:
+            xdataend = event.xdata
+        else:
+            xdataend=self.xdataold
+
+        self._thisregion['worldx'][1] = xdataend
+        lregion = self._thisregion['worldx']
+        pregion = self._thisregion['axes'].axvspan(lregion[0],lregion[1],
+                                                   facecolor='0.7')
+        #self.plotter._plotter.show(False)
+        self.plotter._plotter.canvas.draw()
+        self._polygons.append(pregion)
+        srow = self._getrownum(self._thisregion['axes'])
+        irow = int(srow)
+        if not self._selregions.has_key(srow):
+            self._selregions[srow] = []
+        self._selregions[srow].append(lregion)
+        del lregion, pregion, xdataend
+        sout = "selected region: "+str(self._thisregion['worldx'])+\
+              "(@row "+str(self._getrownum(self._thisregion['axes']))+")"
+        asaplog.push(sout)
+
+        # release event
+        self.plotter._plotter.register('button_press',None)
+        self.plotter._plotter.register('motion_notify',None)
+        # Clear up region selection
+        self._thisregion = None
+        self.xdataold = None
+        # finally recover region selection event
+        self.plotter._plotter.register('button_press',self._add_region)
+
+    ### add panels to selections
+    @asaplog_post_dec
+    def _add_panel(self,event):
+        if not self.figmgr.toolbar.mode == '':
+            return
+        if event.button != 1 or event.inaxes == None:
+            return
+        selax = event.inaxes
+        # this row resolution assumes row panelling
+        srow = self._getrownum(selax)
+        irow = int(srow)
+        if srow:
+            self._selpanels.append(irow)
+        shadow = Rectangle((0,0),1,1,facecolor='0.7',transform=selax.transAxes,visible=True)
+        self._polygons.append(selax.add_patch(shadow))
+        #self.plotter._plotter.show(False)
+        self.plotter._plotter.canvas.draw()
+        asaplog.push("row "+str(irow)+" is selected")
+        #print "selected rows =",self._selpanels
+        ## check for region selection of the spectra and overwrite it.
+        ##!!!! currently disabled for consistency with flag tools !!!!
+        #if self._selregions.has_key(srow):
+        #    self._selregions.pop(srow)
+        #    msg = "The whole spectrum is selected for row="+srow+". Region selection will be overwritten."
+        #    asaplog.push(msg)
+
+    def _getrownum(self,axis):
+        ### returns the row number of selected spectrum as a string ###
+        plabel = axis.get_title()
+        if plabel.startswith("row "):
+            return plabel.strip("row ")
+        return None
+
+    def _any_selection(self):
+        ### returns if users have selected any spectrum or region ###
+        if len(self._selpanels) or len(self._selregions):
+            return True
+        return False
+
+    def _plot_selections(self,regions=None,panels=None):
+        ### mark panels/spectra selections in the page
+        if not self._any_selection() and not (regions or panels):
+            return
+        regions = regions or self._selregions.copy() or {}
+        panels = panels or self._selpanels or []
+        if not isinstance(regions,dict):
+            asaplog.post()
+            asaplog.push("Invalid region specification")
+            asaplog.post('ERROR')
+        if not isinstance(panels,list):
+            asaplog.post()
+            asaplog.push("Invalid panel specification")
+            asaplog.post('ERROR')
+        strow = self._getrownum(self.plotter._plotter.subplots[0]['axes'])
+        enrow = self._getrownum(self.plotter._plotter.subplots[-1]['axes'])
+        for irow in range(int(strow),int(enrow)+1):
+            if regions.has_key(str(irow)):
+                ax = self.plotter._plotter.subplots[irow - int(strow)]['axes']
+                mlist = regions.pop(str(irow))
+                for i in range(len(mlist)):
+                    self._polygons.append(ax.axvspan(mlist[i][0],mlist[i][1],
+                                                     facecolor='0.7'))
+                del ax,mlist
+            if irow in panels:
+                ax = self.plotter._plotter.subplots[irow - int(strow)]['axes']
+                shadow = Rectangle((0,0),1,1,facecolor='0.7',
+                                   transform=ax.transAxes,visible=True)
+                self._polygons.append(ax.add_patch(shadow))
+                del ax,shadow
+        #self.plotter._plotter.show(False)
+        self.plotter._plotter.canvas.draw()
+        del regions,panels,strow,enrow
+
+    def _clear_selection_plot(self):
+        ### clear up polygons which mark selected spectra and regions ###
+        if len(self._polygons) > 0:
+            for shadow in self._polygons:
+                shadow.remove()
+            self.plotter._plotter.canvas.draw()
+        self._polygons = []
+
+    def _clearup_selections(self):
+        # clear-up selection and polygons
+        self._selpanels = []
+        self._selregions = {}
+        self._clear_selection_plot()
+
+    ### clear up selections
+    def cancel_select(self):
+        self.figmgr.toolbar.set_message('selections canceled')
+        # clear-up selection and polygons
+        self._clearup_selections()
+
+    ### flag selected spectra/regions
+    @asaplog_post_dec
+    def flag(self):
+        if not self._any_selection():
+            msg = "No selection to be Flagged"
+            asaplog.post()
+            asaplog.push(msg)
+            asaplog.post('WARN')
+            return
+        self._flag_operation(rows=self._selpanels,
+                             regions=self._selregions,unflag=False)
+        sout = "Flagged:\n"
+        sout += "  rows = "+str(self._selpanels)+"\n"
+        sout += "  regions: "+str(self._selregions)
+        asaplog.push(sout)
+        del sout
+        self._clearup_selections()
+        self._plot_page(pagemode="current")
+
+    ### unflag selected spectra/regions
+    @asaplog_post_dec
+    def unflag(self):
+        if not self._any_selection():
+            msg = "No selection to be Flagged"
+            asaplog.push(msg)
+            asaplog.post('WARN')
+            return
+        self._flag_operation(rows=self._selpanels,
+                             regions=self._selregions,unflag=True)
+        sout = "Unflagged:\n"
+        sout += "  rows = "+str(self._selpanels)+"\n"
+        sout += "  regions: "+str(self._selregions)
+        asaplog.push(sout)
+        del sout
+        self._clearup_selections()
+        self._plot_page(pagemode="current")
+
+    ### actual flag operation
+    @asaplog_post_dec
+    def _flag_operation(self,rows=None,regions=None,unflag=False):
+        scan = self.plotter._data
+        if not scan:
+            asaplog.post()
+            asaplog.push("Invalid scantable")
+            asaplog.post("ERROR")
+        if isinstance(rows,list) and len(rows) > 0:
+            scan.flag_row(rows=rows,unflag=unflag)
+        if isinstance(regions,dict) and len(regions) > 0:
+            for srow, masklist in regions.iteritems():
+                if not isinstance(masklist,list) or len(masklist) ==0:
+                    msg = "Ignoring invalid region selection for row = "+srow
+                    asaplog.post()
+                    asaplog.push(msg)
+                    asaplog.post("WARN")
+                    continue
+                irow = int(srow)
+                mask = scan.create_mask(masklist,invert=False,row=irow)
+                scan.flag(row=irow,mask=mask,unflag=unflag)
+                del irow, mask
+            del srow, masklist
+        del scan
+
+    ### show statistics of selected spectra/regions
+    @asaplog_post_dec
+    def stat_cal(self):
         if not self._any_selection():
             msg = "No selection to be calculated"
@@ -126 +384 @@
             asaplog.post('WARN')
             return
-        print "Calculate statistics of selected region and spectra"
+        #print "Calculate statistics of selected region and spectra"
         self._selected_stats(rows=self._selpanels,regions=self._selregions)
-        print "Statistics: "
-        print "- rows: ",self._selpanels
-        print "- regions:\n   ",self._selregions
+        #print "Statistics: "
+        #print "- rows: ",self._selpanels
+        #print "- regions:\n   ",self._selregions
         self._clearup_selections()
 
@@ -202 +460 @@
         del sout, ssep, maskstr, statvals, key, scan, row, stats, statstr, mask
 
-    ### Notation
-    def _mod_note(self,event):
-        # Do not fire event when in zooming/panning mode
-        if not self.figmgr.toolbar.mode == '':
-            return
-        if event.button ==1:
-            self.notewin.load_textwindow(event)
-        elif event.button == 3 and self._note_picked(event):
-            self.notewin.load_modmenu(event)
-        return
-
-    def _note_picked(self,event):
-        # just briefly check if any texts are picked
-        for textobj in self.canvas.figure.texts:
-            if textobj.contains(event)[0]:
-                return True
-        for ax in self.canvas.figure.axes:
-            for textobj in ax.texts:
-                if textobj.contains(event)[0]:
-                    return True
-        #print "No text picked"
-        return False
-
-    ### Region/Panel selection & oparations
-    ### add regions to selections
-    @asaplog_post_dec
-    def _add_region(self,event):
-        if not self.figmgr.toolbar.mode == '':
-            return
-        if event.button != 1 or event.inaxes == None:
-            return
-        # this row resolution assumes row panelling
-        irow = int(self._getrownum(event.inaxes))
-        if irow in self._selpanels:
-            msg = "The whole spectrum is already selected"
-            asaplog.post()
-            asaplog.push(msg)
-            asaplog.post('WARN')
-            return
-        print "add the region to selections"
-        self._thisregion = {'axes': event.inaxes,'xs': event.xdata,
-                            'worldx': [event.xdata,event.xdata]}
-        self.plotter._plotter.register('button_press',None)
-        self.plotter._plotter.register('motion_notify', self._xspan_draw)
-        self.plotter._plotter.register('button_press', self._xspan_end)
-
-    def _xspan_draw(self,event):
-        if event.inaxes == self._thisregion['axes']:
-            xnow = event.xdata
-            self.xdataold = xnow
-        else:
-            xnow = self.xdataold
-        try: self.lastspan
-        except AttributeError: pass
-        else: self.lastspan.remove()
-
-        self.lastspan = self._thisregion['axes'].axvspan(self._thisregion['xs'],xnow,facecolor='0.7')
-        #self.plotter._plotter.show(False)
-        self.plotter._plotter.canvas.draw()
-        del xnow
-
-    def _xspan_end(self,event):
-        if not self.figmgr.toolbar.mode == '':
-            return
-        if event.button != 1:
-            return
-        
-        try: self.lastspan
-        except AttributeError: pass
-        else:
-            self.lastspan.remove()
-            del self.lastspan
-        if event.inaxes == self._thisregion['axes']:
-            xdataend = event.xdata
-        else:
-            xdataend=self.xdataold
-
-        self._thisregion['worldx'][1] = xdataend
-        lregion = self._thisregion['worldx']
-        pregion = self._thisregion['axes'].axvspan(lregion[0],lregion[1],
-                                                   facecolor='0.7')
-        #self.plotter._plotter.show(False)
-        self.plotter._plotter.canvas.draw()
-        self._polygons.append(pregion)
-        srow = self._getrownum(self._thisregion['axes'])
-        irow = int(srow)
-        if not self._selregions.has_key(srow):
-            self._selregions[srow] = []
-        self._selregions[srow].append(lregion)
-        del lregion, pregion, xdataend
-        print "selected region: ",self._thisregion['worldx'],\
-              "(@row ",self._getrownum(self._thisregion['axes']),")"
-
-        # release event
-        self.plotter._plotter.register('button_press',None)
-        self.plotter._plotter.register('motion_notify',None)
-        # Clear up region selection
-        self._thisregion = None
-        self.xdataold = None
-        # finally recover region selection event
-        self.plotter._plotter.register('button_press',self._add_region)
-
-    ### add panels to selections
-    @asaplog_post_dec
-    def _add_panel(self,event):
-        if not self.figmgr.toolbar.mode == '':
-            return
-        if event.button != 1 or event.inaxes == None:
-            return
-        selax = event.inaxes
-        # this row resolution assumes row panelling
-        srow = self._getrownum(selax)
-        irow = int(srow)
-        if srow:
-            self._selpanels.append(irow)
-        shadow = Rectangle((0,0),1,1,facecolor='0.7',transform=selax.transAxes,visible=True)
-        self._polygons.append(selax.add_patch(shadow))
-        #self.plotter._plotter.show(False)
-        self.plotter._plotter.canvas.draw()
-        print "row", irow, "added to the panel selections"
-        print "selected rows =",self._selpanels
-        ## check for region selection of the spectra and overwrite it.
-        ##!!!! currently disabled for consistency with flag tools !!!!
-        #if self._selregions.has_key(srow):
-        #    self._selregions.pop(srow)
-        #    msg = "The whole spectrum is selected for row="+srow+". Region selection will be overwritten."
-        #    asaplog.push(msg)
-
-    def _getrownum(self,axis):
-        ### returns the row number of selected spectrum as a string ###
-        plabel = axis.get_title()
-        if plabel.startswith("row "):
-            return plabel.strip("row ")
-        return None
-
-    def _any_selection(self):
-        ### returns if users have selected any spectrum or region ###
-        if len(self._selpanels) or len(self._selregions):
-            return True
-        return False
-
-    def _plot_selections(self,regions=None,panels=None):
-        ### mark panels/spectra selections in the page
-        if not self._any_selection() and not (regions or panels):
-            return
-        regions = regions or self._selregions.copy() or {}
-        panels = panels or self._selpanels or []
-        if not isinstance(regions,dict):
-            asaplog.post()
-            asaplog.push("Invalid region specification")
-            asaplog.post('ERROR')
-        if not isinstance(panels,list):
-            asaplog.post()
-            asaplog.push("Invalid panel specification")
-            asaplog.post('ERROR')
-        strow = self._getrownum(self.plotter._plotter.subplots[0]['axes'])
-        enrow = self._getrownum(self.plotter._plotter.subplots[-1]['axes'])
-        for irow in range(int(strow),int(enrow)+1):
-            if regions.has_key(str(irow)):
-                ax = self.plotter._plotter.subplots[irow - int(strow)]['axes']
-                mlist = regions.pop(str(irow))
-                for i in range(len(mlist)):
-                    self._polygons.append(ax.axvspan(mlist[i][0],mlist[i][1],
-                                                     facecolor='0.7'))
-                del ax,mlist
-            if irow in panels:
-                ax = self.plotter._plotter.subplots[irow - int(strow)]['axes']
-                shadow = Rectangle((0,0),1,1,facecolor='0.7',
-                                   transform=ax.transAxes,visible=True)
-                self._polygons.append(ax.add_patch(shadow))
-                del ax,shadow
-        #self.plotter._plotter.show(False)
-        self.plotter._plotter.canvas.draw()
-        del regions,panels,strow,enrow
-
-    def _clear_selection_plot(self):
-        ### clear up polygons which mark selected spectra and regions ###
-        if len(self._polygons) > 0:
-            for shadow in self._polygons:
-                shadow.remove()
-            self.plotter._plotter.canvas.draw()
-        self._polygons = []
-
-    def _clearup_selections(self):
-        # clear-up selection and polygons
-        self._selpanels = []
-        self._selregions = {}
-        self._clear_selection_plot()
-
-    ### clear up selections
-    def cancel_select(self):
-        self.figmgr.toolbar.set_message('selections canceled')
-        # clear-up selection and polygons
-        self._clearup_selections()
-
-    ### flag selected spectra/regions
-    @asaplog_post_dec
-    def flag(self):
-        if not self._any_selection():
-            msg = "No selection to be Flagged"
-            asaplog.post()
-            asaplog.push(msg)
-            asaplog.post('WARN')
-            return
-        self._flag_operation(rows=self._selpanels,
-                             regions=self._selregions,unflag=False)
-        print "Flagged"
-        print "- rows: ",self._selpanels
-        print "- regions:\n   ",self._selregions
-        self._clearup_selections()
-        self._plot_page(pagemode="current")
-
-    ### unflag selected spectra/regions
-    @asaplog_post_dec
-    def unflag(self):
-        if not self._any_selection():
-            msg = "No selection to be Flagged"
-            asaplog.push(msg)
-            asaplog.post('WARN')
-            return
-        self._flag_operation(rows=self._selpanels,
-                             regions=self._selregions,unflag=True)
-        print "Unflagged:"
-        print "- rows: ",self._selpanels
-        print "- regions:\n   ",self._selregions
-        self._clearup_selections()
-        self._plot_page(pagemode="current")
-
-    ### actual flag operation
-    @asaplog_post_dec
-    def _flag_operation(self,rows=None,regions=None,unflag=False):
-        scan = self.plotter._data
-        if not scan:
-            asaplog.post()
-            asaplog.push("Invalid scantable")
-            asaplog.post("ERROR")
-        if isinstance(rows,list) and len(rows) > 0:
-            scan.flag_row(rows=rows,unflag=unflag)
-        if isinstance(regions,dict) and len(regions) > 0:
-            for srow, masklist in regions.iteritems():
-                if not isinstance(masklist,list) or len(masklist) ==0:
-                    msg = "Ignoring invalid region selection for row = "+srow
-                    asaplog.post()
-                    asaplog.push(msg)
-                    asaplog.post("WARN")
-                    continue
-                irow = int(srow)
-                mask = scan.create_mask(masklist,invert=False,row=irow)
-                scan.flag(row=irow,mask=mask,unflag=unflag)
-                del irow, mask
-            del srow, masklist
-        del scan
-
-    ### show statistics of selected spectra/regions
-    def stat_cal(self):
-        print "Calculate statics of selected regions/panels"
-        self._statistics()
-
     ### Page chages
     ### go to the previous page
@@ -505 +505 @@
         if not (pageop in availpage):
             asaplog.post()
-            asaplot.push("Invalid page operation")
-            asaplot.post("ERROR")
+            asaplog.push("Invalid page operation")
+            asaplog.post("ERROR")
         if pageop == "n":
             # nothing necessary to plot the next page