From 04ce21d48e136c0fb90904da85e7e36e14c28abf Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 15 Sep 2016 14:44:40 +0200 Subject: [PATCH 1/6] Only show additional components info for the currently active printer CURA-2276 --- resources/qml/Preferences/MachinesPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index a5e985efe0..f2937c04e6 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -207,6 +207,7 @@ UM.ManagementPage anchors.topMargin: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width + visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId Component.onCompleted: { From 5c553d7bcd0d98e7910391a2a42c0bc24fca7892 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 15 Sep 2016 15:29:57 +0200 Subject: [PATCH 2/6] Fix custom profile visibility for different variants, materials and machines. CURA-2248 --- resources/qml/Menus/ProfileMenu.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml index 45af0c7965..57d0226a97 100644 --- a/resources/qml/Menus/ProfileMenu.qml +++ b/resources/qml/Menus/ProfileMenu.qml @@ -38,7 +38,11 @@ Menu id: customProfileInstantiator model: UM.InstanceContainersModel { - filter: { "type": "quality_changes", "extruder": null, "definition": Cura.MachineManager.filterQualityByMachine ? Cura.MachineManager.activeQualityDefinitionId : "fdmprinter" }; + filter: menu.getFilter({ + "type": "quality_changes", + "extruder": null, + "definition": Cura.MachineManager.filterQualityByMachine ? Cura.MachineManager.activeQualityDefinitionId : "fdmprinter" + }); onModelReset: customSeparator.visible = rowCount() > 0 } From 692eb42aa73f58eb80206f6cd07316decff4d7c7 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 15 Sep 2016 17:05:14 +0200 Subject: [PATCH 3/6] When switching nozzle or material, drop mismatching quality changes. CURA-2248 --- cura/Settings/MachineManager.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5a91bc1706..0758d76608 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -520,6 +520,8 @@ class MachineManager(QObject): if extruder_stack != self._active_container_stack and extruder_stack.getProperty(key, "value") != new_value: extruder_stack.getTop().setProperty(key, "value", new_value) + ## Set the active material by switching out a container + # Depending on from/to material+current variant, a quality profile is chosen and set. @pyqtSlot(str) def setActiveMaterial(self, material_id): containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = material_id) @@ -533,7 +535,9 @@ class MachineManager(QObject): if not old_material: Logger.log("w", "While trying to set the active material, no material was found to replace it.") return - if old_quality_changes.getId() == "empty_quality_changes": #Don't want the empty one. + if (old_quality_changes.getId() == "empty_quality_changes" or #Don't want the empty one. + old_quality_changes.getMetaDataEntry("material") != material_id): # The quality change is based off a different material; the quality change is probably a custom quality. + old_quality_changes = None self.blurSettings.emit() old_material.nameChanged.disconnect(self._onMaterialNameChanged) @@ -551,7 +555,9 @@ class MachineManager(QObject): if old_quality: if old_quality_changes: - new_quality = self._updateQualityChangesContainer(old_quality.getMetaDataEntry("quality_type"), old_quality_changes.getMetaDataEntry("name")) + new_quality = self._updateQualityChangesContainer( + old_quality.getMetaDataEntry("quality_type"), + preferred_quality_changes_name = old_quality_changes.getMetaDataEntry("name")) else: new_quality = self._updateQualityContainer(self._global_container_stack.getBottom(), old_variant, containers[0], old_quality.getName()) else: From d8205870694a313ed3309077b2a6ee33bf3d0af0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 15 Sep 2016 18:04:48 +0200 Subject: [PATCH 4/6] Addded the orientation plugin --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9a86b6f8e0..c70bea2ab5 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ Third party plugins * [Post Processing Plugin](https://github.com/nallath/PostProcessingPlugin): Allows for post-processing scripts to run on g-code. * [Barbarian Plugin](https://github.com/nallath/BarbarianPlugin): Simple scale tool for imperial to metric. * [X3G Writer](https://github.com/Ghostkeeper/X3GWriter): Adds support for exporting X3G files. +*[Auto orientation](https://github.com/nallath/CuraOrientationPlugin): Calculate the optimal orientation for a model. Making profiles for other printers ---------------------------------- From 84997d8c4e04c49774d274e3c4d995be78b3364e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 15 Sep 2016 18:05:12 +0200 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c70bea2ab5..e1f23bbe04 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Third party plugins * [Post Processing Plugin](https://github.com/nallath/PostProcessingPlugin): Allows for post-processing scripts to run on g-code. * [Barbarian Plugin](https://github.com/nallath/BarbarianPlugin): Simple scale tool for imperial to metric. * [X3G Writer](https://github.com/Ghostkeeper/X3GWriter): Adds support for exporting X3G files. -*[Auto orientation](https://github.com/nallath/CuraOrientationPlugin): Calculate the optimal orientation for a model. +* [Auto orientation](https://github.com/nallath/CuraOrientationPlugin): Calculate the optimal orientation for a model. Making profiles for other printers ---------------------------------- From c7b5a0afb3817cb50b2d26acf13cb42f452a2607 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 16 Sep 2016 11:09:18 +0200 Subject: [PATCH 6/6] Improve inheritance of fan speed at height It compensates for the '- layer_height_0' by adding +1 back after the division. Also use floor, since I find that more intuitive since the break points come up at exactly the slice heights instead of at 0.25, 0.35, 0.45, etc. Contributes to issue CURA-2314. --- 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 eae6593fb8..de91e1d9d1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2231,7 +2231,7 @@ "default_value": 1, "minimum_value": "0", "maximum_value_warning": "100", - "value": "max(0, int(round((cool_fan_full_at_height - layer_height_0) / layer_height, 0)))", + "value": "max(0, int(math.floor((cool_fan_full_at_height - layer_height_0) / layer_height) + 1))", "settable_per_mesh": false, "settable_per_extruder": true }