Changeset 2155 for trunk

Timestamp:

04/26/11 13:03:10 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No (reorganization of modules)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: the modules casatoolbar, flagtoolbar, notaionwindow, were reorganized as customgui_base, customgui_tkagg, and customgui_qt4agg, based on backend

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Location:

trunk/python

Files:

• CMakeLists.txt (modified) (2 diffs)
• asapplotter.py (modified) (3 diffs)
• casatoolbar.py (deleted)
• customgui_base.py (added)
• customgui_qt4agg.py (added)
• customgui_tkagg.py (added)
• flagplotter.py (modified) (1 diff)
• flagtoolbar.py (deleted)
• notationwindow.py (deleted)

trunk/python/CMakeLists.txt

@@ -19 +19 @@
      ${PYTHONDIR}/asapmath.py
      ${PYTHONDIR}/asapplotter.py
-     ${PYTHONDIR}/casatoolbar.py
      ${PYTHONDIR}/compatibility.py
      ${PYTHONDIR}/coordinate.py
+     ${PYTHONDIR}/customgui_base.py
+     ${PYTHONDIR}/customgui_tkagg.py
+     ${PYTHONDIR}/customgui_qt4agg.py
      ${PYTHONDIR}/env.py
      ${PYTHONDIR}/flagplotter.py
-     ${PYTHONDIR}/flagtoolbar.py
      ${PYTHONDIR}/__init__.py
      ${PYTHONDIR}/interactivemask.py
@@ -31 +32 @@
      ${PYTHONDIR}/linecatalog.py
      ${PYTHONDIR}/logging.py
-     ${PYTHONDIR}/notationwindow.py
      ${PYTHONDIR}/opacity.py
      ${PYTHONDIR}/parameters.py

trunk/python/asapplotter.py

@@ -91 +91 @@
         backend=matplotlib.get_backend()
         if self._visible and backend == "TkAgg":
-            from asap.casatoolbar import CustomToolbarTkAgg
+            from asap.customgui_tkagg import CustomToolbarTkAgg
             return CustomToolbarTkAgg(self)
             #from asap.casatoolbar import CustomFlagToolbarTkAgg
@@ -1253 +1253 @@
         PL.ion()
         PL.draw()
+        PL.gcf().show()
         if (self._outfile is not None):
            PL.savefig(self._outfile)
@@ -1293 +1294 @@
         #PL.ion()
         PL.draw()
+        PL.gcf().show()
         if (self._outfile is not None):
            PL.savefig(self._outfile)

trunk/python/flagplotter.py

@@ -37 +37 @@
             #from asap.casatoolbar import CustomToolbarTkAgg
             #return CustomToolbarTkAgg(self)
-            from asap.flagtoolbar import CustomFlagToolbarTkAgg
+            from asap.customgui_tkagg import CustomFlagToolbarTkAgg
             return CustomFlagToolbarTkAgg(self)
         return None