From 16d5633b74c1dcc470c5e4ab43c270a1f90070f3 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 11 Oct 2016 14:21:40 +0200 Subject: [PATCH 1/2] Fix "unsupported" warning on UM2+ 0.25 and 0.8 variants Contributes to 2271, fixes 2616 --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 8f7f311f47..46c1ec09b7 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -568,7 +568,7 @@ class MachineManager(QObject): candidate_quality = quality_manager.findQualityByQualityType(quality_type, quality_manager.getWholeMachineDefinition(machine_definition), [material_container]) - if not candidate_quality: + if not candidate_quality or candidate_quality.getId() == "empty_quality": # Fall back to a quality new_quality = quality_manager.findQualityByQualityType(None, quality_manager.getWholeMachineDefinition(machine_definition), From 50390dae03f71dc6ce6c39ee3a9781efd8d62028 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Tue, 11 Oct 2016 16:01:06 +0200 Subject: [PATCH 2/2] Replace all instances of "layer_height" in functions with resolveOrValue Since we have layer_height in quality profiles (and cannot remove it) we need to handle this. It turns out using resolveOrValue is a quick fix. Fixes CURA-2604 --- resources/definitions/fdmprinter.def.json | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7e9419c709..ef16334c09 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -761,7 +761,7 @@ "unit": "mm", "default_value": 0.8, "minimum_value": "0", - "minimum_value_warning": "3 * layer_height", + "minimum_value_warning": "3 * resolveOrValue('layer_height')", "maximum_value": "machine_height", "type": "float", "value": "top_bottom_thickness", @@ -777,7 +777,7 @@ "maximum_value_warning": "100", "type": "int", "minimum_value_warning": "4", - "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / layer_height, 4))", + "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", "settable_per_mesh": true } } @@ -789,7 +789,7 @@ "unit": "mm", "default_value": 0.6, "minimum_value": "0", - "minimum_value_warning": "3 * layer_height", + "minimum_value_warning": "3 * resolveOrValue('layer_height')", "type": "float", "value": "top_bottom_thickness", "maximum_value": "machine_height", @@ -804,7 +804,7 @@ "minimum_value_warning": "4", "default_value": 6, "type": "int", - "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / layer_height, 4))", + "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", "settable_per_mesh": true } } @@ -1044,10 +1044,10 @@ "unit": "mm", "type": "float", "default_value": 0.1, - "minimum_value": "layer_height", + "minimum_value": "resolveOrValue('layer_height')", "maximum_value_warning": "0.75 * machine_nozzle_size", - "maximum_value": "layer_height * 8", - "value": "layer_height", + "maximum_value": "resolveOrValue('layer_height') * 8", + "value": "resolveOrValue('layer_height')", "enabled": "infill_sparse_density > 0", "settable_per_mesh": true }, @@ -1071,7 +1071,7 @@ "type": "float", "default_value": 5.0, "minimum_value": "0.0001", - "minimum_value_warning": "3 * layer_height", + "minimum_value_warning": "3 * resolveOrValue('layer_height')", "maximum_value_warning": "100", "enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0", "settable_per_mesh": true @@ -1664,7 +1664,7 @@ "default_value": 2, "resolve": "sum(extruderValues('speed_slowdown_layers')) / len(extruderValues('speed_slowdown_layers'))", "minimum_value": "0", - "maximum_value_warning": "1.0 / layer_height", + "maximum_value_warning": "1.0 / resolveOrValue('layer_height')", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -2284,8 +2284,8 @@ "type": "int", "default_value": 2, "minimum_value": "1", - "maximum_value_warning": "10 / layer_height", - "value": "max(1, int(math.floor((cool_fan_full_at_height - resolveOrValue('layer_height_0')) / layer_height) + 2))", + "maximum_value_warning": "10 / resolveOrValue('layer_height')", + "value": "max(1, int(math.floor((cool_fan_full_at_height - resolveOrValue('layer_height_0')) / resolveOrValue('layer_height')) + 2))", "settable_per_mesh": false, "settable_per_extruder": true } @@ -2574,7 +2574,7 @@ "type": "float", "default_value": 1, "minimum_value": "0", - "minimum_value_warning": "3 * layer_height", + "minimum_value_warning": "3 * resolveOrValue('layer_height')", "maximum_value_warning": "10", "limit_to_extruder": "support_interface_extruder_nr", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", @@ -2589,7 +2589,7 @@ "type": "float", "default_value": 1, "minimum_value": "0", - "minimum_value_warning": "3 * layer_height", + "minimum_value_warning": "3 * resolveOrValue('layer_height')", "maximum_value_warning": "10", "value": "extruderValue(support_interface_extruder_nr, 'support_interface_height')", "limit_to_extruder": "support_interface_extruder_nr", @@ -2605,7 +2605,7 @@ "default_value": 1, "value": "extruderValue(support_interface_extruder_nr, 'support_interface_height')", "minimum_value": "0", - "minimum_value_warning": "min(3 * layer_height, extruderValue(support_interface_extruder_nr, 'support_bottom_stair_step_height'))", + "minimum_value_warning": "min(3 * resolveOrValue('layer_height'), extruderValue(support_interface_extruder_nr, 'support_bottom_stair_step_height'))", "maximum_value_warning": "10", "limit_to_extruder": "support_interface_extruder_nr", "enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable", @@ -2926,7 +2926,7 @@ "unit": "mm", "type": "float", "default_value": 0.1, - "value": "layer_height", + "value": "resolveOrValue('layer_height')", "minimum_value": "0.001", "minimum_value_warning": "0.04", "maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')", @@ -2974,7 +2974,7 @@ "unit": "mm", "type": "float", "default_value": 0.15, - "value": "layer_height * 1.5", + "value": "resolveOrValue('layer_height') * 1.5", "minimum_value": "0.001", "minimum_value_warning": "0.04", "maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'raft_interface_line_width')",