Changeset 2538 for trunk/python/interactivemask.py

Timestamp:

05/18/12 19:44:44 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (related to CAS-3749)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added a new method, _alive(), in asaplotbase class

Test Programs: Interactive tests

Put in Release Notes: No

Module(s):

Description:

Added a new method, _alive(), in asaplotbase class. The method return True
if asaplot instance is alive. More complete check compared to 'is_dead' parameter.
asapplotter._assert_plotter method is simplified by calling this function.

Fixed misc bugs found in interactive tests.

1. set back linewidth = 1 in plots invoked by modules, interactivemask, asapmath, and asapfitter.
2. interactivemask module: plotter in properly quited at the end.
3. interactivemask module: avoid error when user close interacive plot window before calling the finalization method, finish_selection().
4. added definition of a dummy function, quit(), in asaplot class.

File:

• trunk/python/interactivemask.py (modified) (3 diffs)

trunk/python/interactivemask.py

@@ -156 +156 @@
             self.showmask = True
 
-        #if not self.p._plotter or self.p._plotter.is_dead:
         if not self.p:
             asaplog.push('A new ASAP plotter will be loaded')
@@ -164 +163 @@
             self.newplot = True
         self.p._assert_plotter(action='reload')
+        from matplotlib import rc as rcp
+        rcp('lines', linewidth=1)
         
         # Plot selected spectra if needed
@@ -339 +340 @@
         if callback: self.callback=callback
         if self.callback: self.callback()
-        if not self.event: self.p._plotter.register('button_press',None)
+        if not self.event:
+            try: self.p._plotter.register('button_press',None)
+            except: pass # plotter window is closed by X button.
         # Finish the plot
         if not self.newplot:
             self.clear_polygon()
         else:
-            self.p._plotter.unmap()
+            #self.p._plotter.unmap()
+            self.p._plotter.quit()
             self.p._plotter = None
             del self.p