From 6d90c85fb2ad14ae0a90c66bdb7ec0ae884364d0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 17 Aug 2020 15:07:26 +0200 Subject: [PATCH 1/2] Also show Connect Support Lines for lines pattern Previously this was disabled because you should probably use the ZigZag pattern then. But I'm enabling it now because of two inconsistencies: * The setting still works. So you can change the setting by switching to grid, triangles, cross or gyroid, then switch back to lines and still get connected support lines. * The same happens with the infill patterns, where this setting is visible for the lines pattern. Rather than changing the other two things (which involves changes to CuraEngine too to make it ignore the setting value for the lines pattern), I've opted to change it here and fix both inconsistencies at once. If I were to make the setting dysfunctional, it would also lead to user confusion, because they then need to discover that they need to change the infill pattern, which may look unlogical to them. Fixes #8192. --- 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 e1b550621e..c2e3571a62 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4332,7 +4332,7 @@ "type": "bool", "default_value": false, "value": "support_pattern == 'cross' or support_pattern == 'gyroid'", - "enabled": "(support_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')", + "enabled": "(support_enable or support_meshes_present) and (support_pattern == 'lines' or support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true From dea53b9c02c4e7fb9bf560e8cea3144f63a7badb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 18 Aug 2020 10:38:50 +0200 Subject: [PATCH 2/2] Revert "Use extruderList rather than deprecated extruders property" This reverts commit 458acb356f11f50c3327b5af0be8531fb761548f. The change was wrong. The code refers to PrinterOutputModel.extruders which is not deprecated, not to GlobalStack.extruders (which is deprecated). Fixes #8204. --- resources/qml/PrintMonitor.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 9274bf80ad..19c2562874 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -77,7 +77,7 @@ Item Repeater { id: extrudersRepeater - model: activePrinter != null ? activePrinter.extruderList : null + model: activePrinter != null ? activePrinter.extruders : null ExtruderBox {