Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove figure from Gcf when it is closed #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Remove figure from Gcf when it is closed #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
121acdc
Re-wired signal/slot connections so that the figure in removed from
Jan 18, 2013
560f60a
PEP8 removed trailing whitespace
Jan 18, 2013
a564b95
more white space corrections
Jan 18, 2013
b87bffd
Add figure close test for qt4 backend
dmcdougall Jan 18, 2013
3426a78
Merge pull request #1 from dmcdougall/qt4_closeevent_Gcf
tacaswell Jan 18, 2013
e56eec2
PEP8 fixes to FigureManagerQT class
tacaswell Jan 19, 2013
7a929ca
test for issue #1683
tacaswell Jan 19, 2013
c613e71
fixed link rot
tacaswell Jan 19, 2013
582c72d
removed unused import
tacaswell Jan 19, 2013
def3327
added knownfailureif to test based on if qt4_compat could be imported,
tacaswell Jan 23, 2013
d636acb
added test_backend_qt4 to test list
Jan 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/matplotlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,7 @@ def tk_window_focus():
'matplotlib.tests.test_triangulation',
'matplotlib.tests.test_transforms',
'matplotlib.tests.test_arrow_patches',
'matplotlib.tests.test_backend_qt4',
]


Expand Down
57 changes: 33 additions & 24 deletions lib/matplotlib/backends/backend_qt4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,14 @@ def idle_draw(*args):
self._idle = True
if d: QtCore.QTimer.singleShot(0, idle_draw)


class MainWindow(QtGui.QMainWindow):
def closeEvent(self, event):
self.emit(QtCore.SIGNAL('closing()'))
QtGui.QMainWindow.closeEvent(self, event)

class FigureManagerQT( FigureManagerBase ):

class FigureManagerQT(FigureManagerBase):
"""
Public attributes

Expand All @@ -382,29 +384,31 @@ class FigureManagerQT( FigureManagerBase ):
window : The qt.QMainWindow
"""

def __init__( self, canvas, num ):
if DEBUG: print('FigureManagerQT.%s' % fn_name())
FigureManagerBase.__init__( self, canvas, num )
def __init__(self, canvas, num):
if DEBUG:
print('FigureManagerQT.%s' % fn_name())
FigureManagerBase.__init__(self, canvas, num)
self.canvas = canvas
self.window = MainWindow()
self.window.connect(self.window, QtCore.SIGNAL('closing()'),
canvas.close_event)
canvas.close_event)
self.window.connect(self.window, QtCore.SIGNAL('closing()'),
self._widgetclosed)

self.window.setWindowTitle("Figure %d" % num)
image = os.path.join( matplotlib.rcParams['datapath'],'images','matplotlib.png' )
self.window.setWindowIcon(QtGui.QIcon( image ))
image = os.path.join(matplotlib.rcParams['datapath'], 'images', 'matplotlib.png')
self.window.setWindowIcon(QtGui.QIcon(image))

# Give the keyboard focus to the figure instead of the
# manager; StrongFocus accepts both tab and click to focus and
# will enable the canvas to process event w/o clicking.
# ClickFocus only takes the focus is the window has been
# clicked
# on. http://developer.qt.nokia.com/doc/qt-4.8/qt.html#FocusPolicy-enum
self.canvas.setFocusPolicy( QtCore.Qt.StrongFocus )
# on. http://qt-project.org/doc/qt-4.8/qt.html#FocusPolicy-enum or
# http://doc.qt.digia.com/qt/qt.html#FocusPolicy-enum
self.canvas.setFocusPolicy(QtCore.Qt.StrongFocus)
self.canvas.setFocus()

QtCore.QObject.connect( self.window, QtCore.SIGNAL( 'destroyed()' ),
self._widgetclosed )
self.window._destroying = False

self.toolbar = self._get_toolbar(self.canvas, self.window)
Expand All @@ -420,7 +424,7 @@ def __init__( self, canvas, num ):
# requested size:
cs = canvas.sizeHint()
sbs = self.window.statusBar().sizeHint()
self._status_and_tool_height = tbs_height+sbs.height()
self._status_and_tool_height = tbs_height + sbs.height()
height = cs.height() + self._status_and_tool_height
self.window.resize(cs.width(), height)

Expand All @@ -429,14 +433,14 @@ def __init__( self, canvas, num ):
if matplotlib.is_interactive():
self.window.show()

def notify_axes_change( fig ):
def notify_axes_change(fig):
# This will be called whenever the current axes is changed
if self.toolbar is not None:
self.toolbar.update()
self.canvas.figure.add_axobserver( notify_axes_change )
self.canvas.figure.add_axobserver(notify_axes_change)

@QtCore.Slot()
def _show_message(self,s):
def _show_message(self, s):
# Fixes a PySide segfault.
self.window.statusBar().showMessage(s)

Expand All @@ -446,8 +450,9 @@ def full_screen_toggle(self):
else:
self.window.showFullScreen()

def _widgetclosed( self ):
if self.window._destroying: return
def _widgetclosed(self):
if self.window._destroying:
return
self.window._destroying = True
try:
Gcf.destroy(self.num)
Expand Down Expand Up @@ -475,15 +480,19 @@ def resize(self, width, height):
def show(self):
self.window.show()

def destroy( self, *args ):
def destroy(self, *args):
# check for qApp first, as PySide deletes it in its atexit handler
if QtGui.QApplication.instance() is None: return
if self.window._destroying: return
if QtGui.QApplication.instance() is None:
return
if self.window._destroying:
return
self.window._destroying = True
QtCore.QObject.disconnect( self.window, QtCore.SIGNAL( 'destroyed()' ),
self._widgetclosed )
if self.toolbar: self.toolbar.destroy()
if DEBUG: print("destroy figure manager")
QtCore.QObject.disconnect(self.window, QtCore.SIGNAL('destroyed()'),
self._widgetclosed)
if self.toolbar:
self.toolbar.destroy()
if DEBUG:
print("destroy figure manager")
self.window.close()

def get_window_title(self):
Expand Down
32 changes: 32 additions & 0 deletions lib/matplotlib/tests/test_backend_qt4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from matplotlib import pyplot as plt
from matplotlib.testing.decorators import cleanup
from matplotlib.testing.decorators import knownfailureif
from matplotlib._pylab_helpers import Gcf
import copy

try:
import matplotlib.backends.qt4_compat
HAS_QT = True
except ImportError:
HAS_QT = False


@cleanup
@knownfailureif(not HAS_QT)
def test_fig_close():
# force switch to the Qt4 backend
plt.switch_backend('Qt4Agg')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably mark this test as knownfail or skip if Qt4/PySide are not installed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the correct way to test if Qt4/PySide is available?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like:

try:
    import Qt
    HAS_PYQT = True
except ImportError:
    HAS_PYQT = False

(And obviously extend to also check for PySide -- it should be good enough to have one or the other).


#save the state of Gcf.figs
init_figs = copy.copy(Gcf.figs)

# make a figure using pyplot interface
fig = plt.figure()

# simulate user clicking the close button by reaching in
# and calling close on the underlying Qt object
fig.canvas.manager.window.close()

# assert that we have removed the reference to the FigureManager
# that got added by plt.figure()
assert(init_figs == Gcf.figs)