From b8a35127687523bbe85966ade8e7ae7ab1ba7fee Mon Sep 17 00:00:00 2001 From: David Vierra Date: Mon, 16 Mar 2015 18:18:04 -1000 Subject: [PATCH] WorldView.viewportMoved does pass the view as its only argument, so don't pretend it doesn't. --- src/mcedit2/editorsession.py | 8 +++----- src/mcedit2/worldview/fourup.py | 21 +++++++++------------ src/mcedit2/worldview/worldview.py | 2 +- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/mcedit2/editorsession.py b/src/mcedit2/editorsession.py index bc9c74c..b0a91f5 100644 --- a/src/mcedit2/editorsession.py +++ b/src/mcedit2/editorsession.py @@ -620,15 +620,13 @@ class EditorTab(QtGui.QWidget): def viewOffsetChanged(self, view): - def _offsetChanged(offset): - self.miniMap.centerOnPoint(view.viewCenter()) - self.miniMap.currentViewMatrixChanged(view) - return _offsetChanged + self.miniMap.centerOnPoint(view.viewCenter()) + self.miniMap.currentViewMatrixChanged(view) def _addView(self, frame): self.views.append(frame) frame.stackIndex = self.viewStack.addWidget(frame) - frame.worldView.viewportMoved.connect(self.viewOffsetChanged(frame.worldView)) + frame.worldView.viewportMoved.connect(self.viewOffsetChanged) frame.worldView.viewActions.extend([ UseToolMouseAction(self.editorSession), TrackingMouseAction(self.editorSession) diff --git a/src/mcedit2/worldview/fourup.py b/src/mcedit2/worldview/fourup.py index 2085558..c09619f 100644 --- a/src/mcedit2/worldview/fourup.py +++ b/src/mcedit2/worldview/fourup.py @@ -40,10 +40,10 @@ class FourUpWorldView(QtGui.QWidget): self.isoView = IsoWorldView(*args, **kwargs) self.allViews = [self.xView, self.yView, self.zView, self.isoView] - self.xView.viewportMoved.connect(self.subViewMoved(self.xView)) - self.yView.viewportMoved.connect(self.subViewMoved(self.yView)) - self.zView.viewportMoved.connect(self.subViewMoved(self.zView)) - self.isoView.viewportMoved.connect(self.subViewMoved(self.isoView)) + self.xView.viewportMoved.connect(self.subViewMoved) + self.yView.viewportMoved.connect(self.subViewMoved) + self.zView.viewportMoved.connect(self.subViewMoved) + self.isoView.viewportMoved.connect(self.subViewMoved) self.viewActions = [] @@ -106,15 +106,12 @@ class FourUpWorldView(QtGui.QWidget): def subViewMoved(self, view): - def _moved(): - blocked = [view.blockSignals(True) for view in self.allViews] - self.centerOnPoint(view.viewCenter()) - for b, view in zip(blocked, self.allViews): - view.blockSignals(b) + blocked = [view.blockSignals(True) for view in self.allViews] + self.centerOnPoint(view.viewCenter()) + for b, view in zip(blocked, self.allViews): + view.blockSignals(b) - self.viewportMoved.emit(self.centerPoint) - - return _moved + self.viewportMoved.emit(self) def viewCenter(self): return self.xView.viewCenter() diff --git a/src/mcedit2/worldview/worldview.py b/src/mcedit2/worldview/worldview.py index c77bc9b..05053eb 100644 --- a/src/mcedit2/worldview/worldview.py +++ b/src/mcedit2/worldview/worldview.py @@ -65,7 +65,7 @@ class WorldView(QGLWidget): and one isometric view. """ - viewportMoved = QtCore.Signal(tuple) + viewportMoved = QtCore.Signal(QtGui.QWidget) cursorMoved = QtCore.Signal(QtGui.QMouseEvent) mouseBlockPos = Vector(0, 0, 0)