Third attempt at getting Travis to build

This commit is contained in:
Tony S Yu
2013-05-31 00:06:59 -05:00
parent 86c2c1a37c
commit 9393eac1b0
2 changed files with 8 additions and 10 deletions
-2
View File
@@ -7,5 +7,3 @@ elif qt_api == 'pyqt':
else:
# Mock objects
Qt = None
def pyqtSignal(*args, **kwargs):
pass
+8 -8
View File
@@ -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)