Changeset 2603

Timestamp:

07/20/12 12:39:13 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (bug fixes and a minor improvement)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: interactive test needed.

Put in Release Notes: No

Module(s): asapplotter, flagplotter, and sdplot (CASA)

Description:

Fixed bugs in asapplotter and flagplotter which prevented users from exiting
from notation mode, when the other buttons in the additional toolbar is not active.
Consintently use 'self._data' in asapplotter.plotgrid() instead of 'scan'.

Location:

trunk/python

Files:

• asapplotter.py (modified) (5 diffs)
• customgui_qt4agg.py (modified) (2 diffs)
• customgui_tkagg.py (modified) (2 diffs)

trunk/python/asapplotter.py

@@ -1624 +1624 @@
                 self._data = scan
                 self._reset()
-        elif self._data:
-            scan = self._data
-        else:
+        elif not self._data:
             msg = "Input is not a scantable"
             raise TypeError(msg)
@@ -1758 +1756 @@
         self._plotter.set_panels(rows=self._rows,cols=self._cols,
                                  nplots=ntotpl,margin=self._margins,ganged=True)
-        if self.casabar_exists(): self._plotter.figmgr.casabar.disable_button()
+        if self.casabar_exists():
+            #self._plotter.figmgr.casabar.disable_button()
+            self._plotter.figmgr.casabar.set_pagecounter(1)
+            self._plotter.figmgr.casabar.enable_button()
         # Actual plot
         npl = 0
@@ -1787 +1788 @@
                                   linestyle=0,linestyles=self._linestyles)
             xlab = self._abcissa and self._abcissa[ipanel] \
-                   or scan._getabcissalabel(irow)
+                   or self._data._getabcissalabel(irow)
             if self._offset and not self._abcissa:
                 xlab += " (relative)"
             ylab = self._ordinate and self._ordinate[ipanel] \
-                   or scan._get_ordinate_label()
+                   or self._data._get_ordinate_label()
             self._plotter.set_axes('xlabel', xlab)
             self._plotter.set_axes('ylabel', ylab)
@@ -1799 +1800 @@
             self._plotter.set_axes('title',lbl)
 
-            y = scan._getspectrum(irow)
+            y = self._data._getspectrum(irow)
             # flag application
-            mr = scan._getflagrow(irow)
+            mr = self._data._getflagrow(irow)
             if mr:  # FLAGROW=True
                 y = ma.masked_array(y,mask=mr)
             else:
-                m = scan._getmask(irow)
+                m = self._data._getmask(irow)
                 from numpy import logical_not, logical_and
                 ### user mask is not available so far
@@ -1813 +1814 @@
                 y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
 
-            x = array(scan._getabcissa(irow))
+            x = array(self._data._getabcissa(irow))
             if self._offset:
                 x += self._offset

trunk/python/customgui_qt4agg.py

@@ -131 +131 @@
             self.mode = 'none'
             self.spec_show()
+            if not self.button:
+                self.notewin.close_widgets()
+                self.__disconnect_event()
             return
         self.figmgr.toolbar.set_message("text: select a position/text")
@@ -662 +665 @@
             self.mode = 'none'
             self.spec_show()
+            if not self.button:
+                self.notewin.close_widgets()
+                self.__disconnect_event()
             return
         self.figmgr.toolbar.set_message('text: select a position/text')

trunk/python/customgui_tkagg.py

@@ -117 +117 @@
     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':
             self.bNote.config(relief='raised')
             self.mode = 'none'
             self.spec_show()
+            if not self.button:
+                self.notewin.close_widgets()
+                self.__disconnect_event()
             return
+        self.figmgr.toolbar.set_message('text: select a position/text')
         #self.bSpec.config(relief='raised')
         self.bStat.config(relief='raised')
@@ -603 +606 @@
             self.mode = 'none'
             self.spec_show()
+            if not self.button:
+                self.notewin.close_widgets()
+                self.__disconnect_event()
             return
         self.figmgr.toolbar.set_message('text: select a position/text')