From b9a9ef8823d371dbf12b7c5e709d472eb43364d6 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 16 Oct 2017 20:21:42 +0200 Subject: [PATCH 1/3] CURA-4457 Add parenthesis in conditional statement --- cura/Settings/QualityAndUserProfilesModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/QualityAndUserProfilesModel.py b/cura/Settings/QualityAndUserProfilesModel.py index 602f8768da..9d7d913d5e 100644 --- a/cura/Settings/QualityAndUserProfilesModel.py +++ b/cura/Settings/QualityAndUserProfilesModel.py @@ -58,8 +58,8 @@ class QualityAndUserProfilesModel(ProfilesModel): # If the printer has multiple extruders then quality changes related to the current extruder are kept filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set and qc.getMetaDataEntry("extruder") is not None and - qc.getMetaDataEntry("extruder") == active_extruder.definition.getMetaDataEntry("quality_definition") or - qc.getMetaDataEntry("extruder") == active_extruder.definition.getId()] + (qc.getMetaDataEntry("extruder") == active_extruder.definition.getMetaDataEntry("quality_definition") or + qc.getMetaDataEntry("extruder") == active_extruder.definition.getId())] else: # If not, the quality changes of the global stack are selected filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set and From 4d0c0f606e50c045b92ee8bb2fd5e87dd96fda06 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 17 Oct 2017 16:44:27 +0200 Subject: [PATCH 2/3] Use new version for downloading plugins --- plugins/PluginBrowser/PluginBrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PluginBrowser/PluginBrowser.py b/plugins/PluginBrowser/PluginBrowser.py index 0037d4bc59..37ad128b49 100644 --- a/plugins/PluginBrowser/PluginBrowser.py +++ b/plugins/PluginBrowser/PluginBrowser.py @@ -26,7 +26,7 @@ class PluginBrowser(QObject, Extension): def __init__(self, parent=None): super().__init__(parent) - self._api_version = 1 + self._api_version = 2 self._api_url = "http://software.ultimaker.com/cura/v%s/" % self._api_version self._plugin_list_request = None From e897431c959491a8cf27fbf275bd2bcabdb15d01 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 Oct 2017 13:03:33 +0200 Subject: [PATCH 3/3] Fix default quality level for Creality CR-10 printers Instead of having a default layer height of 0.2mm, we change the default quality profile to be the one with a layer height of 0.2mm. This fixes up the quality slider. --- resources/definitions/creality_cr10.def.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index b570a0d3e6..ced6f32b7b 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -7,7 +7,8 @@ "visible": true, "author": "Michael Wildermuth", "manufacturer": "Creality3D", - "file_formats": "text/x-gcode" + "file_formats": "text/x-gcode", + "preferred_quality": "*Draft*" }, "overrides": { "machine_width": { @@ -25,9 +26,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "layer_height": { - "default_value": 0.2 - }, "layer_height_0": { "default_value": 0.2 },