From f9e7d119afb91fe689e90321653de158c6c5f3fc Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 29 Mar 2018 14:10:50 +0200 Subject: [PATCH 1/4] CURA-5019 thumbnail: do not scale the second color of support meshes or the checkboard pattern is not visible anymore --- cura/PreviewPass.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/PreviewPass.py b/cura/PreviewPass.py index 2a3080b0cc..f6b963d141 100644 --- a/cura/PreviewPass.py +++ b/cura/PreviewPass.py @@ -95,7 +95,7 @@ class PreviewPass(RenderPass): diffuse_color[2] * shade_factor, 1.0] uniforms["diffuse_color"] = prettier_color(diffuse_color) - uniforms["diffuse_color_2"] = prettier_color(diffuse_color2) + uniforms["diffuse_color_2"] = diffuse_color2 batch_support_mesh.addItem(node.getWorldTransformation(), node.getMeshData(), uniforms = uniforms) else: # Normal scene node From 2bf3fa35ac8e3903fe8c19859044dd73fa3add65 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 29 Mar 2018 14:25:00 +0200 Subject: [PATCH 2/4] CURA-5174 update camera zoom range --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 5ac0f03b2e..53db4a3638 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -742,7 +742,7 @@ class CuraApplication(QtApplication): # Initialize camera tool camera_tool = controller.getTool("CameraTool") camera_tool.setOrigin(Vector(0, 100, 0)) - camera_tool.setZoomRange(0.1, 200000) + camera_tool.setZoomRange(0.1, 2000) # Initialize camera animations self._camera_animation = CameraAnimation.CameraAnimation() From 720a85dd06cae84362269120ea29f930fbec1b53 Mon Sep 17 00:00:00 2001 From: Aleksei S Date: Thu, 29 Mar 2018 14:31:25 +0200 Subject: [PATCH 3/4] Remove comment CURA-4844 --- cura/Settings/MachineManager.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7be658df19..e304a14d67 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -342,9 +342,6 @@ class MachineManager(QObject): self._initMachineState(containers[0]) self._onGlobalContainerChanged() - #The signal should update/reset settings of all connected USB devices - #self.usbOutputDeviceChanged.emit() - self.__emitChangedSignals() ## Given a definition id, return the machine with this id. From b2950eca511eed29f800027620a3402c62f14e68 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 29 Mar 2018 14:37:55 +0200 Subject: [PATCH 4/4] CURA-5158 Fix some mistakes in previous confict fixing. --- resources/qml/MachineSelection.qml | 12 ------------ resources/qml/Sidebar.qml | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/resources/qml/MachineSelection.qml b/resources/qml/MachineSelection.qml index 670a68a22a..7a8a6b476b 100644 --- a/resources/qml/MachineSelection.qml +++ b/resources/qml/MachineSelection.qml @@ -83,16 +83,4 @@ ToolButton } menu: PrinterMenu { } - - // Make the toolbutton react when the global container changes, otherwise if Cura is not connected to the printer, - // switching printers make no reaction - Connections - { - target: Cura.MachineManager - onGlobalContainerChanged: - { - base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != "" - base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0 - } - } } diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 86e866d895..590ab29880 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -661,16 +661,4 @@ Rectangle watchedProperties: [ "value" ] storeIndex: 0 } - - // Make the ConfigurationSelector react when the global container changes, otherwise if Cura is not connected to the printer, - // switching printers make no reaction - Connections - { - target: Cura.MachineManager - onGlobalContainerChanged: - { - base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != "" - base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0 - } - } }