diff --git a/cura/CameraAnimation.py b/cura/CameraAnimation.py index 99aa6231db..c6051c58d1 100644 --- a/cura/CameraAnimation.py +++ b/cura/CameraAnimation.py @@ -6,7 +6,6 @@ from PyQt5.QtCore import QVariantAnimation, QEasingCurve from PyQt5.QtGui import QVector3D from UM.Math.Vector import Vector -from UM.Logger import Logger class CameraAnimation(QVariantAnimation): @@ -15,7 +14,6 @@ class CameraAnimation(QVariantAnimation): self._camera_tool = None self.setDuration(500) self.setEasingCurve(QEasingCurve.InOutQuad) - self.valueChanged.connect(self._onValueChanged) def setCameraTool(self, camera_tool): self._camera_tool = camera_tool @@ -26,10 +24,5 @@ class CameraAnimation(QVariantAnimation): def setTarget(self, target): self.setEndValue(QVector3D(target.x, target.y, target.z)) - # def updateCurrentValue(self, value): - # Logger.log("d", " ### value: %s" % str(value)) - # self._camera_tool.setOrigin(Vector(value.x(), value.y(), value.z())) - - def _onValueChanged(self, value): - Logger.log("d", " _onValueChanged value: %s" % str(value)) + def updateCurrentValue(self, value): self._camera_tool.setOrigin(Vector(value.x(), value.y(), value.z())) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index add7b4a143..61ead2d570 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1230,3 +1230,15 @@ class CuraApplication(QtApplication): def addNonSliceableExtension(self, extension): self._non_sliceable_extensions.append(extension) + + + @pyqtSlot("QVector3D") + def testQVector3D(self, vect): + Logger.log("d", "got QVector3D: %s : %s %s %s" % (vect, vect.x(), vect.y(), vect.z())) + + @pyqtProperty("QVector3D") + def getQVector3D(self): + from PyQt5.QtGui import QVector3D + vect = QVector3D(1.0, 2.0, 3.0) + Logger.log("d", "get QVector3D: %s" % vect) + return vect diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml index 9da7a0f0d2..9e51ab084d 100644 --- a/plugins/LayerView/LayerView.qml +++ b/plugins/LayerView/LayerView.qml @@ -306,6 +306,16 @@ Item } text: catalog.i18nc("@label", "Show Infill") } + CheckBox { + checked: true + onClicked: { + CuraApplication.log("getting QVector3D"); + var v = CuraApplication.getQVector3D; + CuraApplication.log("getting QVector3D"); + CuraApplication.testQVector3D(v); + } + text: catalog.i18nc("@label", "test") + } } } }