Changeset 2150 for trunk/python/asapmath.py

Timestamp:

04/22/11 18:21:29 (13 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a fix)

Ready for Test: Yes

Interface Changes: added a new method new_asaplot() to module asapplotter which returns asaplot instance based on your backend selection.

What Interface Changed:

Test Programs: sdaverage, sdsmooth with verify=True and plotlevel > 0

Put in Release Notes: No

Module(s):

Description: proper handling of plotting in non-TkAgg? backend.

File:

• trunk/python/asapmath.py (modified) (7 diffs)

trunk/python/asapmath.py

@@ -3 +3 @@
 from asap.logging import asaplog, asaplog_post_dec
 from asap.selector import selector
-from asap import asaplotgui
+#from asap import asaplotgui
+from asap.asapplotter import new_asaplot
 
 @asaplog_post_dec
@@ -311 +312 @@
         asaplog.push('Plot only first spectrum for each [if,pol] pairs to verify calibration.')
         asaplog.post('WARN')
-        p=asaplotgui.asaplotgui()
+        #p=asaplotgui.asaplotgui()
+        p=new_asaplot()
         #nr=min(6,len(ifnos)*len(polnos))
         nr=len(ifnos)*len(polnos)
@@ -388 +390 @@
         x=raw_input('Accept calibration ([y]/n): ' )
         if x.upper() == 'N':
-            p.unmap()
+            p.quit()
             del p
             return scabtab
-        p.unmap()
+        p.quit()
         del p
     ###
@@ -530 +532 @@
         asaplog.push('Plot only first spectrum for each [if,pol] pairs to verify calibration.')
         asaplog.post('WARN')
-        p=asaplotgui.asaplotgui()
+        #p=asaplotgui.asaplotgui()
+        p=new_asaplot()
         #nr=min(6,len(ifnos)*len(polnos))
         nr=len(ifnos)*len(polnos)
@@ -607 +610 @@
         x=raw_input('Accept calibration ([y]/n): ' )
         if x.upper() == 'N':
-            p.unmap()
+            p.quit()
             del p
             return scabtab
-        p.unmap()
+        p.quit()
         del p
     ###
@@ -742 +745 @@
         asaplog.push('Plot only first spectrum for each [if,pol] pairs to verify calibration.')
         asaplog.post('WARN')
-        p=asaplotgui.asaplotgui()
+        #p=asaplotgui.asaplotgui()
+        p=new_asaplot()
         #nr=min(6,len(ifnos)*len(polnos))
         nr=len(ifnos)/2*len(polnos)
@@ -811 +815 @@
         x=raw_input('Accept calibration ([y]/n): ' )
         if x.upper() == 'N':
-            p.unmap()
+            p.quit()
             del p
             return scabtab
-        p.unmap()
+        p.quit()
         del p
     ###