From 12bee471eb43ddbd8eb2170414850e775e720748 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 20 Nov 2017 13:01:09 +0100 Subject: [PATCH 1/3] CURA-4104 added settings for flow rate compensated extrusion --- resources/definitions/fdmprinter.def.json | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5847b67816..8a35839f55 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5471,6 +5471,36 @@ } } }, + "flow_rate_max_extrusion_offset": + { + "label": "Flow rate compensation max extrusion offset", + "description": "The maximum distance in mm to compensate for pressure in the bowden tube.", + "unit": "mm", + "type": "float", + "minimum_value": "0", + "maximum_value_warning": "10", + "default_value": 0, + "value": "0", + "enabled": true, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "flow_rate_extrusion_offset_factor": + { + "label": "Flow rate compensation factor", + "description": "The multiplication factor for the flow rate -> distance translation.", + "unit": "%", + "type": "float", + "minimum_value": "0", + "maximum_value_warning": "100", + "default_value": 100, + "value": "100", + "enabled": true, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "wireframe_enabled": { "label": "Wire Printing", From c1733dd908392d12c968cdddf86e2ea234531d20 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 20 Nov 2017 14:19:58 +0100 Subject: [PATCH 2/3] Update fdmprinter.def.json --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8a35839f55..a9d7800173 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5474,7 +5474,7 @@ "flow_rate_max_extrusion_offset": { "label": "Flow rate compensation max extrusion offset", - "description": "The maximum distance in mm to compensate for pressure in the bowden tube.", + "description": "The maximum distance in mm to compensate.", "unit": "mm", "type": "float", "minimum_value": "0", From 604105752ddd5d6c9d94ee2adda2c2b67ae085d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 20 Nov 2017 15:36:54 +0100 Subject: [PATCH 3/3] Fix import in plugin subdirectory Contributes to issue CURA-4526. --- plugins/SimulationView/SimulationView.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 90f64a8224..1794822ad2 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -26,7 +26,7 @@ from UM.View.GL.OpenGLContext import OpenGLContext from UM.View.View import View from UM.i18n import i18nCatalog from cura.ConvexHullNode import ConvexHullNode -from plugins.SimulationView.NozzleNode import NozzleNode +from . import NozzleNode from . import SimulationPass, SimulationViewProxy catalog = i18nCatalog("cura")