Changes in trunk/python/casatoolbar.py [1945:1826]

File:

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

trunk/python/casatoolbar.py

@@ -1 +1 @@
 import os
 import matplotlib
-
 ######################################
 ##    Add CASA custom toolbar       ##
@@ -145 +144 @@
         mymask.select_mask(once=True,showmask=False)
 
-    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
-
-    def _new_page(self,next=True):
-        self.plotter._plotter.hold()
-        #self.plotter._plotter.clear()
-        self.plotter._plot(self.plotter._data)
-        self.plotter._plotter.release()
-        self.plotter._plotter.tidy()
-        self.plotter._plotter.show(hardrefresh=False)
-        pass
-
 #####################################
 ##    Backend dependent Classes    ##
@@ -182 +150 @@
 if matplotlib.get_backend() == 'TkAgg':
     import Tkinter as Tk
-    from notationwindow import NotationWindowTkAgg
 
 class CustomToolbarTkAgg(CustomToolbarCommon, Tk.Frame):
@@ -197 +164 @@
         self.button=True
         self._add_custom_toolbar()
-        self.notewin=NotationWindowTkAgg(master=self.canvas)
         CustomToolbarCommon.__init__(self,parent)
 
@@ -208 +174 @@
                                    text='statistics',
                                    command=self.stat_cal)
-        self.bNote=self._NewButton(master=self,
-                                   text='notation',
-                                   command=self.modify_note)
-        #self.bPrev=self._NewButton(master=self,
-        #                           text='- page',
-        #                           command=self.prev_page)
-        self.bNext=self._NewButton(master=self,
-                                   text='+ page',
-                                   command=self.next_page)
-        if os.uname()[0] != 'Darwin':
-            #self.bPrev.config(padx=5)
-            self.bNext.config(padx=5)
         self.bQuit=self._NewButton(master=self,
                                    text='Quit',
@@ -244 +198 @@
         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)
@@ -257 +209 @@
         self.bSpec.config(relief='raised')
         self.bStat.config(relief='sunken')
-        self.bNote.config(relief='raised')
         self.mode='stat'
-        self.notewin.close_widgets()
         self.__disconnect_event()
         self._p.register('button_press',self._single_mask)
-
-    def modify_note(self):
-        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')
-        self.bStat.config(relief='raised')
-        self.bNote.config(relief='sunken')
-        self.mode='note'
-        self.__disconnect_event()
-        self._p.register('button_press',self._mod_note)
-
-    def prev_page(self):
-        self.figmgr.toolbar.set_message('plotting the previous page')
-        self._new_page(next=False)
-
-    def next_page(self):
-        self.figmgr.toolbar.set_message('plotting the next page')
-        self._new_page(next=True)
 
     def quit(self):
@@ -299 +230 @@
         self.bStat.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)
         self.button=False
         self.mode=''
         self.__disconnect_event()
-
-    def enable_next(self):
-        self.bNext.config(state=Tk.NORMAL)
-
-    def disable_next(self):
-        self.bNext.config(state=Tk.DISABLED)
-
-    def enable_prev(self):
-        #self.bPrev.config(state=Tk.NORMAL)
-        pass
-
-    def disable_prev(self):
-        #self.bPrev.config(state=Tk.DISABLED)
-        pass
 
     def delete_bar(self):