From 61c38c5ec05bb58271e046e53366e9f735fb86a1 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 10 Apr 2019 15:43:44 +0200 Subject: [PATCH 1/9] Pass output device (or not) to cloud check method Contributes to CL-1325 --- plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py index 8d923d3827..7cff6b6aca 100644 --- a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py +++ b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py @@ -181,7 +181,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): um_network_key = CuraApplication.getInstance().getGlobalContainerStack().getMetaDataEntry("um_network_key") if key == um_network_key: self.getOutputDeviceManager().addOutputDevice(self._discovered_devices[key]) - self.checkCloudFlowIsPossible() + self.checkCloudFlowIsPossible(None) else: self.getOutputDeviceManager().removeOutputDevice(key) if key.startswith("manual:"): @@ -488,7 +488,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): return True ## Check if the prerequsites are in place to start the cloud flow - def checkCloudFlowIsPossible(self) -> None: + def checkCloudFlowIsPossible(self, cluster: Optional["CloudOutputDevice"]) -> None: Logger.log("d", "Checking if cloud connection is possible...") # Pre-Check: Skip if active machine already has been cloud connected or you said don't ask again @@ -595,7 +595,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): self._cloud_flow_complete_message.hide() # Check for cloud flow again with newly selected machine - self.checkCloudFlowIsPossible() + self.checkCloudFlowIsPossible(None) def _createCloudFlowStartMessage(self): self._start_cloud_flow_message = Message( From 17a5816b884c63807d1a2a7f3b2cd1eabcd21473 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 11 Apr 2019 10:12:27 +0200 Subject: [PATCH 2/9] Fix typing Contributes to CL-1325 --- plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py index 7cff6b6aca..0c205b7b3c 100644 --- a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py +++ b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py @@ -27,6 +27,7 @@ from UM.Version import Version from . import ClusterUM3OutputDevice, LegacyUM3OutputDevice from .Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager +from .Cloud.CloudOutputDevice import CloudOutputDevice # typing if TYPE_CHECKING: from PyQt5.QtNetwork import QNetworkReply @@ -488,7 +489,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): return True ## Check if the prerequsites are in place to start the cloud flow - def checkCloudFlowIsPossible(self, cluster: Optional["CloudOutputDevice"]) -> None: + def checkCloudFlowIsPossible(self, cluster: Optional[CloudOutputDevice]) -> None: Logger.log("d", "Checking if cloud connection is possible...") # Pre-Check: Skip if active machine already has been cloud connected or you said don't ask again From 89a74e8ae209f53e3b0876c3bef79bc19dc7c985 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 11 Apr 2019 13:59:43 +0200 Subject: [PATCH 3/9] JSON: new setting infill_randomize_start_location --- resources/definitions/fdmprinter.def.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8ce0246a93..4eeac55183 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1723,6 +1723,17 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, + "infill_randomize_start_location": + { + "label": "Randomize Infill Start", + "description": "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move.", + "type": "bool", + "default_value": true, + "value": "infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic'", + "enabled": "not ((infill_pattern == 'cross' and connect_infill_polygons) or infill_pattern == 'concentric')", + "limit_to_extruder": "infill_extruder_nr", + "settable_per_mesh": true + }, "infill_multiplier": { "label": "Infill Line Multiplier", From cc9aa1129a7795a9bcc13bf4916d38a2c4b11375 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 11 Apr 2019 14:07:52 +0200 Subject: [PATCH 4/9] Revert "JSON: new setting infill_randomize_start_location" This reverts commit 89a74e8ae209f53e3b0876c3bef79bc19dc7c985. Accidentally committed to master. --- resources/definitions/fdmprinter.def.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4eeac55183..8ce0246a93 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1723,17 +1723,6 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, - "infill_randomize_start_location": - { - "label": "Randomize Infill Start", - "description": "Randomize which infill line is printed first. This prevents one segment becoming the strongest, but it does so at the cost of an additional travel move.", - "type": "bool", - "default_value": true, - "value": "infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic'", - "enabled": "not ((infill_pattern == 'cross' and connect_infill_polygons) or infill_pattern == 'concentric')", - "limit_to_extruder": "infill_extruder_nr", - "settable_per_mesh": true - }, "infill_multiplier": { "label": "Infill Line Multiplier", From 852e7bc8f6e45d04d35db91540618e953fd33d3c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 11 Apr 2019 14:46:27 +0200 Subject: [PATCH 5/9] Fit missing font in material-vendor text. --- plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml b/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml index b653f1a73b..42ece4043d 100644 --- a/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml @@ -65,6 +65,7 @@ Item { id: description text: details.description || "" + font: UM.Theme.getFont("default") anchors { top: title.bottom From db71a40acc19eeedb3a9de62c4ba24a93fa1af54 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 11 Apr 2019 16:23:36 +0200 Subject: [PATCH 6/9] Handle undefined extruder-color on start in RecommendedSupportSelector. --- .../Recommended/RecommendedSupportSelector.qml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 7e115667c3..ed075c6b90 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -133,7 +133,14 @@ Item supportExtruderCombobox.color = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color } } - onCurrentIndexChanged: supportExtruderCombobox.color = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color + onCurrentIndexChanged: + { + var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color + if(maybeColor) + { + supportExtruderCombobox.color = maybeColor + } + } Binding { From 55dcf31e3c10d60b13c44630c5a36055ef92ef94 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 11 Apr 2019 16:24:51 +0200 Subject: [PATCH 7/9] Fix QML binding loop warnings for CustomConfiguration. --- .../Menus/ConfigurationMenu/CustomConfiguration.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 708606f483..c60d4d48f0 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -205,7 +205,7 @@ Item Row { - height: visible ? childrenRect.height : 0 + height: visible ? UM.Theme.getSize("setting_control").height : 0 visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that. Label @@ -223,7 +223,7 @@ Item { checked: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.isEnabled : false enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder. - height: UM.Theme.getSize("setting_control").height + height: parent.height style: UM.Theme.styles.checkbox /* Use a MouseArea to process the click on this checkbox. @@ -242,7 +242,7 @@ Item Row { - height: visible ? childrenRect.height: 0 + height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0 visible: Cura.MachineManager.hasMaterials Label @@ -267,7 +267,7 @@ Item tooltip: text width: selectors.controlWidth - height: UM.Theme.getSize("print_setup_big_item").height + height: parent.height style: UM.Theme.styles.print_setup_header_button activeFocusOnPress: true @@ -302,7 +302,7 @@ Item Row { - height: visible ? childrenRect.height: 0 + height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0 visible: Cura.MachineManager.hasVariants Label @@ -321,7 +321,7 @@ Item id: variantSelection text: Cura.MachineManager.activeVariantName tooltip: Cura.MachineManager.activeVariantName - height: UM.Theme.getSize("print_setup_big_item").height + height: parent.height width: selectors.controlWidth style: UM.Theme.styles.print_setup_header_button activeFocusOnPress: true; From 32fcc79dd8730aea85e0b3212cea16d6a8d82b44 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 11 Apr 2019 16:32:56 +0200 Subject: [PATCH 8/9] Fix _shouldResolve() CURA-6456 --- cura/Settings/GlobalStack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 5c05d28739..df881b4714 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -212,7 +212,7 @@ class GlobalStack(CuraContainerStack): # Determine whether or not we should try to get the "resolve" property instead of the # requested property. def _shouldResolve(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> bool: - if property_name is not "value": + if property_name != "value": # Do not try to resolve anything but the "value" property return False From 4065a1204a40f7cac72951c268c09bfcf301f9fd Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 12 Apr 2019 08:52:35 +0200 Subject: [PATCH 9/9] Fix string comparisons --- plugins/Toolbox/src/AuthorsModel.py | 2 +- plugins/Toolbox/src/PackagesModel.py | 2 +- plugins/Toolbox/src/Toolbox.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/Toolbox/src/AuthorsModel.py b/plugins/Toolbox/src/AuthorsModel.py index 877f8256ee..7bfc58df04 100644 --- a/plugins/Toolbox/src/AuthorsModel.py +++ b/plugins/Toolbox/src/AuthorsModel.py @@ -53,7 +53,7 @@ class AuthorsModel(ListModel): # Filter on all the key-word arguments. for key, value in self._filter.items(): - if key is "package_types": + if key == "package_types": key_filter = lambda item, value = value: value in item["package_types"] # type: ignore elif "*" in value: key_filter = lambda item, key = key, value = value: self._matchRegExp(item, key, value) # type: ignore diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index d94fdf6bb7..1cf87790bc 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -112,7 +112,7 @@ class PackagesModel(ListModel): # Filter on all the key-word arguments. for key, value in self._filter.items(): - if key is "tags": + if key == "tags": key_filter = lambda item, v = value: v in item["tags"] elif "*" in value: key_filter = lambda candidate, k = key, v = value: self._matchRegExp(candidate, k, v) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 085c5d1bde..6d21b8e6f0 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -613,12 +613,12 @@ class Toolbox(QObject, Extension): self._server_response_data[response_type] = json_data["data"] self._models[response_type].setMetadata(self._server_response_data[response_type]) - if response_type is "packages": + if response_type == "packages": self._models[response_type].setFilter({"type": "plugin"}) self.reBuildMaterialsModels() self.reBuildPluginsModels() self._notifyPackageManager() - elif response_type is "authors": + elif response_type == "authors": self._models[response_type].setFilter({"package_types": "material"}) self._models[response_type].setFilter({"tags": "generic"})