Extract RotationWidget to widgets/rotation_widget.py
This commit is contained in:
David Vierra
parent
35d7317eda
commit
05d844c72a
@ -2,22 +2,20 @@
|
|||||||
move
|
move
|
||||||
"""
|
"""
|
||||||
from __future__ import absolute_import, division, print_function
|
from __future__ import absolute_import, division, print_function
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from PySide import QtGui, QtCore
|
from PySide import QtGui
|
||||||
from PySide.QtCore import Qt
|
|
||||||
|
|
||||||
from mcedit2.editortools import EditorTool
|
|
||||||
from mcedit2.command import SimpleRevisionCommand
|
from mcedit2.command import SimpleRevisionCommand
|
||||||
|
from mcedit2.editortools import EditorTool
|
||||||
from mcedit2.imports import PendingImportNode, PendingImport
|
from mcedit2.imports import PendingImportNode, PendingImport
|
||||||
from mcedit2.rendering.scenegraph import scenenode
|
from mcedit2.rendering.scenegraph import scenenode
|
||||||
from mcedit2.util.load_ui import load_ui
|
|
||||||
from mcedit2.util.resources import resourcePath
|
|
||||||
from mcedit2.util.showprogress import showProgress
|
from mcedit2.util.showprogress import showProgress
|
||||||
from mcedit2.widgets.coord_widget import CoordinateWidget
|
from mcedit2.widgets.coord_widget import CoordinateWidget
|
||||||
from mcedit2.widgets.layout import Column
|
from mcedit2.widgets.layout import Column
|
||||||
|
from mcedit2.widgets.rotation_widget import RotationWidget
|
||||||
from mceditlib.export import extractSchematicFromIter
|
from mceditlib.export import extractSchematicFromIter
|
||||||
from mceditlib.geometry import Vector
|
|
||||||
from mceditlib.selection import BoundingBox
|
from mceditlib.selection import BoundingBox
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -96,107 +94,6 @@ class MoveFinishCommand(SimpleRevisionCommand):
|
|||||||
#self.moveTool.removePendingImport(self.pendingImport)
|
#self.moveTool.removePendingImport(self.pendingImport)
|
||||||
|
|
||||||
|
|
||||||
class RotationWidget(QtGui.QWidget):
|
|
||||||
def __init__(self):
|
|
||||||
super(RotationWidget, self).__init__()
|
|
||||||
load_ui("rotation_widget.ui", baseinstance=self)
|
|
||||||
|
|
||||||
self.xRotSlider.valueChanged.connect(self.setXRot)
|
|
||||||
self.yRotSlider.valueChanged.connect(self.setYRot)
|
|
||||||
self.zRotSlider.valueChanged.connect(self.setZRot)
|
|
||||||
|
|
||||||
self.xRotSlider.sliderReleased.connect(self.sliderReleased)
|
|
||||||
self.yRotSlider.sliderReleased.connect(self.sliderReleased)
|
|
||||||
self.zRotSlider.sliderReleased.connect(self.sliderReleased)
|
|
||||||
|
|
||||||
self.xRotSpinBox.valueChanged.connect(self.setXRot)
|
|
||||||
self.yRotSpinBox.valueChanged.connect(self.setYRot)
|
|
||||||
self.zRotSpinBox.valueChanged.connect(self.setZRot)
|
|
||||||
|
|
||||||
icon = QtGui.QIcon(resourcePath("mcedit2/assets/mcedit2/icons/right_angle.png"))
|
|
||||||
self.xRot90Button.setIcon(icon)
|
|
||||||
self.yRot90Button.setIcon(icon)
|
|
||||||
self.zRot90Button.setIcon(icon)
|
|
||||||
|
|
||||||
self.xRot90Button.clicked.connect(self.xRot90Clicked)
|
|
||||||
self.yRot90Button.clicked.connect(self.yRot90Clicked)
|
|
||||||
self.zRot90Button.clicked.connect(self.zRot90Clicked)
|
|
||||||
|
|
||||||
self.xRot = self.yRot = self.zRot = 0
|
|
||||||
|
|
||||||
def rot90(self, angle):
|
|
||||||
if angle < 90:
|
|
||||||
angle = 90
|
|
||||||
elif angle < 180:
|
|
||||||
angle = 180
|
|
||||||
elif angle < 270:
|
|
||||||
angle = 270
|
|
||||||
else:
|
|
||||||
angle = 0
|
|
||||||
|
|
||||||
return angle
|
|
||||||
|
|
||||||
def xRot90Clicked(self):
|
|
||||||
self.setXRot(self.rot90(self.xRot))
|
|
||||||
|
|
||||||
def yRot90Clicked(self):
|
|
||||||
self.setYRot(self.rot90(self.yRot))
|
|
||||||
|
|
||||||
def zRot90Clicked(self):
|
|
||||||
self.setZRot(self.rot90(self.zRot))
|
|
||||||
|
|
||||||
rotationChanged = QtCore.Signal(object, bool)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def rotation(self):
|
|
||||||
return self.xRot, self.yRot, self.zRot
|
|
||||||
|
|
||||||
@rotation.setter
|
|
||||||
def rotation(self, value):
|
|
||||||
if value == self.rotation:
|
|
||||||
return
|
|
||||||
xRot, yRot, zRot = value
|
|
||||||
self.setXRot(xRot)
|
|
||||||
self.setYRot(yRot)
|
|
||||||
self.setZRot(zRot)
|
|
||||||
|
|
||||||
def emitRotationChanged(self, live):
|
|
||||||
self.rotationChanged.emit((self.xRot, self.yRot, self.zRot), live)
|
|
||||||
|
|
||||||
def sliderReleased(self):
|
|
||||||
self.emitRotationChanged(False)
|
|
||||||
|
|
||||||
def setXRot(self, value):
|
|
||||||
if self.xRot == value:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.xRot = value
|
|
||||||
self.xRotSlider.setValue(value)
|
|
||||||
self.xRotSpinBox.setValue(value)
|
|
||||||
|
|
||||||
self.emitRotationChanged(self.xRotSlider.isSliderDown())
|
|
||||||
|
|
||||||
def setYRot(self, value):
|
|
||||||
if self.yRot == value:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.yRot = value
|
|
||||||
self.yRotSlider.setValue(value)
|
|
||||||
self.yRotSpinBox.setValue(value)
|
|
||||||
|
|
||||||
self.emitRotationChanged(self.yRotSlider.isSliderDown())
|
|
||||||
|
|
||||||
def setZRot(self, value):
|
|
||||||
if self.zRot == value:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.zRot = value
|
|
||||||
self.zRotSlider.setValue(value)
|
|
||||||
self.zRotSpinBox.setValue(value)
|
|
||||||
|
|
||||||
self.emitRotationChanged(self.zRotSlider.isSliderDown())
|
|
||||||
|
|
||||||
|
|
||||||
class MoveTool(EditorTool):
|
class MoveTool(EditorTool):
|
||||||
iconName = "move"
|
iconName = "move"
|
||||||
name = "Move"
|
name = "Move"
|
||||||
|
|||||||
113
src/mcedit2/widgets/rotation_widget.py
Normal file
113
src/mcedit2/widgets/rotation_widget.py
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
"""
|
||||||
|
rotation_widget
|
||||||
|
"""
|
||||||
|
from __future__ import absolute_import, division, print_function, unicode_literals
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from PySide import QtGui, QtCore
|
||||||
|
|
||||||
|
from mcedit2.util.load_ui import load_ui
|
||||||
|
from mcedit2.util.resources import resourcePath
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class RotationWidget(QtGui.QWidget):
|
||||||
|
def __init__(self):
|
||||||
|
super(RotationWidget, self).__init__()
|
||||||
|
load_ui("rotation_widget.ui", baseinstance=self)
|
||||||
|
|
||||||
|
self.xRotSlider.valueChanged.connect(self.setXRot)
|
||||||
|
self.yRotSlider.valueChanged.connect(self.setYRot)
|
||||||
|
self.zRotSlider.valueChanged.connect(self.setZRot)
|
||||||
|
|
||||||
|
self.xRotSlider.sliderReleased.connect(self.sliderReleased)
|
||||||
|
self.yRotSlider.sliderReleased.connect(self.sliderReleased)
|
||||||
|
self.zRotSlider.sliderReleased.connect(self.sliderReleased)
|
||||||
|
|
||||||
|
self.xRotSpinBox.valueChanged.connect(self.setXRot)
|
||||||
|
self.yRotSpinBox.valueChanged.connect(self.setYRot)
|
||||||
|
self.zRotSpinBox.valueChanged.connect(self.setZRot)
|
||||||
|
|
||||||
|
icon = QtGui.QIcon(resourcePath("mcedit2/assets/mcedit2/icons/right_angle.png"))
|
||||||
|
self.xRot90Button.setIcon(icon)
|
||||||
|
self.yRot90Button.setIcon(icon)
|
||||||
|
self.zRot90Button.setIcon(icon)
|
||||||
|
|
||||||
|
self.xRot90Button.clicked.connect(self.xRot90Clicked)
|
||||||
|
self.yRot90Button.clicked.connect(self.yRot90Clicked)
|
||||||
|
self.zRot90Button.clicked.connect(self.zRot90Clicked)
|
||||||
|
|
||||||
|
self.xRot = self.yRot = self.zRot = 0
|
||||||
|
|
||||||
|
def rot90(self, angle):
|
||||||
|
if angle < 90:
|
||||||
|
angle = 90
|
||||||
|
elif angle < 180:
|
||||||
|
angle = 180
|
||||||
|
elif angle < 270:
|
||||||
|
angle = 270
|
||||||
|
else:
|
||||||
|
angle = 0
|
||||||
|
|
||||||
|
return angle
|
||||||
|
|
||||||
|
def xRot90Clicked(self):
|
||||||
|
self.setXRot(self.rot90(self.xRot))
|
||||||
|
|
||||||
|
def yRot90Clicked(self):
|
||||||
|
self.setYRot(self.rot90(self.yRot))
|
||||||
|
|
||||||
|
def zRot90Clicked(self):
|
||||||
|
self.setZRot(self.rot90(self.zRot))
|
||||||
|
|
||||||
|
rotationChanged = QtCore.Signal(object, bool)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def rotation(self):
|
||||||
|
return self.xRot, self.yRot, self.zRot
|
||||||
|
|
||||||
|
@rotation.setter
|
||||||
|
def rotation(self, value):
|
||||||
|
if value == self.rotation:
|
||||||
|
return
|
||||||
|
xRot, yRot, zRot = value
|
||||||
|
self.setXRot(xRot)
|
||||||
|
self.setYRot(yRot)
|
||||||
|
self.setZRot(zRot)
|
||||||
|
|
||||||
|
def emitRotationChanged(self, live):
|
||||||
|
self.rotationChanged.emit((self.xRot, self.yRot, self.zRot), live)
|
||||||
|
|
||||||
|
def sliderReleased(self):
|
||||||
|
self.emitRotationChanged(False)
|
||||||
|
|
||||||
|
def setXRot(self, value):
|
||||||
|
if self.xRot == value:
|
||||||
|
return
|
||||||
|
|
||||||
|
self.xRot = value
|
||||||
|
self.xRotSlider.setValue(value)
|
||||||
|
self.xRotSpinBox.setValue(value)
|
||||||
|
|
||||||
|
self.emitRotationChanged(self.xRotSlider.isSliderDown())
|
||||||
|
|
||||||
|
def setYRot(self, value):
|
||||||
|
if self.yRot == value:
|
||||||
|
return
|
||||||
|
|
||||||
|
self.yRot = value
|
||||||
|
self.yRotSlider.setValue(value)
|
||||||
|
self.yRotSpinBox.setValue(value)
|
||||||
|
|
||||||
|
self.emitRotationChanged(self.yRotSlider.isSliderDown())
|
||||||
|
|
||||||
|
def setZRot(self, value):
|
||||||
|
if self.zRot == value:
|
||||||
|
return
|
||||||
|
|
||||||
|
self.zRot = value
|
||||||
|
self.zRotSlider.setValue(value)
|
||||||
|
self.zRotSpinBox.setValue(value)
|
||||||
|
|
||||||
|
self.emitRotationChanged(self.zRotSlider.isSliderDown())
|
||||||
Reference in New Issue
Block a user