Changeset 1768

Timestamp:

07/14/10 14:53:59 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: none

Put in Release Notes: No

Module(s): ASAP plotter and sdplot

Description: removed an attribute, custombar, from the class

CustomToolbarTkAgg and inherit Tkinter.Frame class instead.

File:

• branches/alma/python/casatoolbar.py (modified) (4 diffs)

branches/alma/python/casatoolbar.py

@@ -141 +141 @@
 ### TkAgg
 if matplotlib.get_backend() == 'TkAgg': import Tkinter as Tk
-class CustomToolbarTkAgg(CustomToolbarCommon):
+class CustomToolbarTkAgg(CustomToolbarCommon, Tk.Frame):
     def __init__(self,parent):
         from asap.asapplotter import asapplotter
@@ -149 +149 @@
         self.figmgr=self._p.figmgr
         self.canvas=self.figmgr.canvas
-        self.custombar=None
         self.mode=''
         self.button=True
@@ -156 +155 @@
 
     def _add_custom_toolbar(self):
-        self.custombar=Tk.Frame(master=self.figmgr.window)
-        self.bSpec=self._NewButton(master=self.custombar,
+        Tk.Frame.__init__(self,master=self.figmgr.window)
+        self.bSpec=self._NewButton(master=self,
                                    text='spec value',
                                    command=self.spec_show)
-        self.bStat=self._NewButton(master=self.custombar,
+        self.bStat=self._NewButton(master=self,
                                    text='statistics',
                                    command=self.stat_cal)
-        self.bQuit=self._NewButton(master=self.custombar,
+        self.bQuit=self._NewButton(master=self,
                                    text='Quit',
                                    command=self.quit,
                                    side=Tk.RIGHT)
-        self.custombar.pack(side=Tk.BOTTOM,fill=Tk.BOTH)
-        
-        ### temporary added
-        #self.bStat.config(state=Tk.DISABLED)
-        ###
-        #self.bSpec.config(relief='sunken')
-        #self.bStat.config(relief='raised')
-        #self.button=True
-        #self.spec_show()
+        self.pack(side=Tk.BOTTOM,fill=Tk.BOTH)
+
         self.disable_button()
-        return self
+        return #self
 
     def _NewButton(self, master, text, command, side=Tk.LEFT):
@@ -231 +223 @@
     def delete_bar(self):
         self.__disconnect_event()
-        self.custombar.destroy()
-        self.custombar=None
+        self.destroy()
 
     def __disconnect_event(self):