From 9393eac1b0a4808391de4a792cb68252fb50329d Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Fri, 31 May 2013 00:06:59 -0500 Subject: [PATCH] Third attempt at getting Travis to build --- skimage/viewer/qt/QtCore.py | 2 -- skimage/viewer/viewers/core.py | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/skimage/viewer/qt/QtCore.py b/skimage/viewer/qt/QtCore.py index e0aa923a..897b8760 100644 --- a/skimage/viewer/qt/QtCore.py +++ b/skimage/viewer/qt/QtCore.py @@ -7,5 +7,3 @@ elif qt_api == 'pyqt': else: # Mock objects Qt = None - def pyqtSignal(*args, **kwargs): - pass diff --git a/skimage/viewer/viewers/core.py b/skimage/viewer/viewers/core.py index d60e5693..91362f47 100644 --- a/skimage/viewer/viewers/core.py +++ b/skimage/viewer/viewers/core.py @@ -17,12 +17,6 @@ from ..plugins.base import Plugin __all__ = ['ImageViewer', 'CollectionViewer'] -dock_areas = {'top': Qt.TopDockWidgetArea, - 'bottom': Qt.BottomDockWidgetArea, - 'left': Qt.LeftDockWidgetArea, - 'right': Qt.RightDockWidgetArea} - - def mpl_image_to_rgba(mpl_image): """Return RGB image from the given matplotlib image object. @@ -66,6 +60,12 @@ class ImageViewer(QtGui.QMainWindow): >>> # viewer.show() """ + + dock_areas = {'top': Qt.TopDockWidgetArea, + 'bottom': Qt.BottomDockWidgetArea, + 'left': Qt.LeftDockWidgetArea, + 'right': Qt.RightDockWidgetArea} + def __init__(self, image): # Start main loop utils.init_qtapp() @@ -120,14 +120,14 @@ class ImageViewer(QtGui.QMainWindow): """Add plugin to ImageViewer""" plugin.attach(self) if plugin.dock: - location = dock_areas[plugin.dock] + location = self.dock_areas[plugin.dock] dock_location = Qt.DockWidgetArea(location) dock = QtGui.QDockWidget() dock.setWidget(plugin) dock.setWindowTitle(plugin.name) self.addDockWidget(dock_location, dock) - horiz = (dock_areas['left'], dock_areas['right']) + horiz = (self.dock_areas['left'], self.dock_areas['right']) dimension = 'width' if location in horiz else 'height' self._add_widget_size(plugin, dimension=dimension)