Changes in trunk/python/asaplotgui_qt4.py [2170:2451]

File:

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

trunk/python/asaplotgui_qt4.py

@@ -29 +29 @@
 
         asaplotbase.__init__(self, **v)
+        matplotlib.rcParams["interactive"] = True
 
+        _pylab_helpers.Gcf.destroy(0)
         self.canvas = FigureCanvasQTAgg(self.figure)
         # Simply instantiating this is enough to get a working toolbar.
-        self.figmgr = FigureManagerQTAgg(self.canvas, 1)
+        self.figmgr = FigureManagerQTAgg(self.canvas, 0)
         self.window = self.figmgr.window
         self._set_window_title('ASAP Plotter - Qt4')
-        # register this plot to matplotlib
-        _pylab_helpers.Gcf.set_active(self.figmgr)
+        # Register this plot to matplotlib without activating it
+        #_pylab_helpers.Gcf.set_active(self.figmgr)
+        _pylab_helpers.Gcf.figs[self.figmgr.num] = self.figmgr
 
         #############
@@ -49 +52 @@
         qt.QtCore.QObject.connect(self.window, qt.QtCore.SIGNAL('destroyed()'),dest_callback)
 
-        self.events = {'button_press':None,
-                       'button_release':None,
-                       'motion_notify':None}
-
-        matplotlib.rcParams["interactive"] = True
-        self.buffering = buffering
-
         self.unmap()
         #self.canvas.show()
@@ -64 +60 @@
         window stack.
         """
+        if self.is_dead:
+            raise RuntimeError( "No plotter to show. Not yet plotted or plotter is closed." )
         self.window.activateWindow()
         #To raise this window to the top of the stacking order
@@ -74 +72 @@
         """
         self.is_dead = True
-        try: self.window.close()
+        if not self.figmgr:
+            return
+        try:
+            #self.window.close()
+            # TODO destroy casabar
+            _pylab_helpers.Gcf.destroy(self.figmgr.num)
+            del self.window, self.canvas, self.figmgr
+            self.window = None
+            self.canvas = None
+            self.figmgr = None
         except RuntimeError: pass # the window may already be closed by user
 
@@ -81 +88 @@
         Show graphics dependent on the current buffering state.
         """
+        if self.is_dead:
+            raise RuntimeError( "No plotter to show (not yet plotted or closed)." )
         if not self.buffering:
             if hardrefresh:
@@ -93 +102 @@
         Clear the figure.
         """
+        if not self.window:
+            asaplog.push( "No plotter window to terminate." )
+            asaplog.post( "WARN" )
+            return
         self.window.close()
 
@@ -99 +112 @@
         Hide the ASAPlot graphics window.
         """
+        if not self.window:
+            asaplog.push( "No plotter window to unmap." )
+            asaplog.post( "WARN" )
+            return
         self.window.hide()