GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 02:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework

Browse Source
This commit is contained in:
Ghostkeeper 2016-05-18 10:28:29 +02:00
commit 64c15eb876
15 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/MachineManagerModel.py
View File

@ -76,6 +76,7 @@ class MachineManagerModel(QObject):
current_settings_instance_container = UM.Settings.InstanceContainer(name + "_current_settings")
current_settings_instance_container.addMetaDataEntry("machine", name)
current_settings_instance_container.addMetaDataEntry("type", "user")
current_settings_instance_container.setDefinition(definitions[0])
UM.Settings.ContainerRegistry.getInstance().addContainer(current_settings_instance_container)

1
resources/definitions/bq_hephestos.def.json
View File

@ -4,6 +4,7 @@
"version": 2,
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "BQ",
"manufacturer": "BQ",
"category": "Other",

1
resources/definitions/bq_hephestos_2.def.json
View File

@ -4,6 +4,7 @@
"name": "BQ Hephestos 2",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "BQ",
"manufacturer": "BQ",
"category": "Other",

1
resources/definitions/bq_hephestos_xl.def.json
View File

@ -4,6 +4,7 @@
"name": "BQ Prusa i3 Hephestos XL",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"manufacturer": "BQ",
"author": "BQ",
"category": "Other",

1
resources/definitions/bq_witbox.def.json
View File

@ -4,6 +4,7 @@
"name": "BQ Witbox",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "BQ",
"manufacturer": "BQ",
"category": "Other",

1
resources/definitions/bq_witbox_2.def.json
View File

@ -4,6 +4,7 @@
"name": "BQ Witbox 2",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "BQ",
"manufacturer": "BQ",
"category": "Other",

1
resources/definitions/grr_neo.def.json
View File

@ -4,6 +4,7 @@
"name": "German RepRap Neo",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Simon Cor",
"manufacturer": "German RepRap",
"category": "Other",

3
resources/definitions/innovo_inventor.def.json
View File

@ -4,6 +4,7 @@
"name": "Innovo INVENTOR",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Adam Rumjahn",
"manufacturer": "Innovo",
"category": "Other",
@ -95,7 +96,7 @@
},
"speed_layer_0": {
"default_value": 30.0,
"min_value": 0.1
"minimum_value": 0.1
},
"infill_overlap": {
"default_value": 10.0

7
resources/definitions/m180.def.json
View File

@ -4,6 +4,7 @@
"name": "Malyan M180",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Ruben Dulek",
"manufacturer": "Malyan",
"category": "Other",
@ -25,7 +26,7 @@
},
"machine_nozzle_size": {
"default_value": 0.4,
"min_value": "0.001"
"minimum_value": "0.001"
},
"machine_head_with_fans_polygon": {
"default_value": [
@ -49,8 +50,8 @@
},
"material_diameter": {
"default_value": 1.75,
"min_value_warning": "1.5",
"max_value_warning": "2.0"
"minimum_value_warning": "1.5",
"maximum_value_warning": "2.0"
}
}
}

1
resources/definitions/maker_starter.def.json
View File

@ -4,6 +4,7 @@
"name": "3DMaker Starter",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "tvlgiao",
"manufacturer": "3DMaker",
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj",

1
resources/definitions/prusa_i3.def.json
View File

@ -4,6 +4,7 @@
"name": "Prusa i3",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "Quillford",
"manufacturer": "Prusajr",
"category": "Other",

3
resources/definitions/prusa_i3_xl.def.json
View File

@ -2,8 +2,9 @@
"id": "prusa_i3_xl",
"version": 2,
"name": "Prusa i3 xl",
"inherits": "fdmprinter.json",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "guigashm",
"manufacturer": "Prusajr",
"category": "Other",

3
resources/definitions/rigidbot.def.json
View File

@ -4,6 +4,7 @@
"name": "RigidBot",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "RBC",
"manufacturer": "RigidBot",
"category": "Other",
@ -86,7 +87,7 @@
},
"speed_layer_0": {
"default_value": 15,
"min_value": "0.1"
"minimum_value": "0.1"
},
"infill_overlap": {
"default_value": 10

3
resources/definitions/rigidbot_big.def.json
View File

@ -4,6 +4,7 @@
"name": "RigidBotBig",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"author": "RBC",
"manufacturer": "RigidBot",
"category": "Other",
@ -89,7 +90,7 @@
},
"speed_layer_0": {
"default_value": 15,
"min_value": "0.1"
"minimum_value": "0.1"
},
"infill_overlap": {
"default_value": 10

41
resources/definitions/ultimaker2.def.json
View File

@ -4,6 +4,7 @@
"name": "Ultimaker 2",
"inherits": "ultimaker",
"metadata": {
"visible": true,
"author": "Ultimaker",
"manufacturer": "Ultimaker",
"file_formats": "text/x-gcode",
@ -13,26 +14,26 @@
},
"overrides": {
"machine_start_gcode" : {
"default": ""
"default_value": ""
},
"machine_end_gcode" : {
"default": ""
"default_value": ""
},
"machine_width": {
"default": 223
"default_value": 223
},
"machine_depth": {
"default": 223
"default_value": 223
},
"machine_height": {
"default": 205
"default_value": 205
},
"machine_heated_bed": {
"default": true
"default_value": true
},
"machine_head_with_fans_polygon":
{
"default": [
"default_value": [
[ -42, 12 ],
[ -42, -32 ],
[ 62, 12 ],
@ -40,45 +41,45 @@
]
},
"machine_center_is_zero": {
"default": false
"default_value": false
},
"machine_nozzle_size": {
"default": 0.4,
"min_value": "0.001"
"default_value": 0.4,
"minimum_value": "0.001"
},
"machine_nozzle_heat_up_speed": {
"default": 2
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default": 2
"default_value": 2
},
"gantry_height": {
"default": 55
"default_value": 55
},
"machine_use_extruder_offset_to_offset_coords": {
"default": true
"default_value": true
},
"machine_gcode_flavor": {
"default": "UltiGCode"
"default_value": "UltiGCode"
},
"machine_disallowed_areas": {
"default": [
"default_value": [
[[-115, 112.5], [ -82, 112.5], [ -84, 102.5], [-115, 102.5]],
[[ 115, 112.5], [ 115, 102.5], [ 110, 102.5], [ 108, 112.5]],
[[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
[[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
]},
"machine_platform_offset": {
"default": [9, 0, 0]
"default_value": [9, 0, 0]
},
"machine_nozzle_tip_outer_diameter": {
"default": 1
"default_value": 1
},
"machine_nozzle_head_distance": {
"default": 3
"default_value": 3
},
"machine_nozzle_expansion_angle": {
"default": 45
"default_value": 45
},
"material_print_temperature": {
"enabled": "False"