AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WorldView.viewportMoved does pass the view as its only argument, so don't pretend it doesn't.

Browse Source
This commit is contained in:
David Vierra 2015-03-16 18:18:04 -10:00
parent 3482baeffd
commit b8a3512768
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mcedit2/editorsession.py
View File

@ -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)

21
src/mcedit2/worldview/fourup.py
View File

@ -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()

2
src/mcedit2/worldview/worldview.py
View File

@ -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)