From 47d299b8c39e975618b522d015bfbc87ed5cb878 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 4 Jan 2016 13:37:01 +0100 Subject: [PATCH 01/18] Add material profile selection to sidebar --- resources/qml/SidebarHeader.qml | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index f422573bb2..17b9d9bd68 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -146,4 +146,57 @@ Item } } } + + Rectangle { + id: materialSelectionRow + anchors.top: variantRow.bottom + anchors.topMargin: UM.MachineManager.hasMaterials ? UM.Theme.sizes.default_margin.height : 0 + width: base.width + height: UM.MachineManager.hasMaterials ? UM.Theme.sizes.sidebar_setup.height : 0 + visible: UM.MachineManager.hasMaterials + + Label{ + id: materialSelectionLabel + text: catalog.i18nc("@label","Material:"); + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width; + anchors.verticalCenter: parent.verticalCenter + width: parent.width/100*45 + font: UM.Theme.fonts.default; + color: UM.Theme.colors.text; + } + + ToolButton { + id: materialSelection + text: UM.MachineManager.activeMaterial + width: parent.width/100*55 + height: UM.Theme.sizes.setting_control.height + tooltip: UM.MachineManager.activeMaterial; + anchors.right: parent.right + anchors.rightMargin: UM.Theme.sizes.default_margin.width + anchors.verticalCenter: parent.verticalCenter + style: UM.Theme.styles.sidebar_header_button + + menu: Menu + { + id: materialSelectionMenu + Instantiator + { + model: UM.MaterialsModel { id: materialsModel } + MenuItem + { + text: model.name; + checkable: true; + checked: model.active; + exclusiveGroup: materialSelectionMenuGroup; + onTriggered: UM.MachineManager.setActiveMaterial(materialsModel.getItem(index).name) + } + onObjectAdded: materialSelectionMenu.insertItem(index, object) + onObjectRemoved: materialSelectionMenu.removeItem(object) + } + + ExclusiveGroup { id: materialSelectionMenuGroup; } + } + } + } } From faefbb6b8e223d858490bbe50e01f5b786318af4 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 4 Jan 2016 14:45:01 +0100 Subject: [PATCH 02/18] Rename materials model to MachineMaterialsModel --- resources/qml/SidebarHeader.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 17b9d9bd68..a921e8b002 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -182,14 +182,14 @@ Item id: materialSelectionMenu Instantiator { - model: UM.MaterialsModel { id: materialsModel } + model: UM.MachineMaterialsModel { id: machineMaterialsModel } MenuItem { text: model.name; checkable: true; checked: model.active; exclusiveGroup: materialSelectionMenuGroup; - onTriggered: UM.MachineManager.setActiveMaterial(materialsModel.getItem(index).name) + onTriggered: UM.MachineManager.setActiveMaterial(machineMaterialsModel.getItem(index).name) } onObjectAdded: materialSelectionMenu.insertItem(index, object) onObjectRemoved: materialSelectionMenu.removeItem(object) From 3d85646d074866b1d364d3a0dde63161619b7d99 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 12 Jan 2016 15:44:04 +0100 Subject: [PATCH 03/18] Move general profiles into profiles/general --- resources/profiles/{ => general}/High+Quality.cfg | 0 resources/profiles/{ => general}/Low+Quality.cfg | 0 resources/profiles/{ => general}/Normal+Quality.cfg | 0 resources/profiles/{ => general}/Ulti+Quality.cfg | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename resources/profiles/{ => general}/High+Quality.cfg (100%) rename resources/profiles/{ => general}/Low+Quality.cfg (100%) rename resources/profiles/{ => general}/Normal+Quality.cfg (100%) rename resources/profiles/{ => general}/Ulti+Quality.cfg (100%) diff --git a/resources/profiles/High+Quality.cfg b/resources/profiles/general/High+Quality.cfg similarity index 100% rename from resources/profiles/High+Quality.cfg rename to resources/profiles/general/High+Quality.cfg diff --git a/resources/profiles/Low+Quality.cfg b/resources/profiles/general/Low+Quality.cfg similarity index 100% rename from resources/profiles/Low+Quality.cfg rename to resources/profiles/general/Low+Quality.cfg diff --git a/resources/profiles/Normal+Quality.cfg b/resources/profiles/general/Normal+Quality.cfg similarity index 100% rename from resources/profiles/Normal+Quality.cfg rename to resources/profiles/general/Normal+Quality.cfg diff --git a/resources/profiles/Ulti+Quality.cfg b/resources/profiles/general/Ulti+Quality.cfg similarity index 100% rename from resources/profiles/Ulti+Quality.cfg rename to resources/profiles/general/Ulti+Quality.cfg From ce562713c3bf5951e43448746819fafc2261e8c6 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 12 Jan 2016 16:44:47 +0100 Subject: [PATCH 04/18] Reimport default profiles from 15.04.04 --- resources/profiles/general/High+Quality.cfg | 4 +++- resources/profiles/general/Low+Quality.cfg | 13 ++++++------- resources/profiles/general/Normal+Quality.cfg | 4 ++++ resources/profiles/general/Ulti+Quality.cfg | 7 ++++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/resources/profiles/general/High+Quality.cfg b/resources/profiles/general/High+Quality.cfg index 7561444bbe..8437ae5b2a 100644 --- a/resources/profiles/general/High+Quality.cfg +++ b/resources/profiles/general/High+Quality.cfg @@ -4,5 +4,7 @@ name = High Quality [settings] layer_height = 0.06 -infill_sparse_density = 12 +speed_wall_0 = 30 +speed_topbottom = 15 +speed_infill = 80 diff --git a/resources/profiles/general/Low+Quality.cfg b/resources/profiles/general/Low+Quality.cfg index 96aec9674a..a0ca2e3047 100644 --- a/resources/profiles/general/Low+Quality.cfg +++ b/resources/profiles/general/Low+Quality.cfg @@ -3,13 +3,12 @@ version = 1 name = Low Quality [settings] +infill_sparse_density = 10 layer_height = 0.15 -shell_thickness = 0.8 -infill_sparse_density = 8 -speed_print = 60 +cool_min_layer_time = 3 speed_wall_0 = 40 -speed_wall_x = 50 +speed_wall_x = 80 +speed_infill = 100 +shell_thickness = 1 speed_topbottom = 30 -speed_travel = 150 -speed_layer_0 = 30 -skirt_speed = 30 + diff --git a/resources/profiles/general/Normal+Quality.cfg b/resources/profiles/general/Normal+Quality.cfg index 0ad945af31..eff525ef79 100644 --- a/resources/profiles/general/Normal+Quality.cfg +++ b/resources/profiles/general/Normal+Quality.cfg @@ -3,3 +3,7 @@ version = 1 name = Normal Quality [settings] +speed_wall_0 = 30 +speed_topbottom = 15 +speed_infill = 80 + diff --git a/resources/profiles/general/Ulti+Quality.cfg b/resources/profiles/general/Ulti+Quality.cfg index 589e2cfeee..2cf02f106a 100644 --- a/resources/profiles/general/Ulti+Quality.cfg +++ b/resources/profiles/general/Ulti+Quality.cfg @@ -4,6 +4,7 @@ name = Ulti Quality [settings] layer_height = 0.04 -shell_thickness = 1.6 -top_bottom_thickness = 0.8 -infill_sparse_density = 14 +speed_wall_0 = 30 +speed_topbottom = 15 +speed_infill = 80 + From cbbc6d1a18dea10d2018cd1ad1775e77ed425766 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 13 Jan 2016 15:49:55 +0100 Subject: [PATCH 05/18] Add converted material profiles --- resources/profiles/materials/abs.ini | 12 ++++++++++++ resources/profiles/materials/cpe.ini | 11 +++++++++++ resources/profiles/materials/pla.ini | 6 ++++++ 3 files changed, 29 insertions(+) create mode 100644 resources/profiles/materials/abs.ini create mode 100644 resources/profiles/materials/cpe.ini create mode 100644 resources/profiles/materials/pla.ini diff --git a/resources/profiles/materials/abs.ini b/resources/profiles/materials/abs.ini new file mode 100644 index 0000000000..cb2fb0ca46 --- /dev/null +++ b/resources/profiles/materials/abs.ini @@ -0,0 +1,12 @@ +[general] +version = 1 +type = material +name = ABS + +[profile] +material_bed_temperature = 100 +platform_adhesion = Brim +material_flow = 107 +material_print_temperature = 250 +cool_fan_speed = 50 +cool_fan_speed_max = 50 diff --git a/resources/profiles/materials/cpe.ini b/resources/profiles/materials/cpe.ini new file mode 100644 index 0000000000..5ce75e1b6c --- /dev/null +++ b/resources/profiles/materials/cpe.ini @@ -0,0 +1,11 @@ +[general] +version = 1 +type = material +name = CPE + +[profile] +material_bed_temperature = 60 +platform_adhesion = Brim +material_print_temperature = 250 +cool_fan_speed = 50 +cool_fan_speed_max = 50 diff --git a/resources/profiles/materials/pla.ini b/resources/profiles/materials/pla.ini new file mode 100644 index 0000000000..d1d918d907 --- /dev/null +++ b/resources/profiles/materials/pla.ini @@ -0,0 +1,6 @@ +[general] +version = 1 +type = material +name = PLA + +[profile] From 747f5fbd556bccf08bbae24e3b168e3d90d764f6 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 13 Jan 2016 15:50:40 +0100 Subject: [PATCH 06/18] Add converted UM2+ profiles (variant/material specific) --- .../ultimaker2+/abs_0.25_high.curaprofile | 51 +++++++++++++++++++ .../ultimaker2+/abs_0.4_fast.curaprofile | 51 +++++++++++++++++++ .../ultimaker2+/abs_0.4_high.curaprofile | 51 +++++++++++++++++++ .../ultimaker2+/abs_0.4_normal.curaprofile | 46 +++++++++++++++++ .../ultimaker2+/abs_0.6_normal.curaprofile | 50 ++++++++++++++++++ .../ultimaker2+/abs_0.8_fast.curaprofile | 50 ++++++++++++++++++ .../ultimaker2+/cpe_0.25_high.curaprofile | 50 ++++++++++++++++++ .../ultimaker2+/cpe_0.4_fast.curaprofile | 50 ++++++++++++++++++ .../ultimaker2+/cpe_0.4_high.curaprofile | 50 ++++++++++++++++++ .../ultimaker2+/cpe_0.4_normal.curaprofile | 45 ++++++++++++++++ .../ultimaker2+/cpe_0.6_normal.curaprofile | 49 ++++++++++++++++++ .../ultimaker2+/cpe_0.8_fast.curaprofile | 49 ++++++++++++++++++ .../ultimaker2+/pla_0.25_high.curaprofile | 48 +++++++++++++++++ .../ultimaker2+/pla_0.4_fast.curaprofile | 47 +++++++++++++++++ .../ultimaker2+/pla_0.4_high.curaprofile | 48 +++++++++++++++++ .../ultimaker2+/pla_0.4_normal.curaprofile | 43 ++++++++++++++++ .../ultimaker2+/pla_0.6_normal.curaprofile | 47 +++++++++++++++++ .../ultimaker2+/pla_0.8_fast.curaprofile | 47 +++++++++++++++++ 18 files changed, 872 insertions(+) create mode 100644 resources/profiles/ultimaker2+/abs_0.25_high.curaprofile create mode 100644 resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile create mode 100644 resources/profiles/ultimaker2+/abs_0.4_high.curaprofile create mode 100644 resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile create mode 100644 resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile create mode 100644 resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile create mode 100644 resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile create mode 100644 resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile create mode 100644 resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile create mode 100644 resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile create mode 100644 resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile create mode 100644 resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile create mode 100644 resources/profiles/ultimaker2+/pla_0.25_high.curaprofile create mode 100644 resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile create mode 100644 resources/profiles/ultimaker2+/pla_0.4_high.curaprofile create mode 100644 resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile create mode 100644 resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile create mode 100644 resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile diff --git a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile new file mode 100644 index 0000000000..14905ff307 --- /dev/null +++ b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile @@ -0,0 +1,51 @@ +[general] +version = 1 +name = High Quality +machine_type = Ultimaker 2+ +machine_variant = 0.25mm Nozzle +material = ABS + +[settings] +raft_surface_thickness = 0.27 +raft_base_line_width = 1.0 +raft_margin = 5.0 +cool_min_layer_time = 2 +support_enable = False +retraction_combing = All +cool_min_speed = 25 +brim_line_count = 32 +top_thickness = 0.72 +material_flow = 100.0 +cool_lift_head = True +speed_print = 20 +retraction_hop = 0.0 +machine_nozzle_size = 0.22 +layer_height = 0.06 +speed_wall_0 = 20 +raft_interface_line_spacing = 3.0 +speed_topbottom = 20 +speed_infill = 30 +infill_before_walls = False +retraction_speed = 40.0 +skin_no_small_gaps_heuristic = False +infill_sparse_density = 22 +shell_thickness = 0.88 +cool_fan_speed_max = 100 +raft_airgap = 0.0 +material_bed_temperature = 70 +infill_overlap = 15 +speed_wall_x = 25 +skirt_minimal_length = 150.0 +speed_layer_0 = 20 +bottom_thickness = 0.72 +layer_height_0 = 0.15 +magic_mesh_surface_mode = False +cool_fan_speed_min = 50 +top_bottom_thickness = 0.72 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +adhesion_type = brim +support_pattern = lines +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 + diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile new file mode 100644 index 0000000000..7c42e7bc23 --- /dev/null +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -0,0 +1,51 @@ +[general] +version = 1 +name = Fast Prints +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = ABS + +[settings] +raft_surface_thickness = 0.27 +raft_base_line_width = 1.0 +raft_margin = 5.0 +cool_min_layer_time = 3 +support_enable = False +retraction_combing = All +speed_travel = 150 +cool_min_speed = 20 +brim_line_count = 20 +top_thickness = 0.75 +material_flow = 100.0 +cool_lift_head = True +speed_print = 40 +retraction_hop = 0.0 +machine_nozzle_size = 0.35 +layer_height = 0.15 +speed_wall_0 = 30 +raft_interface_line_spacing = 3.0 +speed_topbottom = 30 +speed_infill = 55 +infill_before_walls = False +retraction_speed = 40.0 +skin_no_small_gaps_heuristic = False +infill_sparse_density = 18 +shell_thickness = 0.7 +cool_fan_speed_max = 100 +raft_airgap = 0.0 +material_bed_temperature = 70 +infill_overlap = 15 +speed_wall_x = 40 +skirt_minimal_length = 150.0 +bottom_thickness = 0.75 +layer_height_0 = 0.26 +magic_mesh_surface_mode = False +cool_fan_speed_min = 50 +top_bottom_thickness = 0.75 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +adhesion_type = brim +support_pattern = lines +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 + diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile new file mode 100644 index 0000000000..a954802028 --- /dev/null +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -0,0 +1,51 @@ +[general] +version = 1 +name = High Quality +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = ABS + +[settings] +raft_surface_thickness = 0.27 +raft_base_line_width = 1.0 +raft_margin = 5.0 +cool_min_layer_time = 3 +support_enable = False +retraction_combing = All +cool_min_speed = 20 +brim_line_count = 20 +top_thickness = 0.72 +material_flow = 100.0 +cool_lift_head = True +speed_print = 30 +retraction_hop = 0.0 +machine_nozzle_size = 0.35 +layer_height = 0.06 +speed_wall_0 = 20 +raft_interface_line_spacing = 3.0 +speed_topbottom = 20 +speed_infill = 45 +infill_before_walls = False +retraction_speed = 40.0 +skin_no_small_gaps_heuristic = False +infill_sparse_density = 22 +shell_thickness = 1.05 +cool_fan_speed_max = 100 +raft_airgap = 0.0 +material_bed_temperature = 70 +infill_overlap = 15 +speed_wall_x = 30 +skirt_minimal_length = 150.0 +speed_layer_0 = 20 +bottom_thickness = 0.72 +layer_height_0 = 0.26 +magic_mesh_surface_mode = False +cool_fan_speed_min = 50 +top_bottom_thickness = 0.72 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +adhesion_type = brim +support_pattern = lines +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 + diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile new file mode 100644 index 0000000000..5524d63788 --- /dev/null +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -0,0 +1,46 @@ +[general] +version = 1 +name = Normal Quality +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = ABS + +[settings] +raft_surface_thickness = 0.27 +raft_base_line_width = 1.0 +raft_margin = 5.0 +support_enable = False +retraction_combing = All +cool_min_speed = 20 +brim_line_count = 20 +material_flow = 100.0 +cool_lift_head = True +speed_print = 30 +retraction_hop = 0.0 +machine_nozzle_size = 0.35 +speed_wall_0 = 20 +raft_interface_line_spacing = 3.0 +speed_topbottom = 20 +speed_infill = 45 +infill_before_walls = False +retraction_speed = 40.0 +skin_no_small_gaps_heuristic = False +shell_thickness = 1.05 +cool_fan_speed_max = 100 +raft_airgap = 0.0 +material_bed_temperature = 70 +infill_overlap = 15 +speed_wall_x = 30 +skirt_minimal_length = 150.0 +speed_layer_0 = 20 +layer_height_0 = 0.26 +magic_mesh_surface_mode = False +cool_fan_speed_min = 50 +cool_min_layer_time = 3 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +adhesion_type = brim +support_pattern = lines +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 + diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile new file mode 100644 index 0000000000..d4d5f17829 --- /dev/null +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -0,0 +1,50 @@ +[general] +version = 1 +name = Normal Quality +machine_type = Ultimaker 2+ +machine_variant = 0.6mm Nozzle +material = ABS + +[settings] +raft_surface_thickness = 0.27 +raft_base_line_width = 1.0 +raft_margin = 5.0 +cool_min_layer_time = 3 +support_enable = False +retraction_combing = All +cool_min_speed = 20 +brim_line_count = 14 +top_thickness = 1.2 +material_flow = 100.0 +cool_lift_head = True +speed_print = 25 +retraction_hop = 0.0 +machine_nozzle_size = 0.53 +layer_height = 0.15 +speed_wall_0 = 20 +raft_interface_line_spacing = 3.0 +speed_topbottom = 20 +speed_infill = 55 +infill_before_walls = False +retraction_speed = 40.0 +skin_no_small_gaps_heuristic = False +shell_thickness = 1.59 +cool_fan_speed_max = 100 +raft_airgap = 0.0 +material_bed_temperature = 70 +infill_overlap = 15 +speed_wall_x = 30 +skirt_minimal_length = 150.0 +speed_layer_0 = 20 +bottom_thickness = 1.2 +layer_height_0 = 0.39 +magic_mesh_surface_mode = False +cool_fan_speed_min = 50 +top_bottom_thickness = 1.2 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +adhesion_type = brim +support_pattern = lines +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 + diff --git a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile new file mode 100644 index 0000000000..1d49f7d9a2 --- /dev/null +++ b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile @@ -0,0 +1,50 @@ +[general] +version = 1 +name = Fast Prints +machine_type = Ultimaker 2+ +machine_variant = 0.8mm Nozzle +material = ABS + +[settings] +raft_surface_thickness = 0.27 +raft_base_line_width = 1.0 +raft_margin = 5.0 +cool_min_layer_time = 3 +support_enable = False +retraction_combing = All +cool_min_speed = 15 +brim_line_count = 10 +top_thickness = 1.2 +material_flow = 100.0 +cool_lift_head = True +speed_print = 20 +retraction_hop = 0.0 +machine_nozzle_size = 0.7 +layer_height = 0.2 +speed_wall_0 = 20 +raft_interface_line_spacing = 3.0 +speed_topbottom = 20 +speed_infill = 40 +infill_before_walls = False +retraction_speed = 40.0 +skin_no_small_gaps_heuristic = False +shell_thickness = 2.1 +cool_fan_speed_max = 100 +raft_airgap = 0.0 +material_bed_temperature = 70 +infill_overlap = 15 +speed_wall_x = 30 +skirt_minimal_length = 150.0 +speed_layer_0 = 20 +bottom_thickness = 1.2 +layer_height_0 = 0.5 +magic_mesh_surface_mode = False +cool_fan_speed_min = 50 +top_bottom_thickness = 1.2 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +adhesion_type = brim +support_pattern = lines +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 + diff --git a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile new file mode 100644 index 0000000000..7db3ef2b3c --- /dev/null +++ b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile @@ -0,0 +1,50 @@ +[general] +version = 1 +name = High Quality +machine_type = Ultimaker 2+ +machine_variant = 0.25mm Nozzle +material = CPE + +[settings] +cool_fan_speed_min = 50 +retraction_hop = 0.0 +support_enable = False +raft_airgap = 0.0 +raft_surface_thickness = 0.27 +raft_interface_line_spacing = 3.0 +skin_no_small_gaps_heuristic = False +bottom_thickness = 0.72 +raft_surface_line_spacing = 3.0 +retraction_combing = All +adhesion_type = brim +cool_min_layer_time = 2 +layer_height = 0.06 +raft_margin = 5.0 +speed_infill = 30 +speed_layer_0 = 20 +brim_line_count = 32 +cool_lift_head = True +retraction_speed = 40.0 +cool_fan_speed_max = 100 +magic_mesh_surface_mode = False +speed_print = 20 +shell_thickness = 0.88 +speed_wall_0 = 20 +material_flow = 100.0 +support_pattern = lines +infill_sparse_density = 22 +raft_interface_line_width = 0.4 +layer_height_0 = 0.15 +material_bed_temperature = 70 +top_thickness = 0.72 +top_bottom_thickness = 0.72 +speed_wall_x = 25 +infill_overlap = 17 +infill_before_walls = False +raft_surface_line_width = 0.4 +skirt_minimal_length = 150.0 +speed_topbottom = 20 +skirt_gap = 3.0 +raft_base_line_width = 1.0 +machine_nozzle_size = 0.22 + diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile new file mode 100644 index 0000000000..a0c763d3f0 --- /dev/null +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -0,0 +1,50 @@ +[general] +version = 1 +name = Fast Prints +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = CPE + +[settings] +cool_fan_speed_min = 50 +retraction_hop = 0.0 +skin_no_small_gaps_heuristic = False +raft_airgap = 0.0 +speed_travel = 150 +raft_surface_thickness = 0.27 +raft_interface_line_spacing = 3.0 +support_enable = False +raft_surface_line_width = 0.4 +raft_surface_line_spacing = 3.0 +retraction_combing = All +adhesion_type = brim +cool_min_layer_time = 3 +layer_height = 0.15 +raft_margin = 5.0 +speed_infill = 45 +bottom_thickness = 0.75 +brim_line_count = 20 +cool_lift_head = True +retraction_speed = 40.0 +cool_fan_speed_max = 100 +magic_mesh_surface_mode = False +speed_print = 30 +shell_thickness = 0.7 +speed_wall_0 = 30 +material_flow = 100.0 +support_pattern = lines +infill_sparse_density = 18 +raft_interface_line_width = 0.4 +layer_height_0 = 0.26 +material_bed_temperature = 70 +top_thickness = 0.75 +top_bottom_thickness = 0.75 +speed_wall_x = 40 +infill_overlap = 17 +infill_before_walls = False +skirt_minimal_length = 150.0 +speed_topbottom = 20 +skirt_gap = 3.0 +raft_base_line_width = 1.0 +machine_nozzle_size = 0.35 + diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile new file mode 100644 index 0000000000..beb2fa6784 --- /dev/null +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -0,0 +1,50 @@ +[general] +version = 1 +name = High Quality +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = CPE + +[settings] +cool_fan_speed_min = 50 +retraction_hop = 0.0 +support_enable = False +raft_airgap = 0.0 +raft_surface_thickness = 0.27 +raft_interface_line_spacing = 3.0 +skin_no_small_gaps_heuristic = False +bottom_thickness = 0.72 +raft_surface_line_spacing = 3.0 +retraction_combing = All +adhesion_type = brim +cool_min_layer_time = 3 +layer_height = 0.06 +raft_margin = 5.0 +speed_infill = 45 +speed_layer_0 = 20 +brim_line_count = 20 +cool_lift_head = True +retraction_speed = 40.0 +cool_fan_speed_max = 100 +magic_mesh_surface_mode = False +speed_print = 20 +shell_thickness = 1.05 +speed_wall_0 = 20 +material_flow = 100.0 +support_pattern = lines +infill_sparse_density = 22 +raft_interface_line_width = 0.4 +layer_height_0 = 0.26 +material_bed_temperature = 70 +top_thickness = 0.72 +top_bottom_thickness = 0.72 +speed_wall_x = 30 +infill_overlap = 15 +infill_before_walls = False +raft_surface_line_width = 0.4 +skirt_minimal_length = 150.0 +speed_topbottom = 20 +skirt_gap = 3.0 +raft_base_line_width = 1.0 +machine_nozzle_size = 0.35 + diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile new file mode 100644 index 0000000000..0f545e30ae --- /dev/null +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -0,0 +1,45 @@ +[general] +version = 1 +name = Normal Quality +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = CPE + +[settings] +retraction_hop = 0.0 +support_enable = False +raft_airgap = 0.0 +raft_surface_thickness = 0.27 +support_pattern = lines +raft_interface_line_spacing = 3.0 +skin_no_small_gaps_heuristic = False +raft_surface_line_width = 0.4 +cool_fan_speed_min = 50 +retraction_combing = All +adhesion_type = brim +cool_min_layer_time = 3 +infill_before_walls = False +speed_layer_0 = 20 +brim_line_count = 20 +cool_lift_head = True +raft_interface_line_width = 0.4 +cool_fan_speed_max = 100 +magic_mesh_surface_mode = False +speed_print = 20 +shell_thickness = 1.05 +speed_wall_0 = 20 +material_flow = 100.0 +raft_surface_line_spacing = 3.0 +raft_margin = 5.0 +retraction_speed = 40.0 +layer_height_0 = 0.26 +material_bed_temperature = 70 +speed_wall_x = 30 +infill_overlap = 15 +speed_infill = 45 +skirt_minimal_length = 150.0 +speed_topbottom = 20 +skirt_gap = 3.0 +raft_base_line_width = 1.0 +machine_nozzle_size = 0.35 + diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile new file mode 100644 index 0000000000..3e6d8a1d40 --- /dev/null +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -0,0 +1,49 @@ +[general] +version = 1 +name = Normal Quality +machine_type = Ultimaker 2+ +machine_variant = 0.6mm Nozzle +material = CPE + +[settings] +cool_fan_speed_min = 50 +retraction_hop = 0.0 +support_enable = False +raft_airgap = 0.0 +raft_surface_thickness = 0.27 +raft_interface_line_spacing = 3.0 +skin_no_small_gaps_heuristic = False +bottom_thickness = 1.2 +support_pattern = lines +retraction_combing = All +adhesion_type = brim +cool_min_layer_time = 3 +layer_height = 0.15 +speed_infill = 40 +speed_layer_0 = 20 +brim_line_count = 14 +cool_lift_head = True +retraction_speed = 40.0 +cool_fan_speed_max = 100 +magic_mesh_surface_mode = False +speed_print = 20 +shell_thickness = 1.59 +speed_wall_0 = 20 +material_flow = 100.0 +raft_surface_line_spacing = 3.0 +raft_margin = 5.0 +raft_interface_line_width = 0.4 +layer_height_0 = 0.39 +material_bed_temperature = 70 +top_thickness = 1.2 +top_bottom_thickness = 1.2 +speed_wall_x = 30 +infill_overlap = 17 +infill_before_walls = False +raft_surface_line_width = 0.4 +skirt_minimal_length = 150.0 +speed_topbottom = 20 +skirt_gap = 3.0 +raft_base_line_width = 1.0 +machine_nozzle_size = 0.53 + diff --git a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile new file mode 100644 index 0000000000..2ef3fed328 --- /dev/null +++ b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile @@ -0,0 +1,49 @@ +[general] +version = 1 +name = Fast Prints +machine_type = Ultimaker 2+ +machine_variant = 0.8mm Nozzle +material = CPE + +[settings] +cool_fan_speed_min = 50 +retraction_hop = 0.0 +support_enable = False +raft_airgap = 0.0 +raft_surface_thickness = 0.27 +raft_interface_line_spacing = 3.0 +skin_no_small_gaps_heuristic = False +bottom_thickness = 1.2 +support_pattern = lines +retraction_combing = All +adhesion_type = brim +cool_min_layer_time = 3 +layer_height = 0.2 +speed_infill = 40 +speed_layer_0 = 20 +brim_line_count = 10 +cool_lift_head = True +retraction_speed = 40.0 +cool_fan_speed_max = 100 +magic_mesh_surface_mode = False +speed_print = 20 +shell_thickness = 2.1 +speed_wall_0 = 20 +material_flow = 100.0 +raft_surface_line_spacing = 3.0 +raft_margin = 5.0 +raft_interface_line_width = 0.4 +layer_height_0 = 0.5 +material_bed_temperature = 70 +top_thickness = 1.2 +top_bottom_thickness = 1.2 +speed_wall_x = 30 +infill_overlap = 17 +infill_before_walls = False +raft_surface_line_width = 0.4 +skirt_minimal_length = 150.0 +speed_topbottom = 20 +skirt_gap = 3.0 +raft_base_line_width = 1.0 +machine_nozzle_size = 0.7 + diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile new file mode 100644 index 0000000000..674f21a9c8 --- /dev/null +++ b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile @@ -0,0 +1,48 @@ +[general] +version = 1 +name = High Quality +machine_type = Ultimaker 2+ +machine_variant = 0.25mm Nozzle +material = PLA + +[settings] +retraction_combing = All +top_thickness = 0.72 +speed_layer_0 = 20 +speed_print = 20 +speed_wall_0 = 20 +raft_interface_line_spacing = 3.0 +shell_thickness = 0.88 +infill_overlap = 15 +retraction_hop = 0.0 +material_bed_temperature = 70 +skin_no_small_gaps_heuristic = False +retraction_speed = 40.0 +raft_surface_line_width = 0.4 +raft_base_line_width = 1.0 +raft_margin = 5.0 +adhesion_type = brim +skirt_minimal_length = 150.0 +layer_height = 0.06 +brim_line_count = 36 +infill_before_walls = False +raft_surface_thickness = 0.27 +raft_airgap = 0.0 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +speed_topbottom = 20 +support_pattern = lines +layer_height_0 = 0.15 +infill_sparse_density = 22 +material_flow = 100.0 +cool_fan_speed_min = 100 +top_bottom_thickness = 0.72 +cool_fan_speed_max = 100 +speed_infill = 30 +magic_mesh_surface_mode = False +bottom_thickness = 0.72 +speed_wall_x = 25 +machine_nozzle_size = 0.22 +raft_surface_line_spacing = 3.0 +support_enable = False + diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile new file mode 100644 index 0000000000..c63b1646e7 --- /dev/null +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -0,0 +1,47 @@ +[general] +version = 1 +name = Fast Prints +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = PLA + +[settings] +retraction_combing = All +top_thickness = 0.75 +speed_print = 40 +speed_wall_0 = 40 +raft_surface_line_spacing = 3.0 +shell_thickness = 0.7 +infill_sparse_density = 18 +retraction_hop = 0.0 +material_bed_temperature = 70 +skin_no_small_gaps_heuristic = False +retraction_speed = 40.0 +raft_surface_line_width = 0.4 +raft_base_line_width = 1.0 +raft_margin = 5.0 +adhesion_type = brim +skirt_minimal_length = 150.0 +layer_height = 0.15 +brim_line_count = 22 +infill_before_walls = False +raft_surface_thickness = 0.27 +raft_airgap = 0.0 +infill_overlap = 15 +raft_interface_line_width = 0.4 +speed_topbottom = 30 +support_pattern = lines +layer_height_0 = 0.26 +raft_interface_line_spacing = 3.0 +material_flow = 100.0 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +speed_travel = 150 +skirt_gap = 3.0 +magic_mesh_surface_mode = False +bottom_thickness = 0.75 +speed_wall_x = 50 +machine_nozzle_size = 0.35 +top_bottom_thickness = 0.75 +support_enable = False + diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile new file mode 100644 index 0000000000..c2ebb02c0d --- /dev/null +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -0,0 +1,48 @@ +[general] +version = 1 +name = High Quality +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = PLA + +[settings] +retraction_combing = All +top_thickness = 0.72 +speed_layer_0 = 20 +speed_print = 30 +speed_wall_0 = 30 +raft_interface_line_spacing = 3.0 +shell_thickness = 1.05 +infill_overlap = 15 +retraction_hop = 0.0 +material_bed_temperature = 70 +skin_no_small_gaps_heuristic = False +retraction_speed = 40.0 +raft_surface_line_width = 0.4 +raft_base_line_width = 1.0 +raft_margin = 5.0 +adhesion_type = brim +skirt_minimal_length = 150.0 +layer_height = 0.06 +brim_line_count = 22 +infill_before_walls = False +raft_surface_thickness = 0.27 +raft_airgap = 0.0 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +speed_topbottom = 20 +support_pattern = lines +layer_height_0 = 0.26 +infill_sparse_density = 22 +material_flow = 100.0 +cool_fan_speed_min = 100 +top_bottom_thickness = 0.72 +cool_fan_speed_max = 100 +speed_infill = 50 +magic_mesh_surface_mode = False +bottom_thickness = 0.72 +speed_wall_x = 40 +machine_nozzle_size = 0.35 +raft_surface_line_spacing = 3.0 +support_enable = False + diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile new file mode 100644 index 0000000000..06547cbacd --- /dev/null +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -0,0 +1,43 @@ +[general] +version = 1 +name = Normal Quality +machine_type = Ultimaker 2+ +machine_variant = 0.4mm Nozzle +material = PLA + +[settings] +retraction_combing = All +shell_thickness = 1.05 +speed_print = 30 +speed_wall_0 = 30 +raft_interface_line_spacing = 3.0 +speed_layer_0 = 20 +layer_height_0 = 0.26 +retraction_hop = 0.0 +material_bed_temperature = 70 +skirt_gap = 3.0 +retraction_speed = 40.0 +raft_surface_line_width = 0.4 +raft_base_line_width = 1.0 +raft_margin = 5.0 +adhesion_type = brim +skirt_minimal_length = 150.0 +brim_line_count = 22 +infill_before_walls = False +raft_surface_thickness = 0.27 +raft_airgap = 0.0 +infill_overlap = 15 +raft_interface_line_width = 0.4 +speed_topbottom = 20 +support_pattern = lines +speed_infill = 50 +material_flow = 100.0 +cool_fan_speed_min = 100 +cool_fan_speed_max = 100 +skin_no_small_gaps_heuristic = False +magic_mesh_surface_mode = False +speed_wall_x = 40 +machine_nozzle_size = 0.35 +raft_surface_line_spacing = 3.0 +support_enable = False + diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile new file mode 100644 index 0000000000..534752709b --- /dev/null +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -0,0 +1,47 @@ +[general] +version = 1 +name = Normal Quality +machine_type = Ultimaker 2+ +machine_variant = 0.6mm Nozzle +material = PLA + +[settings] +retraction_combing = All +top_thickness = 1.2 +speed_layer_0 = 20 +speed_print = 25 +speed_wall_0 = 25 +raft_interface_line_spacing = 3.0 +shell_thickness = 1.59 +infill_overlap = 15 +retraction_hop = 0.0 +material_bed_temperature = 70 +skin_no_small_gaps_heuristic = False +retraction_speed = 40.0 +raft_surface_line_width = 0.4 +raft_base_line_width = 1.0 +raft_margin = 5.0 +adhesion_type = brim +skirt_minimal_length = 150.0 +layer_height = 0.15 +brim_line_count = 15 +infill_before_walls = False +raft_surface_thickness = 0.27 +raft_airgap = 0.0 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +speed_topbottom = 20 +support_pattern = lines +layer_height_0 = 0.39 +material_flow = 100.0 +cool_fan_speed_min = 100 +top_bottom_thickness = 1.2 +cool_fan_speed_max = 100 +speed_infill = 55 +magic_mesh_surface_mode = False +bottom_thickness = 1.2 +speed_wall_x = 40 +machine_nozzle_size = 0.53 +raft_surface_line_spacing = 3.0 +support_enable = False + diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile new file mode 100644 index 0000000000..dea13bf2ce --- /dev/null +++ b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile @@ -0,0 +1,47 @@ +[general] +version = 1 +name = Fast Prints +machine_type = Ultimaker 2+ +machine_variant = 0.8mm Nozzle +material = PLA + +[settings] +retraction_combing = All +top_thickness = 1.2 +speed_layer_0 = 20 +speed_print = 20 +speed_wall_0 = 25 +raft_interface_line_spacing = 3.0 +shell_thickness = 2.1 +infill_overlap = 15 +retraction_hop = 0.0 +material_bed_temperature = 70 +skin_no_small_gaps_heuristic = False +retraction_speed = 40.0 +raft_surface_line_width = 0.4 +raft_base_line_width = 1.0 +raft_margin = 5.0 +adhesion_type = brim +skirt_minimal_length = 150.0 +layer_height = 0.2 +brim_line_count = 11 +infill_before_walls = False +raft_surface_thickness = 0.27 +raft_airgap = 0.0 +skirt_gap = 3.0 +raft_interface_line_width = 0.4 +speed_topbottom = 20 +support_pattern = lines +layer_height_0 = 0.5 +material_flow = 100.0 +cool_fan_speed_min = 100 +top_bottom_thickness = 1.2 +cool_fan_speed_max = 100 +speed_infill = 40 +magic_mesh_surface_mode = False +bottom_thickness = 1.2 +speed_wall_x = 30 +machine_nozzle_size = 0.7 +raft_surface_line_spacing = 3.0 +support_enable = False + From 9bd13cf9a7068777f2932e8223561d22b69b5073 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 18 Jan 2016 14:51:28 +0100 Subject: [PATCH 07/18] Add JARJAR machine definitions from cura-private-data --- resources/machines/ultimaker2plus.json | 7 ++----- resources/machines/ultimaker2plus_025.json | 6 ++---- resources/machines/ultimaker2plus_040.json | 6 ++---- resources/machines/ultimaker2plus_060.json | 6 ++---- resources/machines/ultimaker2plus_080.json | 6 ++---- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index 99abcccc47..2526261a3c 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -10,15 +10,12 @@ "inherits": "ultimaker2.json", - "machine_settings": { + "overrides": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, "machine_height": { "default": 200 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 } - }, - - "overrides": { + "gantry_height": { "default": 50 }, "shell_thickness": { "default": 1.2 }, "top_bottom_thickness": { "inherit_function": "(parent_value / 3) * 2" }, "travel_compensate_overlapping_walls_enabled": { "default": true }, diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json index fa3e76b7e9..3e59ac86dc 100644 --- a/resources/machines/ultimaker2plus_025.json +++ b/resources/machines/ultimaker2plus_025.json @@ -11,11 +11,9 @@ "variant": "0.25mm Nozzle", - "machine_settings": { - "machine_nozzle_size": { "default": 0.25 } - }, - "overrides": { + "machine_nozzle_size": { "default": 0.25 }, + "layer_height": { "default": 0.06 }, "layer_height_0": { "default": 0.15 }, diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json index 36853be5ff..452559591b 100644 --- a/resources/machines/ultimaker2plus_040.json +++ b/resources/machines/ultimaker2plus_040.json @@ -11,11 +11,9 @@ "variant": "0.40mm Nozzle", - "machine_settings": { - "machine_nozzle_size": { "default": 0.40 } - }, - "overrides": { + "machine_nozzle_size": { "default": 0.40 }, + "wall_line_width_0": { "inherit_function": "parent_value * 0.875" }, "skin_line_width": { "inherit_function": "parent_value * 0.875" } } diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json index d047d565ee..0bfab6aecd 100644 --- a/resources/machines/ultimaker2plus_060.json +++ b/resources/machines/ultimaker2plus_060.json @@ -11,11 +11,9 @@ "variant": "0.60mm Nozzle", - "machine_settings": { - "machine_nozzle_size": { "default": 0.60 } - }, - "overrides": { + "machine_nozzle_size": { "default": 0.60 }, + "layer_height": { "default": 0.15 }, "layer_height_0": { "default": 0.4 }, diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json index 2ac52e3a3f..b0f6376e9d 100644 --- a/resources/machines/ultimaker2plus_080.json +++ b/resources/machines/ultimaker2plus_080.json @@ -11,11 +11,9 @@ "variant": "0.80mm Nozzle", - "machine_settings": { - "machine_nozzle_size": { "default": 0.80 } - }, - "overrides": { + "machine_nozzle_size": { "default": 0.80 }, + "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.5 }, From bfa45245cc65c619b80b8966f3e7163af39d1138 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 18 Jan 2016 17:15:41 +0100 Subject: [PATCH 08/18] machine_type is a reference to the id, not the name --- resources/profiles/ultimaker2+/abs_0.25_high.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.25_high.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile index 14905ff307..8b1285edbe 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = High Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.25mm Nozzle material = ABS diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index 7c42e7bc23..edceecb6eb 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Fast Prints -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = ABS diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index a954802028..63eff46857 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = High Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = ABS diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index 5524d63788..c7c7464400 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Normal Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = ABS diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile index d4d5f17829..0f6372adae 100644 --- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Normal Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.6mm Nozzle material = ABS diff --git a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile index 1d49f7d9a2..4b28e8d3c1 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Fast Prints -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.8mm Nozzle material = ABS diff --git a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile index 7db3ef2b3c..f4627dcca5 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = High Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.25mm Nozzle material = CPE diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index a0c763d3f0..0aa1fce5b6 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Fast Prints -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = CPE diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index beb2fa6784..fa98b33f12 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = High Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = CPE diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index 0f545e30ae..d314011f1d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Normal Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = CPE diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index 3e6d8a1d40..aeeb753473 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Normal Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.6mm Nozzle material = CPE diff --git a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile index 2ef3fed328..a2cbd4f25f 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Fast Prints -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.8mm Nozzle material = CPE diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile index 674f21a9c8..d1f108edbb 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = High Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.25mm Nozzle material = PLA diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index c63b1646e7..7f4ddcec47 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Fast Prints -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = PLA diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index c2ebb02c0d..fc2c68d965 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = High Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = PLA diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 06547cbacd..5575a5e6ef 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Normal Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.4mm Nozzle material = PLA diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 534752709b..cf502a8486 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Normal Quality -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.6mm Nozzle material = PLA diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile index dea13bf2ce..03b28cacc3 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile @@ -1,7 +1,7 @@ [general] version = 1 name = Fast Prints -machine_type = Ultimaker 2+ +machine_type = ultimaker2plus machine_variant = 0.8mm Nozzle material = PLA From f97e2fa6aaf0ff8915f8ee1380912a48e3083865 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 18 Jan 2016 21:56:21 +0100 Subject: [PATCH 09/18] Prepare "Add profile" dialog --- resources/qml/Actions.qml | 7 ++++++ resources/qml/AddProfileDialog.qml | 36 ++++++++++++++++++++++++++++++ resources/qml/Cura.qml | 12 ++++++++++ resources/qml/ProfileSetup.qml | 30 ++++--------------------- resources/qml/Sidebar.qml | 2 ++ 5 files changed, 61 insertions(+), 26 deletions(-) create mode 100644 resources/qml/AddProfileDialog.qml diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 64e9b3b1a2..3f7098cadb 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -31,6 +31,7 @@ Item property alias addMachine: addMachineAction; property alias configureMachines: settingsAction; + property alias addProfile: addProfileAction; property alias manageProfiles: manageProfilesAction; property alias preferences: preferencesAction; @@ -95,6 +96,12 @@ Item iconName: "configure"; } + Action + { + id: addProfileAction; + text: catalog.i18nc("@action:inmenu menubar:profile","&Add Profile..."); + } + Action { id: manageProfilesAction; diff --git a/resources/qml/AddProfileDialog.qml b/resources/qml/AddProfileDialog.qml new file mode 100644 index 0000000000..17e7790a1d --- /dev/null +++ b/resources/qml/AddProfileDialog.qml @@ -0,0 +1,36 @@ +// Copyright (c) 2015 Ultimaker B.V. +// Cura is released under the terms of the AGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 1.1 +import QtQuick.Window 2.1 + +import UM 1.1 as UM + +UM.Dialog +{ + id: base + + //: About dialog title + title: catalog.i18nc("@title:window","Add profile") + width: 400 + height: childrenRect.height + + rightButtons: Row + { + spacing: UM.Theme.sizes.default_margin.width + + Button + { + text: catalog.i18nc("@action:button","Add"); + isDefault: true + } + Button + { + text: catalog.i18nc("@action:button","Cancel"); + + onClicked: base.visible = false; + } + } +} + diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index b8db22eee4..7e8cb30fe9 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -230,6 +230,7 @@ UM.MainWindow MenuSeparator { } + MenuItem { action: actions.addProfile; } MenuItem { action: actions.manageProfiles; } } @@ -461,6 +462,7 @@ UM.MainWindow addMachineAction: actions.addMachine; configureMachinesAction: actions.configureMachines; + addProfileAction: actions.addProfile; manageProfilesAction: actions.manageProfiles; } @@ -578,6 +580,7 @@ UM.MainWindow reloadAll.onTriggered: Printer.reloadAll() addMachine.onTriggered: addMachineWizard.visible = true; + addProfile.onTriggered: addProfileDialog.visible = true; preferences.onTriggered: { preferences.visible = true; preferences.setPage(0); } configureMachines.onTriggered: { preferences.visible = true; preferences.setPage(3); } @@ -670,6 +673,15 @@ UM.MainWindow id: addMachineWizard } + AddProfileDialog + { + id: addProfileDialog + } + + LoadProfileDialog + { + id: loadProfileDialog + } AboutDialog { diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml index 3757d64773..52e9bc0827 100644 --- a/resources/qml/ProfileSetup.qml +++ b/resources/qml/ProfileSetup.qml @@ -13,6 +13,7 @@ Item{ UM.I18nCatalog { id: catalog; name:"cura"} property int totalHeightProfileSetup: childrenRect.height property Action manageProfilesAction + property Action addProfileAction Rectangle{ id: globalProfileRow @@ -63,36 +64,13 @@ Item{ ExclusiveGroup { id: profileSelectionMenuGroup; } MenuSeparator { } + MenuItem { + action: base.addProfileAction; + } MenuItem { action: base.manageProfilesAction; - } } -// Button { -// id: saveProfileButton -// visible: true -// anchors.top: parent.top -// x: globalProfileSelection.width + 2 -// width: parent.width/100*25 -// text: catalog.i18nc("@action:button", "Save"); -// height: parent.height -// -// style: ButtonStyle { -// background: Rectangle { -// color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button -// Behavior on color { ColorAnimation { duration: 50; } } -// width: actualLabel.width + UM.Theme.sizes.default_margin.width -// Label { -// id: actualLabel -// anchors.centerIn: parent -// color: UM.Theme.colors.load_save_button_text -// font: UM.Theme.fonts.default -// text: control.text; -// } -// } -// label: Item { } -// } -// } } } } diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 46fb34b3c4..ac511a4df8 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -14,6 +14,7 @@ Rectangle property Action addMachineAction; property Action configureMachinesAction; + property Action addProfileAction; property Action manageProfilesAction; property int currentModeIndex; @@ -63,6 +64,7 @@ Rectangle ProfileSetup { id: profileItem + addProfileAction: base.addProfileAction manageProfilesAction: base.manageProfilesAction anchors.top: settingsModeSelection.bottom anchors.topMargin: UM.Theme.sizes.default_margin.height From 277dd717594ddba119ea709cfb3681394fbeb079 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 19 Jan 2016 11:00:48 +0100 Subject: [PATCH 10/18] Align variant naming in profiles and machine definitions --- resources/machines/ultimaker2plus_025.json | 2 +- resources/machines/ultimaker2plus_040.json | 2 +- resources/machines/ultimaker2plus_060.json | 2 +- resources/machines/ultimaker2plus_080.json | 2 +- resources/profiles/ultimaker2+/abs_0.25_high.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.25_high.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json index 3e59ac86dc..3e35b7b5c2 100644 --- a/resources/machines/ultimaker2plus_025.json +++ b/resources/machines/ultimaker2plus_025.json @@ -9,7 +9,7 @@ "inherits": "ultimaker2plus.json", - "variant": "0.25mm Nozzle", + "variant": "0.25 mm", "overrides": { "machine_nozzle_size": { "default": 0.25 }, diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json index 452559591b..30b4b8ad58 100644 --- a/resources/machines/ultimaker2plus_040.json +++ b/resources/machines/ultimaker2plus_040.json @@ -9,7 +9,7 @@ "inherits": "ultimaker2plus.json", - "variant": "0.40mm Nozzle", + "variant": "0.4 mm", "overrides": { "machine_nozzle_size": { "default": 0.40 }, diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json index 0bfab6aecd..fe3c4ee513 100644 --- a/resources/machines/ultimaker2plus_060.json +++ b/resources/machines/ultimaker2plus_060.json @@ -9,7 +9,7 @@ "inherits": "ultimaker2plus.json", - "variant": "0.60mm Nozzle", + "variant": "0.6 mm", "overrides": { "machine_nozzle_size": { "default": 0.60 }, diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json index b0f6376e9d..5df120b7f0 100644 --- a/resources/machines/ultimaker2plus_080.json +++ b/resources/machines/ultimaker2plus_080.json @@ -9,7 +9,7 @@ "inherits": "ultimaker2plus.json", - "variant": "0.80mm Nozzle", + "variant": "0.8 mm", "overrides": { "machine_nozzle_size": { "default": 0.80 }, diff --git a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile index 8b1285edbe..fd6b51c059 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile @@ -2,7 +2,7 @@ version = 1 name = High Quality machine_type = ultimaker2plus -machine_variant = 0.25mm Nozzle +machine_variant = 0.25 mm material = ABS [settings] diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index edceecb6eb..8ff2f1be6f 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Fast Prints machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = ABS [settings] diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index 63eff46857..55eae0a8f4 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -2,7 +2,7 @@ version = 1 name = High Quality machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = ABS [settings] diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index c7c7464400..627f22aa61 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = ABS [settings] diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile index 0f6372adae..54904f0e2d 100644 --- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2plus -machine_variant = 0.6mm Nozzle +machine_variant = 0.6 mm material = ABS [settings] diff --git a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile index 4b28e8d3c1..45ac82364b 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Fast Prints machine_type = ultimaker2plus -machine_variant = 0.8mm Nozzle +machine_variant = 0.8 mm material = ABS [settings] diff --git a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile index f4627dcca5..6442cbd5e9 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile @@ -2,7 +2,7 @@ version = 1 name = High Quality machine_type = ultimaker2plus -machine_variant = 0.25mm Nozzle +machine_variant = 0.25 mm material = CPE [settings] diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index 0aa1fce5b6..9b2a4dd901 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Fast Prints machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = CPE [settings] diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index fa98b33f12..0ca6bdca19 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -2,7 +2,7 @@ version = 1 name = High Quality machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = CPE [settings] diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index d314011f1d..340ded170e 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = CPE [settings] diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index aeeb753473..d1b26b64e8 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2plus -machine_variant = 0.6mm Nozzle +machine_variant = 0.6 mm material = CPE [settings] diff --git a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile index a2cbd4f25f..94cb538b63 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Fast Prints machine_type = ultimaker2plus -machine_variant = 0.8mm Nozzle +machine_variant = 0.8 mm material = CPE [settings] diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile index d1f108edbb..db552e3f82 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile @@ -2,7 +2,7 @@ version = 1 name = High Quality machine_type = ultimaker2plus -machine_variant = 0.25mm Nozzle +machine_variant = 0.25 mm material = PLA [settings] diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 7f4ddcec47..b13bfc075f 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Fast Prints machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = PLA [settings] diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index fc2c68d965..baf1848efb 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -2,7 +2,7 @@ version = 1 name = High Quality machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = PLA [settings] diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 5575a5e6ef..db5ea4fd44 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2plus -machine_variant = 0.4mm Nozzle +machine_variant = 0.4 mm material = PLA [settings] diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index cf502a8486..09d1061880 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2plus -machine_variant = 0.6mm Nozzle +machine_variant = 0.6 mm material = PLA [settings] diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile index 03b28cacc3..a3d4242072 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile @@ -2,7 +2,7 @@ version = 1 name = Fast Prints machine_type = ultimaker2plus -machine_variant = 0.8mm Nozzle +machine_variant = 0.8 mm material = PLA [settings] From a53b898670e6b6379d781595a1736f6354946896 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sun, 24 Jan 2016 15:55:07 +0100 Subject: [PATCH 11/18] Rename [profile] to [settings] in material profiles --- resources/profiles/materials/abs.ini | 2 +- resources/profiles/materials/cpe.ini | 2 +- resources/profiles/materials/pla.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/profiles/materials/abs.ini b/resources/profiles/materials/abs.ini index cb2fb0ca46..2ec46947a0 100644 --- a/resources/profiles/materials/abs.ini +++ b/resources/profiles/materials/abs.ini @@ -3,7 +3,7 @@ version = 1 type = material name = ABS -[profile] +[settings] material_bed_temperature = 100 platform_adhesion = Brim material_flow = 107 diff --git a/resources/profiles/materials/cpe.ini b/resources/profiles/materials/cpe.ini index 5ce75e1b6c..02f70d7245 100644 --- a/resources/profiles/materials/cpe.ini +++ b/resources/profiles/materials/cpe.ini @@ -3,7 +3,7 @@ version = 1 type = material name = CPE -[profile] +[settings] material_bed_temperature = 60 platform_adhesion = Brim material_print_temperature = 250 diff --git a/resources/profiles/materials/pla.ini b/resources/profiles/materials/pla.ini index d1d918d907..8aead264d8 100644 --- a/resources/profiles/materials/pla.ini +++ b/resources/profiles/materials/pla.ini @@ -3,4 +3,4 @@ version = 1 type = material name = PLA -[profile] +[settings] From 57046a43e84b1b7d50329d4274fe4cc9780ac063 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sun, 24 Jan 2016 15:56:36 +0100 Subject: [PATCH 12/18] Rename material profiles for consistency --- resources/profiles/materials/{abs.ini => abs.cfg} | 0 resources/profiles/materials/{cpe.ini => cpe.cfg} | 0 resources/profiles/materials/{pla.ini => pla.cfg} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename resources/profiles/materials/{abs.ini => abs.cfg} (100%) rename resources/profiles/materials/{cpe.ini => cpe.cfg} (100%) rename resources/profiles/materials/{pla.ini => pla.cfg} (100%) diff --git a/resources/profiles/materials/abs.ini b/resources/profiles/materials/abs.cfg similarity index 100% rename from resources/profiles/materials/abs.ini rename to resources/profiles/materials/abs.cfg diff --git a/resources/profiles/materials/cpe.ini b/resources/profiles/materials/cpe.cfg similarity index 100% rename from resources/profiles/materials/cpe.ini rename to resources/profiles/materials/cpe.cfg diff --git a/resources/profiles/materials/pla.ini b/resources/profiles/materials/pla.cfg similarity index 100% rename from resources/profiles/materials/pla.ini rename to resources/profiles/materials/pla.cfg From d30f8322baa6b1737d1d1013142a7bc18d212521 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sun, 24 Jan 2016 16:04:42 +0100 Subject: [PATCH 13/18] Make material profiles have values for the same settings --- resources/profiles/materials/cpe.cfg | 1 + resources/profiles/materials/pla.cfg | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/resources/profiles/materials/cpe.cfg b/resources/profiles/materials/cpe.cfg index 02f70d7245..508bd39fcf 100644 --- a/resources/profiles/materials/cpe.cfg +++ b/resources/profiles/materials/cpe.cfg @@ -6,6 +6,7 @@ name = CPE [settings] material_bed_temperature = 60 platform_adhesion = Brim +material_flow = 100 material_print_temperature = 250 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg index 8aead264d8..a8d8c6a400 100644 --- a/resources/profiles/materials/pla.cfg +++ b/resources/profiles/materials/pla.cfg @@ -4,3 +4,9 @@ type = material name = PLA [settings] +material_bed_temperature = 60 +platform_adhesion = Skirt +material_flow = 100 +material_print_temperature = 210 +cool_fan_speed = 100 +cool_fan_speed_max = 100 \ No newline at end of file From 5542073e44247202bba71516504458575237db81 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 27 Jan 2016 16:38:30 +0100 Subject: [PATCH 14/18] Fix error on profile rename --- plugins/AutoSave/AutoSave.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/AutoSave/AutoSave.py b/plugins/AutoSave/AutoSave.py index c7c069decd..b0067513a0 100644 --- a/plugins/AutoSave/AutoSave.py +++ b/plugins/AutoSave/AutoSave.py @@ -19,7 +19,7 @@ class AutoSave(Extension): self._profile = None machine_manager.activeProfileChanged.connect(self._onActiveProfileChanged) - machine_manager.profileNameChanged.connect(self._onProfilesChanged) + machine_manager.profileNameChanged.connect(self._onProfileNameChanged) machine_manager.profilesChanged.connect(self._onProfilesChanged) machine_manager.machineInstanceNameChanged.connect(self._onInstanceNameChanged) machine_manager.machineInstancesChanged.connect(self._onInstancesChanged) @@ -52,6 +52,9 @@ class AutoSave(Extension): if self._profile: self._profile.settingValueChanged.connect(self._onSettingValueChanged) + def _onProfileNameChanged(self, name): + self._onProfilesChanged() + def _onProfilesChanged(self): self._save_profiles = True self._change_timer.start() From 828752af30b9b06a93b2d80eac11d8db8389d92a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 27 Jan 2016 16:39:03 +0100 Subject: [PATCH 15/18] Remove dialogs that were moved to Uranium --- resources/qml/AddProfileDialog.qml | 36 ---------------- resources/qml/Cura.qml | 12 +----- resources/qml/LoadProfileDialog.qml | 64 ----------------------------- 3 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 resources/qml/AddProfileDialog.qml delete mode 100644 resources/qml/LoadProfileDialog.qml diff --git a/resources/qml/AddProfileDialog.qml b/resources/qml/AddProfileDialog.qml deleted file mode 100644 index 17e7790a1d..0000000000 --- a/resources/qml/AddProfileDialog.qml +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2015 Ultimaker B.V. -// Cura is released under the terms of the AGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Window 2.1 - -import UM 1.1 as UM - -UM.Dialog -{ - id: base - - //: About dialog title - title: catalog.i18nc("@title:window","Add profile") - width: 400 - height: childrenRect.height - - rightButtons: Row - { - spacing: UM.Theme.sizes.default_margin.width - - Button - { - text: catalog.i18nc("@action:button","Add"); - isDefault: true - } - Button - { - text: catalog.i18nc("@action:button","Cancel"); - - onClicked: base.visible = false; - } - } -} - diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 7e8cb30fe9..d8f2b4d4ad 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -580,7 +580,7 @@ UM.MainWindow reloadAll.onTriggered: Printer.reloadAll() addMachine.onTriggered: addMachineWizard.visible = true; - addProfile.onTriggered: addProfileDialog.visible = true; + addProfile.onTriggered: { UM.MachineManager.createProfile(); preferences.visible = true; preferences.setPage(4); } preferences.onTriggered: { preferences.visible = true; preferences.setPage(0); } configureMachines.onTriggered: { preferences.visible = true; preferences.setPage(3); } @@ -673,16 +673,6 @@ UM.MainWindow id: addMachineWizard } - AddProfileDialog - { - id: addProfileDialog - } - - LoadProfileDialog - { - id: loadProfileDialog - } - AboutDialog { id: aboutDialog diff --git a/resources/qml/LoadProfileDialog.qml b/resources/qml/LoadProfileDialog.qml deleted file mode 100644 index ab92f02b99..0000000000 --- a/resources/qml/LoadProfileDialog.qml +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2015 Ultimaker B.V. -// Cura is released under the terms of the AGPLv3 or higher. - -import QtQuick 2.2 -import QtQuick.Controls 1.1 -import QtQuick.Window 2.1 - -import UM 1.1 as UM - -UM.Dialog -{ - id: base - - //: About dialog title - title: catalog.i18nc("@title:window","Load profile") - width: 400 - height: childrenRect.height - - Label - { - id: body - - //: About dialog application description - text: catalog.i18nc("@label","Selecting this profile overwrites some of your customised settings. Do you want to merge the new settings into your current profile or do you want to load a clean copy of the profile?") - wrapMode: Text.WordWrap - width: parent.width - anchors.top: parent.top - anchors.margins: UM.Theme.sizes.default_margin.height - - UM.I18nCatalog { id: catalog; name: "cura"; } - } - - Label - { - id: show_details - - //: About dialog application author note - text: catalog.i18nc("@label","Show details.") - wrapMode: Text.WordWrap - anchors.top: body.bottom - anchors.topMargin: UM.Theme.sizes.default_margin.height - } - - rightButtons: Row - { - spacing: UM.Theme.sizes.default_margin.width - - Button - { - text: catalog.i18nc("@action:button","Merge settings"); - } - Button - { - text: catalog.i18nc("@action:button","Reset profile"); - } - Button - { - text: catalog.i18nc("@action:button","Cancel"); - - onClicked: base.visible = false; - } - } -} - From 6e11c2409bee1ef31ac8e04885be5b6f8d3924c7 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 28 Jan 2016 12:23:24 +0100 Subject: [PATCH 16/18] Use working profile instead of "active" profile --- cura/BuildVolume.py | 4 ++-- cura/ConvexHullDecorator.py | 2 +- cura/ConvexHullJob.py | 2 +- cura/CuraApplication.py | 8 ++++---- cura/OneAtATimeIterator.py | 2 +- cura/PrintInformation.py | 2 +- plugins/AutoSave/AutoSave.py | 2 +- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py | 2 +- plugins/GCodeWriter/GCodeWriter.py | 2 +- plugins/SliceInfoPlugin/SliceInfo.py | 2 +- plugins/SolidView/SolidView.py | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index c7d5962c77..e9b90e3a61 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -146,7 +146,7 @@ class BuildVolume(SceneNode): skirt_size = 0.0 - profile = Application.getInstance().getMachineManager().getActiveProfile() + profile = Application.getInstance().getMachineManager().getWorkingProfile() if profile: skirt_size = self._getSkirtSize(profile) @@ -176,7 +176,7 @@ class BuildVolume(SceneNode): if self._active_profile: self._active_profile.settingValueChanged.disconnect(self._onSettingValueChanged) - self._active_profile = Application.getInstance().getMachineManager().getActiveProfile() + self._active_profile = Application.getInstance().getMachineManager().getWorkingProfile() if self._active_profile: self._active_profile.settingValueChanged.connect(self._onSettingValueChanged) self._updateDisallowedAreas() diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index 23e4a4fe95..f791441f1e 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -63,7 +63,7 @@ class ConvexHullDecorator(SceneNodeDecorator): if self._profile: self._profile.settingValueChanged.disconnect(self._onSettingValueChanged) - self._profile = Application.getInstance().getMachineManager().getActiveProfile() + self._profile = Application.getInstance().getMachineManager().getWorkingProfile() if self._profile: self._profile.settingValueChanged.connect(self._onSettingValueChanged) diff --git a/cura/ConvexHullJob.py b/cura/ConvexHullJob.py index 0f69afcaec..fe9a6c279f 100644 --- a/cura/ConvexHullJob.py +++ b/cura/ConvexHullJob.py @@ -49,7 +49,7 @@ class ConvexHullJob(Job): # This is done because of rounding errors. hull = hull.getMinkowskiHull(Polygon(numpy.array([[-1, -1], [-1, 1], [1, 1], [1, -1]], numpy.float32))) - profile = Application.getInstance().getMachineManager().getActiveProfile() + profile = Application.getInstance().getMachineManager().getWorkingProfile() if profile: if profile.getSettingValue("print_sequence") == "one_at_a_time" and not self._node.getParent().callDecoration("isGroup"): # Printing one at a time and it's not an object in a group diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index a496dbac47..996e621c7a 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -502,18 +502,18 @@ class CuraApplication(QtApplication): @pyqtSlot(str, result = "QVariant") def getSettingValue(self, key): - if not self.getMachineManager().getActiveProfile(): + if not self.getMachineManager().getWorkingProfile(): return None - return self.getMachineManager().getActiveProfile().getSettingValue(key) + return self.getMachineManager().getWorkingProfile().getSettingValue(key) #return self.getActiveMachine().getSettingValueByKey(key) ## Change setting by key value pair @pyqtSlot(str, "QVariant") def setSettingValue(self, key, value): - if not self.getMachineManager().getActiveProfile(): + if not self.getMachineManager().getWorkingProfile(): return - self.getMachineManager().getActiveProfile().setSettingValue(key, value) + self.getMachineManager().getWorkingProfile().setSettingValue(key, value) @pyqtSlot() def mergeSelected(self): diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index 449ca87c31..42ec14e6ff 100644 --- a/cura/OneAtATimeIterator.py +++ b/cura/OneAtATimeIterator.py @@ -21,7 +21,7 @@ class OneAtATimeIterator(Iterator.Iterator): if not type(node) is SceneNode: continue - if node.getBoundingBox().height > Application.getInstance().getMachineManager().getActiveProfile().getSettingValue("gantry_height"): + if node.getBoundingBox().height > Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height"): return if node.callDecoration("getConvexHull"): node_list.append(node) diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index 55507fd603..3c404e69a3 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -66,6 +66,6 @@ class PrintInformation(QObject): self.currentPrintTimeChanged.emit() # Material amount is sent as an amount of mm^3, so calculate length from that - r = Application.getInstance().getMachineManager().getActiveProfile().getSettingValue("material_diameter") / 2 + r = Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("material_diameter") / 2 self._material_amount = round((amount / (math.pi * r ** 2)) / 1000, 2) self.materialAmountChanged.emit() diff --git a/plugins/AutoSave/AutoSave.py b/plugins/AutoSave/AutoSave.py index b0067513a0..a631628bba 100644 --- a/plugins/AutoSave/AutoSave.py +++ b/plugins/AutoSave/AutoSave.py @@ -47,7 +47,7 @@ class AutoSave(Extension): if self._profile: self._profile.settingValueChanged.disconnect(self._onSettingValueChanged) - self._profile = Application.getInstance().getMachineManager().getActiveProfile() + self._profile = Application.getInstance().getMachineManager().getWorkingProfile() if self._profile: self._profile.settingValueChanged.connect(self._onSettingValueChanged) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index c005d8da05..47904fd5fe 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -180,7 +180,7 @@ class CuraEngineBackend(Backend): if self._profile: self._profile.settingValueChanged.disconnect(self._onSettingChanged) - self._profile = Application.getInstance().getMachineManager().getActiveProfile() + self._profile = Application.getInstance().getMachineManager().getWorkingProfile() if self._profile: self._profile.settingValueChanged.connect(self._onSettingChanged) self._onChanged() diff --git a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py index 3c0b23c595..acd974797c 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py @@ -44,7 +44,7 @@ class ProcessSlicedObjectListJob(Job): object_id_map[id(node)] = node Job.yieldThread() - settings = Application.getInstance().getMachineManager().getActiveProfile() + settings = Application.getInstance().getMachineManager().getWorkingProfile() center = None if not settings.getSettingValue("machine_center_is_zero"): diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index 3bb986d1bd..28677074cf 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -40,7 +40,7 @@ class GCodeWriter(MeshWriter): if gcode_list: for gcode in gcode_list: stream.write(gcode) - profile = self._serialiseProfile(Application.getInstance().getMachineManager().getActiveProfile()) #Serialise the profile and put them at the end of the file. + profile = self._serialiseProfile(Application.getInstance().getMachineManager().getWorkingProfile()) #Serialise the profile and put them at the end of the file. stream.write(profile) return True diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 20ba21f991..78d0c7cec0 100644 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -44,7 +44,7 @@ class SliceInfo(Extension): def _onWriteStarted(self, output_device): if not Preferences.getInstance().getValue("info/send_slice_info"): return # Do nothing, user does not want to send data - settings = Application.getInstance().getMachineManager().getActiveProfile() + settings = Application.getInstance().getMachineManager().getWorkingProfile() # Load all machine definitions and put them in machine_settings dict #setting_file_name = Application.getInstance().getActiveMachineInstance().getMachineSettings()._json_file diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index 988fe20120..beb2780d14 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -34,8 +34,8 @@ class SolidView(View): self._disabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "overhang.shader")) self._disabled_shader.setUniformValue("u_diffuseColor", [0.68, 0.68, 0.68, 1.0]) - if Application.getInstance().getMachineManager().getActiveProfile(): - profile = Application.getInstance().getMachineManager().getActiveProfile() + if Application.getInstance().getMachineManager().getWorkingProfile(): + profile = Application.getInstance().getMachineManager().getWorkingProfile() if profile.getSettingValue("support_enable") or not Preferences.getInstance().getValue("view/show_overhang"): angle = profile.getSettingValue("support_angle") From 2f022244c1632978507e16b2a34700510cc8967c Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 28 Jan 2016 16:04:52 +0100 Subject: [PATCH 17/18] Edit UM2Extender+ profiles to use UM2+ profiles --- resources/machines/ultimaker2_extended_plus_025.json | 3 ++- resources/machines/ultimaker2_extended_plus_040.json | 3 ++- resources/machines/ultimaker2_extended_plus_060.json | 3 ++- resources/machines/ultimaker2_extended_plus_080.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/machines/ultimaker2_extended_plus_025.json b/resources/machines/ultimaker2_extended_plus_025.json index cfbb169617..dd1d54ba6c 100644 --- a/resources/machines/ultimaker2_extended_plus_025.json +++ b/resources/machines/ultimaker2_extended_plus_025.json @@ -7,7 +7,8 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", "inherits": "ultimaker2_extended_plus.json", - "variant": "0.25mm Nozzle", + "variant": "0.25 mm", + "profiles_machine": "ultimaker2plus", "machine_settings": { "machine_nozzle_size": { "default": 0.25 } } diff --git a/resources/machines/ultimaker2_extended_plus_040.json b/resources/machines/ultimaker2_extended_plus_040.json index 6833f23f36..f2a7da17b6 100644 --- a/resources/machines/ultimaker2_extended_plus_040.json +++ b/resources/machines/ultimaker2_extended_plus_040.json @@ -7,7 +7,8 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", "inherits": "ultimaker2_extended_plus.json", - "variant": "0.40mm Nozzle", + "variant": "0.4 mm", + "profiles_machine": "ultimaker2plus", "machine_settings": { "machine_nozzle_size": { "default": 0.40 } } diff --git a/resources/machines/ultimaker2_extended_plus_060.json b/resources/machines/ultimaker2_extended_plus_060.json index d15272f488..59053ca53d 100644 --- a/resources/machines/ultimaker2_extended_plus_060.json +++ b/resources/machines/ultimaker2_extended_plus_060.json @@ -7,7 +7,8 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", "inherits": "ultimaker2_extended_plus.json", - "variant": "0.60mm Nozzle", + "variant": "0.6 mm", + "profiles_machine": "ultimaker2plus", "machine_settings": { "machine_nozzle_size": { "default": 0.60 } } diff --git a/resources/machines/ultimaker2_extended_plus_080.json b/resources/machines/ultimaker2_extended_plus_080.json index df721c9a53..b7313f6238 100644 --- a/resources/machines/ultimaker2_extended_plus_080.json +++ b/resources/machines/ultimaker2_extended_plus_080.json @@ -7,7 +7,8 @@ "platform": "ultimaker2_platform.obj", "platform_texture": "ultimaker2plus_backplate.png", "inherits": "ultimaker2_extended_plus.json", - "variant": "0.80mm Nozzle", + "variant": "0.8 mm", + "profiles_machine": "ultimaker2plus", "machine_settings": { "machine_nozzle_size": { "default": 0.80 } } From ccf53147b3dd08579aa71e6b85530016837edc73 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 3 Feb 2016 21:39:34 +0100 Subject: [PATCH 18/18] Add margins around infillmodel options, so an infill option is always selected --- resources/qml/SidebarSimple.qml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 7bb932de84..8c1a2d8613 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -162,7 +162,7 @@ Item var density = parseInt(UM.ActiveProfile.settingValues.infill_sparse_density); for(var i = 0; i < infillModel.count; ++i) { - if(infillModel.get(i).percentage == density) + if(density > infillModel.get(i).percentageMin && density <= infillModel.get(i).percentageMax ) { return i; } @@ -235,24 +235,32 @@ Item infillModel.append({ name: catalog.i18nc("@label", "Hollow"), percentage: 0, + percentageMin: -1, + percentageMax: 0, text: catalog.i18nc("@label", "No (0%) infill will leave your model hollow at the cost of low strength"), icon: "hollow" }) infillModel.append({ name: catalog.i18nc("@label", "Light"), percentage: 20, + percentageMin: 0, + percentageMax: 30, text: catalog.i18nc("@label", "Light (20%) infill will give your model an average strength"), icon: "sparse" }) infillModel.append({ name: catalog.i18nc("@label", "Dense"), percentage: 50, + percentageMin: 30, + percentageMax: 70, text: catalog.i18nc("@label", "Dense (50%) infill will give your model an above average strength"), icon: "dense" }) infillModel.append({ name: catalog.i18nc("@label", "Solid"), percentage: 100, + percentageMin: 70, + percentageMax: 100, text: catalog.i18nc("@label", "Solid (100%) infill will make your model completely solid"), icon: "solid" })