From c3ae924ae5a4ba575ee9d1c9e0390dfebf280c68 Mon Sep 17 00:00:00 2001 From: innovo3d Date: Wed, 24 Aug 2016 18:48:11 -0500 Subject: [PATCH 1/6] Updated innovo_inventor.def.json settings Added M140 to turn off heated bed Changed default extruder temp to 205 Changed print speed defaults Removed infill overlap override Removed machine preferences --- .../definitions/innovo_inventor.def.json | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 7eb03437d7..f19424bb8d 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -56,7 +56,7 @@ "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" + "default_value": "M104 S0 ; turn off extruders\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" }, "layer_height": { "default_value": 0.15 @@ -68,7 +68,7 @@ "default_value": 1.2 }, "material_print_temperature": { - "default_value": 215 + "default_value": 205 }, "material_bed_temperature": { "default_value": 60 @@ -77,10 +77,16 @@ "default_value": 1.75 }, "speed_print": { - "default_value": 60 + "default_value": 50 + }, + "speed_wall_0": { + "default_value": 25 + }, + "speed_wall_x": { + "default_value": 40 }, "speed_infill": { - "default_value": 100 + "default_value": 80 }, "speed_topbottom": { "default_value": 30 @@ -91,13 +97,6 @@ "speed_layer_0": { "default_value": 30.0, "minimum_value": 0.1 - }, - "infill_overlap": { - "default_value": 10.0 } - }, - "machine_preferences": { - "prefered_profile": "Normal Quality", - "prefered_material": "PLA" - } + } } From 2e5ffbfe544d0993dd70f2affa81669ea4e75c54 Mon Sep 17 00:00:00 2001 From: innovo3d Date: Wed, 24 Aug 2016 18:54:37 -0500 Subject: [PATCH 2/6] Another update to Inventor Json file Added speed support interface speed --- resources/definitions/innovo_inventor.def.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index f19424bb8d..dd7e87d446 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -91,6 +91,10 @@ "speed_topbottom": { "default_value": 30 }, + "speed_support_interface": + { + "default_value": 20 + }, "speed_travel": { "default_value": 150 }, From 0799a9e278b7c4f9d01c8f83ea4cf80682263811 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 26 Aug 2016 11:59:19 +0200 Subject: [PATCH 3/6] Move branded materials into a submenu CURA-2194 --- resources/qml/Menus/MaterialMenu.qml | 109 ++++++++++++++++++++++----- 1 file changed, 92 insertions(+), 17 deletions(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index cb90eb721f..32f3a3a42e 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -16,23 +16,7 @@ Menu { model: UM.InstanceContainersModel { - filter: - { - var result = { "type": "material" } - if(Cura.MachineManager.filterMaterialsByMachine) - { - result.definition = Cura.MachineManager.activeDefinitionId - if(Cura.MachineManager.hasVariants) - { - result.variant = Cura.MachineManager.activeVariantId - } - } - else - { - result.definition = "fdmprinter" - } - return result - } + filter: materialFilter("Generic") } MenuItem { @@ -48,10 +32,101 @@ Menu onObjectAdded: menu.insertItem(index, object) onObjectRemoved: menu.removeItem(object) } + MenuSeparator { } + Instantiator + { + model: brandModel + Menu + { + id: brandMenu + title: model.brandName + property string brand: model.brandName + + Instantiator + { + model: UM.InstanceContainersModel + { + filter: materialFilter(brandMenu.brandName) + } + MenuItem + { + text: model.name + checkable: true; + checked: model.id == Cura.MachineManager.activeMaterialId; + exclusiveGroup: group; + onTriggered: + { + Cura.MachineManager.setActiveMaterial(model.id); + } + } + onObjectAdded: brandMenu.insertItem(index, object) + onObjectRemoved: brandMenu.removeItem(object) + } + } + onObjectAdded: menu.insertItem(index, object) + onObjectRemoved: menu.removeItem(object) + } + + ListModel + { + id: brandModel + Component.onCompleted: populateBrandModel() + } + + //: Model used to populate the brandModel + UM.InstanceContainersModel + { + id: materialsModel + filter: materialFilter() + onDataChanged: populateBrandModel() + } ExclusiveGroup { id: group } MenuSeparator { } MenuItem { action: Cura.Actions.manageMaterials } + + function populateBrandModel() + { + var brands = materialsModel.getUniqueValues("brand") + var material_types = materialsModel.getUniqueValues("material") + brandModel.clear(); + for (var i in brands) + { + if(brands[i] != "Generic") + { + brandModel.append({ + brandName: brands[i], + materials: [] + }) + } + } + } + + function materialFilter(brand, material) + { + var result = { "type": "material" } + if(brand != undefined) + { + result.brand = brand + } + if(material != undefined) + { + result.material = material + } + if(Cura.MachineManager.filterMaterialsByMachine) + { + result.definition = Cura.MachineManager.activeDefinitionId + if(Cura.MachineManager.hasVariants) + { + result.variant = Cura.MachineManager.activeVariantId + } + } + else + { + result.definition = "fdmprinter" + } + return result + } } From e19a7914b1653a29972274498c74fb1399ae5ef0 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 26 Aug 2016 13:21:32 +0200 Subject: [PATCH 4/6] Prevent error when the active printerOutputDevice has no cameraImage --- resources/qml/Cura.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 6ab1b5af52..5ba0c82f00 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -402,7 +402,7 @@ UM.MainWindow anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2 visible: base.monitoringPrint - source: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].cameraImage : "" + source: Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage ? Cura.MachineManager.printerOutputDevices[0].cameraImage : "" } UM.MessageStack From baad88fb6cb2a515887532ca16e2c0dbc2e53519 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 26 Aug 2016 13:22:21 +0200 Subject: [PATCH 5/6] Remove incorrectly copy/pasted code CURA-2199 --- plugins/UltimakerMachineActions/BedLevelMachineAction.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml index 7f35637516..61f1cd1810 100644 --- a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml +++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml @@ -64,8 +64,6 @@ Cura.MachineAction { startBedLevelingButton.visible = false; bedlevelingButton.visible = true; - checkupMachineAction.heatupHotendStarted = false; - checkupMachineAction.heatupBedStarted = false; manager.startCheck(); } } From 3b1c11bfcf66bd11071cb8b968a18207b4c94590 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 26 Aug 2016 15:43:50 +0200 Subject: [PATCH 6/6] Put materials into branded material submenus CURA-2194 --- resources/qml/Menus/MaterialMenu.qml | 114 ++++++++++++++++++--------- 1 file changed, 75 insertions(+), 39 deletions(-) diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 32f3a3a42e..c764f2cd9d 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -39,24 +39,38 @@ Menu Menu { id: brandMenu - title: model.brandName - property string brand: model.brandName + title: brandName + property string brandName: model.brandName + property var brandMaterials: model.materials Instantiator { - model: UM.InstanceContainersModel + model: brandMaterials + Menu { - filter: materialFilter(brandMenu.brandName) - } - MenuItem - { - text: model.name - checkable: true; - checked: model.id == Cura.MachineManager.activeMaterialId; - exclusiveGroup: group; - onTriggered: + id: brandMaterialsMenu + title: materialName + property string materialName: model.materialName + + Instantiator { - Cura.MachineManager.setActiveMaterial(model.id); + model: UM.InstanceContainersModel + { + filter: materialFilter(brandMenu.brandName, brandMaterialsMenu.materialName) + } + MenuItem + { + text: model.name + checkable: true; + checked: model.id == Cura.MachineManager.activeMaterialId; + exclusiveGroup: group; + onTriggered: + { + Cura.MachineManager.setActiveMaterial(model.id); + } + } + onObjectAdded: brandMaterialsMenu.insertItem(index, object) + onObjectRemoved: brandMaterialsMenu.removeItem(object) } } onObjectAdded: brandMenu.insertItem(index, object) @@ -87,46 +101,68 @@ Menu MenuItem { action: Cura.Actions.manageMaterials } - function populateBrandModel() - { - var brands = materialsModel.getUniqueValues("brand") - var material_types = materialsModel.getUniqueValues("material") - brandModel.clear(); - for (var i in brands) - { - if(brands[i] != "Generic") - { - brandModel.append({ - brandName: brands[i], - materials: [] - }) - } - } - } - function materialFilter(brand, material) { - var result = { "type": "material" } - if(brand != undefined) + var result = { "type": "material" }; + if(brand) { - result.brand = brand + result.brand = brand; } - if(material != undefined) + if(material) { - result.material = material + result.material = material; } if(Cura.MachineManager.filterMaterialsByMachine) { - result.definition = Cura.MachineManager.activeDefinitionId + result.definition = Cura.MachineManager.activeDefinitionId; if(Cura.MachineManager.hasVariants) { - result.variant = Cura.MachineManager.activeVariantId + result.variant = Cura.MachineManager.activeVariantId; } } else { - result.definition = "fdmprinter" + result.definition = "fdmprinter"; + } + return result; + } + + function populateBrandModel() + { + // Create a structure of unique brands and their material-types + var items = materialsModel.items; + var materialsByBrand = {} + for (var i in items) { + var brandName = items[i]["metadata"]["brand"]; + var materialName = items[i]["metadata"]["material"]; + + if (brandName == "Generic") + { + continue; + } + if (!materialsByBrand.hasOwnProperty(brandName)) + { + materialsByBrand[brandName] = []; + } + if (materialsByBrand[brandName].indexOf(materialName) == -1) + { + materialsByBrand[brandName].push(materialName); + } + } + + brandModel.clear(); + for (var brand in materialsByBrand) + { + var materialsByBrandModel = []; + var materials = materialsByBrand[brand]; + for (var material in materials) + { + materialsByBrandModel.push({materialName: materials[material]}) + } + brandModel.append({ + brandName: brand, + materials: materialsByBrandModel + }); } - return result } }