Changeset 2062 for branches

Timestamp:

03/23/11 21:48:11 (14 years ago)

Author:

Kana Sugimoto

Message:

Merged a bug fix in trunk (r2061)

Location:

branches/casa-prerelease/pre-asap/python

Files:

• . (modified) (1 prop)
• flagtoolbar.py (modified) (11 diffs)

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

@@ -294 +294 @@
         del regions,panels,strow,enrow
 
-    def _clear_selection_plot(self):
+    def _clear_selection_plot(self, refresh=True):
         ### 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()
+            if refresh: self.plotter._plotter.canvas.draw()
         self._polygons = []
 
-    def _clearup_selections(self):
+    def _clearup_selections(self, refresh=True):
         # clear-up selection and polygons
         self._selpanels = []
         self._selregions = {}
-        self._clear_selection_plot()
+        self._clear_selection_plot(refresh=refresh)
 
     ### clear up selections
@@ -312 +312 @@
         self.figmgr.toolbar.set_message('selections canceled')
         # clear-up selection and polygons
-        self._clearup_selections()
+        self._clearup_selections(refresh=True)
 
     ### flag selected spectra/regions
@@ -323 +323 @@
             asaplog.post('WARN')
             return
+        self._pause_buttons(operation="start",msg="Flagging data...")
         self._flag_operation(rows=self._selpanels,
                              regions=self._selregions,unflag=False)
@@ -330 +331 @@
         asaplog.push(sout)
         del sout
-        self._clearup_selections()
+        self._clearup_selections(refresh=False)
         self._plot_page(pagemode="current")
+        self._pause_buttons(operation="end")
 
     ### unflag selected spectra/regions
@@ -341 +343 @@
             asaplog.post('WARN')
             return
+        self._pause_buttons(operation="start",msg="Unflagging data...")
         self._flag_operation(rows=self._selpanels,
                              regions=self._selregions,unflag=True)
@@ -348 +351 @@
         asaplog.push(sout)
         del sout
-        self._clearup_selections()
+        self._clearup_selections(refresh=False)
         self._plot_page(pagemode="current")
+        self._pause_buttons(operation="end")
 
     ### actual flag operation
@@ -389 +393 @@
         #print "- rows: ",self._selpanels
         #print "- regions:\n   ",self._selregions
-        self._clearup_selections()
+        self._clearup_selections(refresh=True)
 
     @asaplog_post_dec
@@ -463 +467 @@
     ### go to the previous page
     def prev_page(self):
-        self.figmgr.toolbar.set_message('plotting the previous page')
-        self._clear_selection_plot()
+        #self.figmgr.toolbar.set_message('plotting the previous page')
+        self._pause_buttons(operation="start",msg='plotting the previous page')
+        self._clear_selection_plot(refresh=False)
         self._plot_page(pagemode="prev")
         self._plot_selections()
+        self._pause_buttons(operation="end")
 
     ### go to the next page
     def next_page(self):
-        self.figmgr.toolbar.set_message('plotting the next page')
-        self._clear_selection_plot()
+        #self.figmgr.toolbar.set_message('plotting the next page')
+        self._pause_buttons(operation="start",msg='plotting the next page')
+        self._clear_selection_plot(refresh=False)
         self._plot_page(pagemode="next")
         self._plot_selections()
+        self._pause_buttons(operation="end")
 
     ### actual plotting of the new page
@@ -562 +570 @@
             ppp = maxpanel
         return int(idlastpanel/ppp)+1
+
+    # pause buttons for slow operations. implemented at a backend dependent class
+    def _pause_buttons(self,operation="end",msg=""):
+        pass
 
 #####################################
@@ -750 +762 @@
         ## disable buttons which don't work for plottp
         if not self.button: return
-        self.bRegion.config(relief='raised', state=Tk.DISABLED)
-        self.bPanel.config(relief='raised', state=Tk.DISABLED)
+        self.bRegion.config(relief='raised')
+        self.bPanel.config(relief='raised')
+        self.bRegion.config(state=Tk.DISABLED)
+        self.bPanel.config(state=Tk.DISABLED)
         self.bClear.config(state=Tk.DISABLED)
         self.bFlag.config(state=Tk.DISABLED)
@@ -775 +789 @@
         self.bPrev.config(state=Tk.DISABLED)
 
+    # pause buttons for slow operations
+    def _pause_buttons(self,operation="end",msg=""):
+        buttons = ["bRegion","bPanel","bClear","bFlag","bUnflag","bStat",
+                   "bNote","bQuit"]
+        if operation == "start":
+            state=Tk.DISABLED
+        else:
+            state=Tk.NORMAL
+        for btn in buttons:
+            getattr(self,btn).config(state=state)
+        self.figmgr.toolbar.set_message(msg)
+            
+        
     def delete_bar(self):
         self.__disconnect_event()