Changeset 2170 for trunk

Timestamp:

05/17/11 18:14:58 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (minor fixes and improvements)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: interactive testing

Put in Release Notes: No

Module(s): asapplotter, asaplotbase, flagplotter, sdplot, and sdflag

Description:

Misc bug fixes and minor modifications:
+ fixed bug in customgui_base (scantable class referenced but not imported)
+ minor improvement of toolbar message in customgui_tkagg
+ added a new method _set_window_title(string title) to asaplotgui_qt4 and asaplotgui modules

Location:

trunk/python

Files:

• asaplotgui.py (modified) (2 diffs)
• asaplotgui_qt4.py (modified) (2 diffs)
• customgui_base.py (modified) (1 diff)
• customgui_tkagg.py (modified) (2 diffs)

trunk/python/asaplotgui.py

@@ -37 +37 @@
         # Simply instantiating this is enough to get a working toolbar.
         self.figmgr = FigureManagerTkAgg(self.canvas, 1, self.window)
-        self.window.wm_title('ASAP Plotter - Tk')
+        self._set_window_title('ASAP Plotter - Tk')
 
         self.events = {'button_press':None,
@@ -84 +84 @@
         """
         self.window.wm_withdraw()
+
+    def _set_window_title(self,title):
+        # Set title to main window title bar
+        self.window.wm_title(title)

trunk/python/asaplotgui_qt4.py

@@ -34 +34 @@
         self.figmgr = FigureManagerQTAgg(self.canvas, 1)
         self.window = self.figmgr.window
-        self.window.setWindowTitle('ASAP Plotter - Qt4')
+        self._set_window_title('ASAP Plotter - Qt4')
         # register this plot to matplotlib
         _pylab_helpers.Gcf.set_active(self.figmgr)
@@ -100 +100 @@
         """
         self.window.hide()
+
+    def _set_window_title(self,title):
+        # Set title to main window title bar
+        self.window.setWindowTitle(title)

trunk/python/customgui_base.py

@@ -4 +4 @@
 from matplotlib.patches import Rectangle
 from asap.parameters import rcParams
+from asap import scantable
 from asap._asap import stmath
 

trunk/python/customgui_tkagg.py

@@ -605 +605 @@
     def select_region(self):
         if not self.figmgr.toolbar.mode == '' or not self.button: return
-        self.figmgr.toolbar.set_message('select rectangle regions')
+        self.figmgr.toolbar.set_message('select regions: click at start and end channels')
         if self.mode == 'region':
             self.bRegion.config(relief='raised')
@@ -621 +621 @@
     def select_panel(self):
         if not self.figmgr.toolbar.mode == '' or not self.button: return
-        self.figmgr.toolbar.set_message('select panels')
+        self.figmgr.toolbar.set_message('select spectra: click on subplots')
         if self.mode == 'panel':
             self.bPanel.config(relief='raised')