diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 25a6d590e3..6a89c86e85 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -248,7 +248,6 @@ class CuraApplication(QtApplication): blackmagic print_sequence infill_mesh - dual experimental """.replace("\n", ";").replace(" ", "")) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index a25a09bd27..14ff3b4e0e 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -292,7 +292,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): for identifier in identifiers: machine_id = self.__product_id_map.get(identifier.get("product"), None) if machine_id is None: - Logger.log("w", "Cannot create material for unknown machine %s", machine_id) + Logger.log("w", "Cannot create material for unknown machine %s", identifier.get("product")) continue definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id) @@ -373,6 +373,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): "print temperature": "material_print_temperature", "heated bed temperature": "material_bed_temperature", "standby temperature": "material_standby_temperature", + "processing temperature graph": "material_flow_temp_graph", "print cooling": "cool_fan_speed", "retraction amount": "retraction_amount", "retraction speed": "retraction_speed", @@ -381,11 +382,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): # Map XML file product names to internal ids # TODO: Move this to definition's metadata __product_id_map = { - "Ultimaker2": "ultimaker2", - "Ultimaker2+": "ultimaker2_plus", - "Ultimaker2go": "ultimaker2_go", - "Ultimaker2extended": "ultimaker2_extended", - "Ultimaker2extended+": "ultimaker2_extended_plus", + "Ultimaker 2": "ultimaker2", + "Ultimaker 2+": "ultimaker2_plus", + "Ultimaker 2 Go": "ultimaker2_go", + "Ultimaker 2 Extended": "ultimaker2_extended", + "Ultimaker 2 Extended+": "ultimaker2_extended_plus", "Ultimaker Original": "ultimaker_original", "Ultimaker Original+": "ultimaker_original_plus" } diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 7eb03437d7..511617c3e6 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -95,9 +95,5 @@ "infill_overlap": { "default_value": 10.0 } - }, - "machine_preferences": { - "prefered_profile": "Normal Quality", - "prefered_material": "PLA" - } + } } diff --git a/resources/materials/generic_abs.xml.fdm_material b/resources/materials/generic_abs.xml.fdm_material index ceb6e8698e..ef2db0b7fd 100644 --- a/resources/materials/generic_abs.xml.fdm_material +++ b/resources/materials/generic_abs.xml.fdm_material @@ -1,6 +1,6 @@ @@ -10,20 +10,21 @@ Generic PLA profile. Serves as an example file, data in this file is not correct Generic 60636bb4-518f-42e7-8237-fe77b194ebe0 - 0 + 1 #8cb219 - 1.07 + 1.10 2.85 - 250 + 240 80 + 200 - - + + diff --git a/resources/materials/generic_cpe.xml.fdm_material b/resources/materials/generic_cpe.xml.fdm_material index 19a0072de9..1fa878e466 100644 --- a/resources/materials/generic_cpe.xml.fdm_material +++ b/resources/materials/generic_cpe.xml.fdm_material @@ -1,6 +1,6 @@ @@ -10,20 +10,21 @@ Generic PLA profile. Serves as an example file, data in this file is not correct Generic 12f41353-1a33-415e-8b4f-a775a6c70cc6 - 0 + 1 #159499 - 0.94 + 1.27 2.85 250 70 + 175 - - + + diff --git a/resources/materials/generic_pla.xml.fdm_material b/resources/materials/generic_pla.xml.fdm_material index 9d60be93fe..a98e0e469c 100644 --- a/resources/materials/generic_pla.xml.fdm_material +++ b/resources/materials/generic_pla.xml.fdm_material @@ -10,25 +10,42 @@ Generic PLA profile. Serves as an example file, data in this file is not correct Generic 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 - 0 + 1 #ffc924 - 1.3 + 1.24 2.85 - 210 + 200 60 + 175 - - + + + + + + + + 150 + + + + + + + + + 150 + diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index ab00a33cac..b60a593629 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -213,7 +213,7 @@ Item id: adhesionHelperLabel anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.verticalCenter: brimCheckBox.verticalCenter + anchors.verticalCenter: adhesionCheckBox.verticalCenter width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width //: Bed adhesion label text: catalog.i18nc("@label", "Helper Parts:"); @@ -222,33 +222,45 @@ Item } CheckBox{ - id: brimCheckBox - property alias _hovered: brimMouseArea.containsMouse + id: adhesionCheckBox + property alias _hovered: adhesionMouseArea.containsMouse anchors.top: parent.top anchors.left: adhesionHelperLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width - //: Setting enable skirt adhesion checkbox - text: catalog.i18nc("@option:check", "Print Brim"); + //: Setting enable printing build-plate adhesion helper checkbox + text: catalog.i18nc("@option:check", "Print Build Plate Adhesion"); style: UM.Theme.styles.checkbox; enabled: base.settingsEnabled - checked: platformAdhesionType.properties.value == "brim" + checked: platformAdhesionType.properties.value != "skirt" MouseArea { - id: brimMouseArea + id: adhesionMouseArea anchors.fill: parent hoverEnabled: true enabled: base.settingsEnabled onClicked: { - platformAdhesionType.setPropertyValue("value", !parent.checked ? "brim" : "skirt") + var adhesionType = "skirt"; + if(!parent.checked) + { + // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft + platformAdhesionType.removeFromContainer(0); + adhesionType = platformAdhesionType.properties.value; + if(adhesionType == "skirt") + { + // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim + adhesionType = "brim"; + } + } + platformAdhesionType.setPropertyValue("value", adhesionType); } onEntered: { - base.showTooltip(brimCheckBox, Qt.point(-brimCheckBox.x, 0), - catalog.i18nc("@label", "Enable printing a brim. This will add a single-layer-thick flat area around your object which is easy to cut off afterwards.")); + base.showTooltip(adhesionCheckBox, Qt.point(-adhesionCheckBox.x, 0), + catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); } onExited: { @@ -274,7 +286,7 @@ Item visible: machineExtruderCount.properties.value <= 1 property alias _hovered: supportMouseArea.containsMouse - anchors.top: brimCheckBox.bottom + anchors.top: adhesionCheckBox.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.left: supportHelperLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width @@ -311,7 +323,7 @@ Item visible: machineExtruderCount.properties.value > 1 model: extruderModel - anchors.top: brimCheckBox.bottom + anchors.top: adhesionCheckBox.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.left: supportHelperLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width