Changeset 1979 for trunk

Timestamp:

01/27/11 12:23:14 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: the "spec value" button is removed from the toolbar.

Test Programs: plot spectra with asap plotter

Put in Release Notes: Yes

Module(s): asapplotter

Description: The "spec value" mode is set to the default status of asap plotter and the button for it is removed.

File:

• trunk/python/casatoolbar.py (modified) (7 diffs)

trunk/python/casatoolbar.py

@@ -174 +174 @@
         self.plotter._plotter.tidy()
         self.plotter._plotter.show(hardrefresh=False)
-        pass
+
 
 #####################################
@@ -202 +202 @@
     def _add_custom_toolbar(self):
         Tk.Frame.__init__(self,master=self.figmgr.window)
-        self.bSpec=self._NewButton(master=self,
-                                   text='spec value',
-                                   command=self.spec_show)
+        #self.bSpec=self._NewButton(master=self,
+        #                           text='spec value',
+        #                           command=self.spec_show)
         self.bStat=self._NewButton(master=self,
                                    text='statistics',
@@ -242 +242 @@
         self.figmgr.toolbar.set_message('spec value: drag on a spec')
         if self.mode == 'spec': return
-        self.bStat.config(relief='raised')
-        self.bSpec.config(relief='sunken')
-        self.bNote.config(relief='raised')
+        #self.bStat.config(relief='raised')
+        #self.bSpec.config(relief='sunken')
+        #self.bNote.config(relief='raised')
         self.mode='spec'
         self.notewin.close_widgets()
         self.__disconnect_event()
-        #self.canvas.mpl_connect('button_press_event',self._select_spectrum)
         self._p.register('button_press',self._select_spectrum)
 
@@ -254 +253 @@
         if not self.figmgr.toolbar.mode == '' or not self.button: return
         self.figmgr.toolbar.set_message('statistics: select a region')
-        if self.mode == 'stat': return
-        self.bSpec.config(relief='raised')
+        if self.mode == 'stat':
+            # go back to spec mode
+            self.bStat.config(relief='raised')
+            self.spec_show()
+            return
+        #self.bSpec.config(relief='raised')
         self.bStat.config(relief='sunken')
         self.bNote.config(relief='raised')
@@ -266 +269 @@
         if not self.figmgr.toolbar.mode == '': return
         self.figmgr.toolbar.set_message('text: select a position/text')
-        if self.mode == 'note': return
-        self.bSpec.config(relief='raised')
+        if self.mode == 'note':
+            self.bNote.config(relief='raised')
+            self.mode='none'
+            self.spec_show()
+            return
+        #self.bSpec.config(relief='raised')
         self.bStat.config(relief='raised')
         self.bNote.config(relief='sunken')
@@ -290 +297 @@
     def enable_button(self):
         if self.button: return
-        self.bSpec.config(state=Tk.NORMAL)
+        #self.bSpec.config(state=Tk.NORMAL)
         self.bStat.config(state=Tk.NORMAL)
         self.button=True
@@ -298 +305 @@
         if not self.button: return
         self.bStat.config(relief='raised', state=Tk.DISABLED)
-        self.bSpec.config(relief='raised', state=Tk.DISABLED)
+        #self.bSpec.config(relief='raised', state=Tk.DISABLED)
         #self.bPrev.config(state=Tk.DISABLED)
         #self.bNext.config(state=Tk.DISABLED)