Changeset 2796 for trunk/python

Timestamp:

03/15/13 20:47:24 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-4859)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

set asap.rcParams[scantable.storage] = 'disk'
run asap.plotter.plot
exit from casapy or asap. A temporary scantable on disk should be deleted.

Put in Release Notes: No

Module(s): asap.plotter, sdplot

Description:

There were cyclic references between plotters and toolbars, i.e., plotter and CustomToolbarCommon?,
and flagplotter and CustomFlagToolbarCommon?, which prevented deletion of temporary scantables
from disk when exitting sessions.
I changed the reference to plotters in toolbars as a weak reference so that cyclic referencing
should not avoid desctruction of the plotters. It should be ok because there shouldn't be a case
where toolbar exists without plotter, but I'm not 100% sure to be honest.

File:

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

trunk/python/customgui_base.py

@@ -1 +1 @@
 import os
+import weakref
 import matplotlib, numpy
 from asap.logging import asaplog, asaplog_post_dec
@@ -13 +14 @@
 class CustomToolbarCommon:
     def __init__(self,parent):
-        self.plotter = parent
+        self.plotter = weakref.ref(parent)
         #self.figmgr=self.plotter._plotter.figmgr
 
@@ -683 +684 @@
 class CustomFlagToolbarCommon:
     def __init__(self,parent):
-        self.plotter=parent
+        self.plotter=weakref.ref(parent)
         #self.figmgr=self.plotter._plotter.figmgr
         self._selregions = {}