fix backend_qt* bug with multiple plot windows and show()

ddale · ddale · commit b6caa6cc9739 · 2007-09-24T12:56:38.000Z
svn path=/trunk/matplotlib/; revision=3879
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -46,10 +46,10 @@ def _create_qApp():
         qApp = qt.QApplication( [" "] )
         qt.QObject.connect( qApp, qt.SIGNAL( "lastWindowClosed()" ),
                             qApp, qt.SLOT( "quit()" ) )
-    else:
-      # someone else aready created the qApp and
-      # we let them handle the event-loop control.
-      show._needmain = False
+        #remember that matplotlib created the qApp - will be used by show()
+        _create_qApp.qAppCreatedHere = True
+
+_create_qApp.qAppCreatedHere = False
 
 def show():
     """
@@ -65,11 +65,8 @@ def show():
     if figManager != None:
         figManager.canvas.draw()
 
-    if ( show._needmain ):
-      qt.qApp.exec_loop()
-      show._needmain = False
-
-show._needmain = True
+    if _create_qApp.qAppCreatedHere:
+        qt.qApp.exec_loop()
 
 
 def new_figure_manager( num, *args, **kwargs ):
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -47,9 +47,9 @@ def _create_qApp():
         QtCore.QObject.connect( qApp, QtCore.SIGNAL( "lastWindowClosed()" ),
                             qApp, QtCore.SLOT( "quit()" ) )
     else:
-      # someone else aready created the qApp and
-      # we let them handle the event-loop control.
-      show._needmain = False
+        _create_qApp.qAppCreatedHere = True
+
+_create_qApp.qAppCreatedHere = False
 
 def show():
     """
@@ -65,11 +65,8 @@ def show():
     if figManager != None:
         figManager.canvas.draw()
 
-    if ( show._needmain ):
-      qApp.exec_()
-      show._needmain = False
-
-show._needmain = True
+    if _create_qApp.qAppCreatedHere:
+        QtGui.qApp.exec_()
 
 
 def new_figure_manager( num, *args, **kwargs ):
