Changeset 2137

Timestamp:

04/15/11 11:08:36 (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:

Test Programs:

Put in Release Notes: No

Module(s): flagplotter, sdflag

Description:

made temporal region selection mark transparent until it is confirmed.
This is to handle less capability of Tk on osx.
Also cleared up commented lines.

File:

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

trunk/python/flagtoolbar.py

@@ -138 +138 @@
                 if textobj.contains(event)[0]:
                     return True
-        #print "No text picked"
         return False
 
@@ -157 +156 @@
             asaplog.post('WARN')
             return
-        #print "add the region to selections"
-        #self._thisregion = {'axes': event.inaxes,'xs': event.xdata,
         self._thisregion = {'axes': event.inaxes,'xs': event.x,
                             'worldx': [event.xdata,event.xdata]}
@@ -167 +164 @@
     def _xspan_draw(self,event):
         if event.inaxes == self._thisregion['axes']:
-            #xnow = event.xdata
             xnow = event.x
             self.xdataold = xnow
@@ -174 +170 @@
         try: self.lastspan
         except AttributeError: pass
-        #else: self.lastspan.remove()
         else: self._remove_span(self.lastspan)
 
-        #self.lastspan = self._thisregion['axes'].axvspan(self._thisregion['xs'],xnow,facecolor='0.7')
-        self.lastspan = self._draw_span(self._thisregion['axes'],self._thisregion['xs'],xnow,fill="#555555",stipple="gray50")
-        #self.plotter._plotter.show(False)
-        #self.plotter._plotter.canvas.draw()
+        #self.lastspan = self._draw_span(self._thisregion['axes'],self._thisregion['xs'],xnow,fill="#555555",stipple="gray50")
+        self.lastspan = self._draw_span(self._thisregion['axes'],self._thisregion['xs'],xnow,fill="")
         del xnow
 
@@ -199 +192 @@
         except AttributeError: pass
         else:
-            #self.lastspan.remove()
             self._remove_span(self.lastspan)
             del self.lastspan
@@ -211 +203 @@
         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)
@@ -251 +242 @@
         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 !!!!
@@ -302 +292 @@
                 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
@@ -402 +391 @@
             asaplog.post('WARN')
             return
-        #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
         self._clearup_selections(refresh=True)
 
@@ -422 +407 @@
             for irow in rows:
                 for stat in statstr:
-                    #statval[stat] = scan.stats(stat=stat,row=irow)[0]
                     statval[stat] = mathobj._statsrow(scan,[],stat,irow)[0]
                 self._print_stats(scan,irow,statval,statstr=statstr)
@@ -437 +421 @@
                 mask = scan.create_mask(masklist,invert=False,row=irow)
                 for stat in statstr:
-                    #statval[stat] = scan.stats(stat=stat,row=irow,mask = mask)[0]
                     statval[stat] = mathobj._statsrow(scan,mask,stat,irow)[0]
                 self._print_stats(scan,irow,statval,statstr=statstr,mask=masklist)
@@ -481 +464 @@
     ### go to the previous page
     def prev_page(self):
-        #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)
@@ -490 +472 @@
     ### go to the next page
     def next_page(self):
-        #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)
@@ -509 +490 @@
         self.plotter._plotter.hold()
         self.plotter._plotter.legend(1)
-        #if goback:
-        #    self._set_prevpage_counter()
         self._set_plot_counter(pagemode)
-        #self.plotter._plotter.clear()
         self.plotter._plot(self.plotter._data)
         self.set_pagecounter(self._get_pagenum())
@@ -758 +736 @@
     def quit(self):
         self.__disconnect_event()
-        #self.delete_bar()
         self.disable_button()
         self.figmgr.window.wm_withdraw()