From 02291bb6a319a7410344aa1dcbcaff697f38084b Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 19 Jan 2018 11:14:40 +0100 Subject: [PATCH 1/3] better name: "Compatible material diameter" in Machine Settings CURA-4832 --- plugins/MachineSettingsAction/MachineSettingsAction.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index b815d71acc..536c6c30d6 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -390,7 +390,7 @@ Cura.MachineAction visible: Cura.MachineManager.hasMaterials sourceComponent: numericTextFieldWithUnit property string settingKey: "material_diameter" - property string label: catalog.i18nc("@label", "Material diameter") + property string label: catalog.i18nc("@label", "Compatible material diameter") property string unit: catalog.i18nc("@label", "mm") property string tooltip: catalog.i18nc("@tooltip", "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile.") function afterOnEditingFinished() From 1f4e7421c1e776c68f309f3caf46db53aa1f275d Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 19 Jan 2018 11:17:42 +0100 Subject: [PATCH 2/3] Revert "CURA-4821 Remove debug info" This reverts commit d03ecf3cba84d1551d6cb979ef0fb094da92a3e2. --- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 26731337dd..85699ea0f5 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -430,6 +430,7 @@ class CuraEngineBackend(QObject, Backend): # cached layer data is removed so the previous data is not rendered - CURA-4821 if source.callDecoration("isBlockSlicing") and source.callDecoration("getLayerData"): if self._stored_optimized_layer_data: + print(self._stored_optimized_layer_data) del self._stored_optimized_layer_data[source.callDecoration("getBuildPlateNumber")] build_plate_changed = set() @@ -697,7 +698,6 @@ class CuraEngineBackend(QObject, Backend): self._process_layers_job.setBuildPlate(build_plate_number) self._process_layers_job.finished.connect(self._onProcessLayersFinished) self._process_layers_job.start() - del self._stored_optimized_layer_data[build_plate_number] ## Called when the user changes the active view mode. def _onActiveViewChanged(self): From f25aad8091b9eb651d958bbb5e4a9e8960dc9ec5 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 19 Jan 2018 11:18:46 +0100 Subject: [PATCH 3/3] CURA-4821 Remove debug output --- plugins/CuraEngineBackend/CuraEngineBackend.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 85699ea0f5..47f7a07b94 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -430,7 +430,6 @@ class CuraEngineBackend(QObject, Backend): # cached layer data is removed so the previous data is not rendered - CURA-4821 if source.callDecoration("isBlockSlicing") and source.callDecoration("getLayerData"): if self._stored_optimized_layer_data: - print(self._stored_optimized_layer_data) del self._stored_optimized_layer_data[source.callDecoration("getBuildPlateNumber")] build_plate_changed = set()