From 1807f77df47a16a01eae0215afc7f6a5e720446e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 21 Oct 2016 17:01:55 +0200 Subject: [PATCH 1/6] JSON feat: wall_0_wipe_dist (CURA-1698) --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index dfca058d4e..19b6a5d630 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -741,6 +741,18 @@ } } }, + "wall_0_wipe_dist": + { + "label": "Outer Wall Wipe Distance", + "description": "Distance of a travel move inserted after the outer wall, to hide the Z seam better.", + "unit": "mm", + "type": "float", + "default_value": 0.2, + "value": "machine_nozzle_size / 2", + "minimum_value": "0", + "maximum_value_warning": "machine_nozzle_size", + "settable_per_mesh": true + }, "top_bottom_thickness": { "label": "Top/Bottom Thickness", From 8fb52d86e4636256327bc641c4bb751d18b433cb Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 21 Oct 2016 18:21:38 +0200 Subject: [PATCH 2/6] JSOn feat: material_bed_temperature_layer_0 (CURA-2781) --- resources/definitions/fdmprinter.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index abe6a3e378..6c9304df75 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1181,6 +1181,22 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "material_bed_temperature_layer_0": + { + "label": "Build Plate Temperature Initial Layer", + "description": "The temperature used for the heated build plate at the first layer.", + "unit": "°C", + "type": "float", + "resolve": "max(extruderValues('material_bed_temperature_layer_0'))", + "default_value": 60, + "minimum_value": "-273.15", + "minimum_value_warning": "0", + "maximum_value_warning": "260", + "enabled": "machine_heated_bed", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "material_diameter": { "label": "Diameter", From a58c2470167b76dff7400da0742c0563d9f9fd0e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Sat, 22 Oct 2016 14:27:56 +0200 Subject: [PATCH 3/6] JSOn feat: material_print_temperature_layer_0 (CURA-2736) --- resources/definitions/fdmprinter.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6c9304df75..babf61597f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1139,6 +1139,21 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "material_print_temperature_layer_0": + { + "label": "Printing Temperature Initial Layer", + "description": "The temperature used for printing the first layer. Set at 0 to disable special handling of the initial layer.", + "unit": "°C", + "type": "float", + "default_value": 215, + "value": "material_print_temperature + 5", + "minimum_value": "-273.15", + "minimum_value_warning": "0", + "maximum_value_warning": "260", + "enabled": "not (material_flow_dependent_temperature)", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "material_flow_temp_graph": { "label": "Flow Temperature Graph", From c43098053660bae17daca46c1cd43afeb86820d8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 21 Oct 2016 17:01:55 +0200 Subject: [PATCH 4/6] JSON feat: wall_0_wipe_dist (CURA-1698) --- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e3b75d3813..a065e426bb 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -756,6 +756,18 @@ } } }, + "wall_0_wipe_dist": + { + "label": "Outer Wall Wipe Distance", + "description": "Distance of a travel move inserted after the outer wall, to hide the Z seam better.", + "unit": "mm", + "type": "float", + "default_value": 0.2, + "value": "machine_nozzle_size / 2", + "minimum_value": "0", + "maximum_value_warning": "machine_nozzle_size", + "settable_per_mesh": true + }, "top_bottom_thickness": { "label": "Top/Bottom Thickness", From 5490d9cce985a529de7228ed24205fc38cde6fae Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 7 Nov 2016 11:53:49 +0100 Subject: [PATCH 5/6] JSON fix: introduce command line settigns in machine json file (CURA-566) --- resources/definitions/fdmprinter.def.json | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1c4a0dd6bc..00b755bf7d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4399,6 +4399,49 @@ "settable_per_meshgroup": false } } + }, + "command_line_settings": { + "label": "Command Line Settings", + "description": "Settings which are only used if CuraEngine isn't called from the Cura frontend.", + "type": "category", + "enabled": false, + "children": { + "center_object": { + "description": "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved.", + "type": "bool", + "label": "Center object", + "default_value": true, + "enabled": false + }, + "mesh_position_x": { + "description": "Offset applied to the object in the x direction.", + "type": "float", + "label": "Mesh position x", + "default_value": 0, + "enabled": false + }, + "mesh_position_y": { + "description": "Offset applied to the object in the y direction.", + "type": "float", + "label": "Mesh position y", + "default_value": 0, + "enabled": false + }, + "mesh_position_z": { + "description": "Offset applied to the object in the z direction. With this you can perform what was used to be called 'Object Sink'.", + "type": "float", + "label": "Mesh position z", + "default_value": 0, + "enabled": false + }, + "mesh_rotation_matrix": { + "label": "Mesh Rotation Matrix", + "description": "Transformation matrix to be applied to the model when loading it from file.", + "type": "str", + "default_value": "[[1,0,0], [0,1,0], [0,0,1]]", + "enabled": false + } + } } } } From e51f9ba678b10b06b9a87329ae3b62e269c4872b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 7 Nov 2016 11:54:20 +0100 Subject: [PATCH 6/6] fix: exclude command line settings from being viewed in the frontend (CURA-566) --- cura/CuraApplication.py | 2 +- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 2 +- resources/qml/Preferences/SettingVisibilityPage.qml | 2 +- resources/qml/Settings/SettingView.qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index d5f90f6846..59e5a15f71 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -258,7 +258,7 @@ class CuraApplication(QtApplication): Preferences.getInstance().setDefault("general/visible_settings", """ machine_settings - resolution + resolution layer_height shell wall_thickness diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index fa6957a991..82512dd1e6 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -401,7 +401,7 @@ Item { } visibilityHandler: UM.SettingPreferenceVisibilityHandler {} expanded: [ "*" ] - exclude: [ "machine_settings" ] + exclude: [ "machine_settings", "command_line_settings" ] } delegate:Loader { diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index ea4fd0142c..282f366994 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -116,7 +116,7 @@ UM.PreferencesPage id: definitionsModel containerId: Cura.MachineManager.activeDefinitionId showAll: true - exclude: ["machine_settings"] + exclude: ["machine_settings", "command_line_settings"] showAncestors: true expanded: ["*"] visibilityHandler: UM.SettingPreferenceVisibilityHandler { } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 16b5dada72..09a68d1244 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -30,7 +30,7 @@ ScrollView id: definitionsModel; containerId: Cura.MachineManager.activeDefinitionId visibilityHandler: UM.SettingPreferenceVisibilityHandler { } - exclude: ["machine_settings", "infill_mesh", "infill_mesh_order"] + exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order"] # TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false. expanded: Printer.expandedCategories onExpandedChanged: Printer.setExpandedCategories(expanded) onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate()