3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

JSOn fix: spaghetti infill enabled function bug (CURA-3238)

Browse source
This commit is contained in:
Tim Kuipers 2017-03-13 16:22:21 +01:00
commit fe56c105e9
76 changed files with 2219 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

152
resources/definitions/fdmprinter.def.json
View file

@ -93,6 +93,7 @@
"description": "Whether to wait until the nozzle temperature is reached at the start.",
"default_value": true,
"type": "bool",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -103,6 +104,7 @@
"description": "Whether to include nozzle temperature commands at the start of the gcode. When the start_gcode already contains nozzle temperature commands Cura frontend will automatically disable this setting.",
"default_value": true,
"type": "bool",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -249,6 +251,17 @@
"settable_per_extruder": true,
"settable_per_meshgroup": false
},
"machine_nozzle_temp_enabled":
{
"label": "Enable Nozzle Temperature Control",
"description": "Whether to control temperature from Cura. Turn this off to control nozzle temperature from outside of Cura.",
"default_value": true,
"value": "machine_gcode_flavor != \"UltiGCode\"",
"type": "bool",
"settable_per_mesh": false,
"settable_per_extruder": true,
"settable_per_meshgroup": false
},
"machine_nozzle_heat_up_speed":
{
"label": "Heat up speed",
@ -256,6 +269,7 @@
"default_value": 2.0,
"unit": "°C/s",
"type": "float",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -266,6 +280,7 @@
"default_value": 2.0,
"unit": "°C/s",
"type": "float",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -276,6 +291,7 @@
"default_value": 50.0,
"unit": "s",
"type": "float",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -908,6 +924,15 @@
"value": "top_bottom_pattern",
"settable_per_mesh": true
},
"skin_angles":
{
"label": "Top/Bottom Line Directions",
"description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).",
"type": "[int]",
"default_value": "[ ]",
"enabled": "top_bottom_pattern != 'concentric'",
"settable_per_mesh": true
},
"wall_0_inset":
{
"label": "Outer Wall Inset",
@ -1089,6 +1114,16 @@
"value": "'lines' if infill_sparse_density > 25 else 'grid'",
"settable_per_mesh": true
},
"infill_angles":
{
"label": "Infill Line Directions",
"description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns).",
"type": "[int]",
"default_value": "[ ]",
"enabled": "infill_pattern != 'concentric' and infill_pattern != 'concentric_3d' and infill_pattern != 'cubicsubdiv'",
"enabled": "infill_sparse_density > 0",
"settable_per_mesh": true
},
"spaghetti_infill_enabled":
{
"label": "Spaghetti Infill",
@ -1267,7 +1302,7 @@
"minimum_value": "0",
"maximum_value_warning": "4",
"maximum_value": "(20 - math.log(infill_line_distance) / math.log(2)) if infill_line_distance > 0 and not spaghetti_infill_enabled else 0",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' not spaghetti_infill_enabled",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled",
"settable_per_mesh": true
},
"gradual_infill_step_height":
@ -1301,6 +1336,75 @@
"minimum_value": "0",
"default_value": 0,
"settable_per_mesh": true
},
"expand_skins_into_infill":
{
"label": "Expand Skins Into Infill",
"description": "Expand skin areas of top and/or bottom skin of flat surfaces. By default, skins stop under the wall lines that surround infill but this can lead to holes appearing when the infill density is low. This setting extends the skins beyond the wall lines so that the infill on the next layer rests on skin.",
"type": "bool",
"default_value": false,
"settable_per_mesh": true,
"children":
{
"expand_upper_skins":
{
"label": "Expand Upper Skins",
"description": "Expand upper skin areas (areas with air above) so that they support infill above.",
"type": "bool",
"default_value": false,
"value": "expand_skins_into_infill",
"settable_per_mesh": true
},
"expand_lower_skins":
{
"label": "Expand Lower Skins",
"description": "Expand lower skin areas (areas with air below) so that they are anchored by the infill layers above and below.",
"type": "bool",
"default_value": false,
"settable_per_mesh": true
}
}
},
"expand_skins_expand_distance":
{
"label": "Skin Expand Distance",
"description": "The distance the skins are expanded into the infill. The default distance is enough to bridge the gap between the infill lines and will stop holes appearing in the skin where it meets the wall when the infill density is low. A smaller distance will often be sufficient.",
"unit": "mm",
"type": "float",
"default_value": 2.8,
"value": "infill_line_distance * 1.4",
"minimum_value": "0",
"enabled": "expand_upper_skins or expand_lower_skins",
"settable_per_mesh": true
},
"max_skin_angle_for_expansion":
{
"label": "Maximum Skin Angle for Expansion",
"description": "Top and or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical.",
"unit": "°",
"type": "float",
"minimum_value": "0",
"minimum_value_warning": "2",
"maximum_value_warning": "45",
"maximum_value": "90",
"default_value": 20,
"enabled": "expand_upper_skins or expand_lower_skins",
"settable_per_mesh": true,
"children":
{
"min_skin_width_for_expansion":
{
"label": "Minimum Skin Width for Expansion",
"description": "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical.",
"unit": "mm",
"type": "float",
"default_value": 2.24,
"value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))",
"minimum_value": "0",
"enabled": "expand_upper_skins or expand_lower_skins",
"settable_per_mesh": true
}
}
}
}
},
@ -1318,7 +1422,7 @@
"description": "Change the temperature for each layer automatically with the average flow speed of that layer.",
"type": "bool",
"default_value": false,
"enabled": "False",
"enabled": "machine_nozzle_temp_enabled and False",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1329,22 +1433,24 @@
"unit": "°C",
"type": "float",
"default_value": 210,
"enabled": false,
"minimum_value_warning": "0",
"maximum_value_warning": "285",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_extruder": true,
"minimum_value": "-273.15"
},
"material_print_temperature":
{
"label": "Printing Temperature",
"description": "The temperature used for printing. If this is 0, the extruder will not heat up for this print.",
"description": "The temperature used for printing.",
"unit": "°C",
"type": "float",
"default_value": 210,
"value": "default_material_print_temperature",
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "270",
"enabled": "not (material_flow_dependent_temperature) and machine_gcode_flavor != \"UltiGCode\"",
"maximum_value_warning": "285",
"enabled": "machine_nozzle_temp_enabled and not (material_flow_dependent_temperature)",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1355,11 +1461,11 @@
"unit": "°C",
"type": "float",
"default_value": 215,
"value": "material_print_temperature + 5",
"value": "material_print_temperature",
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "260",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"maximum_value_warning": "285",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1374,7 +1480,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "material_standby_temperature",
"maximum_value_warning": "material_print_temperature",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1389,7 +1495,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "material_standby_temperature",
"maximum_value_warning": "material_print_temperature",
"enabled": "machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1400,8 +1506,7 @@
"unit": "[[mm³,°C]]",
"type": "str",
"default_value": "[[3.5,200],[7.0,240]]",
"enabled": "False",
"comments": "old enabled function: material_flow_dependent_temperature",
"enabled": "False and machine_nozzle_temp_enabled and material_flow_dependent_temperature",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1415,8 +1520,7 @@
"minimum_value": "0",
"maximum_value_warning": "10.0",
"maximum_value": "machine_nozzle_heat_up_speed",
"enabled": "False",
"comments": "old enabled function: material_flow_dependent_temperature or machine_extruder_count > 1",
"enabled": "material_flow_dependent_temperature or (machine_extruder_count > 1 and material_final_print_temperature != material_print_temperature)",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1430,7 +1534,7 @@
"default_value": 60,
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "260",
"maximum_value_warning": "130",
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -1447,7 +1551,7 @@
"value": "resolveOrValue('material_bed_temperature')",
"minimum_value": "-273.15",
"minimum_value_warning": "max(extruderValues('material_bed_temperature'))",
"maximum_value_warning": "260",
"maximum_value_warning": "130",
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -1623,7 +1727,7 @@
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "260",
"enabled": "machine_extruder_count > 1 and machine_gcode_flavor != \"UltiGCode\"",
"enabled": "machine_extruder_count > 1 and machine_nozzle_temp_enabled",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -2476,6 +2580,16 @@
"settable_per_mesh": false,
"settable_per_extruder": false
},
"travel_retract_before_outer_wall":
{
"label": "Retract Before Outer Wall",
"description": "Always retract when moving to start an outer wall.",
"type": "bool",
"default_value": false,
"enabled": "retraction_enable",
"settable_per_mesh": false,
"settable_per_extruder": false
},
"travel_avoid_other_parts":
{
"label": "Avoid Printed Parts When Traveling",
@ -3841,7 +3955,7 @@
"unit": "mm",
"type": "float",
"default_value": 2,
"value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(max(0, resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height')))))",
"value": "round(max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(max(0, resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))), 3)",
"resolve": "max(extruderValues('prime_tower_wall_thickness'))",
"minimum_value": "0.001",
"minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))",

11
resources/definitions/renkforce_rf100.def.json
View file

@ -18,8 +18,8 @@
"bottom_thickness": {
"value": "0.5"
},
"brim_line_count": {
"value": "20.0"
"brim_width": {
"value": "2.0"
},
"cool_fan_enabled": {
"value": "True"
@ -81,6 +81,9 @@
"material_diameter": {
"value": "1.75"
},
"material_flow": {
"value": "110"
},
"material_print_temperature": {
"value": "210.0"
},
@ -151,13 +154,13 @@
"value": "3.0"
},
"skirt_line_count": {
"value": "1.0"
"value": "3"
},
"speed_infill": {
"value": "50.0"
},
"speed_layer_0": {
"value": "30.0"
"value": "15.0"
},
"speed_print": {
"value": "50.0"

3
resources/definitions/ultimaker2.def.json
View file

@ -100,6 +100,9 @@
},
"machine_acceleration": {
"default_value": 3000
},
"machine_nozzle_temp_enabled": {
"default_value": false
}
}
}

1
resources/definitions/ultimaker3.def.json
View file

@ -106,6 +106,7 @@
"line_width": { "value": "machine_nozzle_size * 0.875" },
"machine_min_cool_heat_time_window": { "value": "15" },
"default_material_print_temperature": { "value": "200" },
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
"material_bed_temperature": { "maximum_value": "115" },
"material_bed_temperature_layer_0": { "maximum_value": "115" },
"material_standby_temperature": { "value": "100" },

2
resources/definitions/ultimaker_original.def.json
View file

@ -62,7 +62,7 @@
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
"value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'"
}
}
}

84
resources/definitions/vertex_k8400.def.json Normal file
View file

@ -0,0 +1,84 @@
{
"id": "vertex_k8400",
"version": 2,
"name": "Vertex K8400",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"manufacturer": "Velleman",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "Vertex_build_panel.stl",
"platform_offset": [0, -2, 0],
"supports_usb_connection": true,
"supported_actions": ["MachineSettingsAction"]
},
"overrides": {
"machine_name": { "default_value": "Vertex K8400" },
"machine_heated_bed": {
"default_value": true
},
"material_bed_temperature": {
"default_value": 0
},
"material_bed_temperature_layer_0": {
"default_value": 0
},
"machine_width": {
"default_value": 200
},
"machine_height": {
"default_value": 190
},
"machine_depth": {
"default_value": 200
},
"machine_disallowed_areas": { "default_value": [
[[-100,100],[-100,80],[100,80],[100,100]]
]},
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.35
},
"material_diameter": {
"default_value": 1.75
},
"machine_head_polygon": {
"default_value": [
[-60, -18],
[-60, 40],
[18, 40],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-60, -40],
[-60, 40],
[18, 40],
[18, -40]
]
},
"gantry_height": {
"default_value": 18
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
}
}
}

92
resources/definitions/vertex_k8400_dual.def.json Normal file
View file

@ -0,0 +1,92 @@
{
"id": "vertex_k8400_dual",
"version": 2,
"name": "Vertex K8400 Dual",
"inherits": "fdmprinter",
"metadata": {
"visible": true,
"manufacturer": "Velleman",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "Vertex_build_panel.stl",
"platform_offset": [0, -2, 0],
"machine_extruder_trains": {
"0": "vertex_k8400_dual_1st",
"1": "vertex_k8400_dual_2nd"
}
},
"overrides": {
"machine_name": { "default_value": "Vertex K8400 Dual" },
"machine_heated_bed": {
"default_value": true
},
"material_bed_temperature": {
"default_value": 0
},
"material_bed_temperature_layer_0": {
"default_value": 0
},
"machine_width": {
"default_value": 223.7
},
"machine_height": {
"default_value": 190
},
"machine_depth": {
"default_value": 200
},
"machine_disallowed_areas": { "default_value": [
[[-111.85,100],[111.85,100],[-111.85,80],[111.85,80]]
]},
"machine_center_is_zero": {
"default_value": false
},
"machine_use_extruder_offset_to_offset_coords": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.35
},
"material_diameter": {
"default_value": 1.75
},
"machine_head_polygon": {
"default_value": [
[-60, -18],
[-60, 40],
[18, 40],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-60, -40],
[-60, 40],
[18, 40],
[18, -40]
]
},
"gantry_height": {
"default_value": 18
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},
"machine_nozzle_cool_down_speed": {
"default_value": 2
},
"machine_extruder_count": {
"default_value": 2
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
}
}
}

26
resources/extruders/vertex_k8400_dual_1st.def.json Normal file
View file

@ -0,0 +1,26 @@
{
"id": "vertex_k8400_dual_1st",
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "vertex_k8400_dual",
"position": "0"
},
"overrides": {
"extruder_nr": {
"default_value": 0,
"maximum_value": "1"
},
"machine_nozzle_offset_x": { "default_value": 23.7 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
"machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
"machine_extruder_end_pos_abs": { "default_value": true },
"machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
"machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }
}
}

26
resources/extruders/vertex_k8400_dual_2nd.def.json Normal file
View file

@ -0,0 +1,26 @@
{
"id": "vertex_k8400_dual_2nd",
"version": 2,
"name": "Extruder 2",
"inherits": "fdmextruder",
"metadata": {
"machine": "vertex_k8400_dual",
"position": "1"
},
"overrides": {
"extruder_nr": {
"default_value": 1,
"maximum_value": "1"
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
"machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },
"machine_extruder_end_pos_abs": { "default_value": true },
"machine_extruder_end_pos_x": { "value": "prime_tower_position_x" },
"machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }
}
}

BIN
resources/meshes/Vertex_build_panel.stl Normal file
View file

Binary file not shown.

1
resources/qml/Actions.qml
View file

@ -262,6 +262,7 @@ Item
id: reloadAllAction;
text: catalog.i18nc("@action:inmenu menubar:file","Re&load All Models");
iconName: "document-revert";
shortcut: "F5"
onTriggered: Printer.reloadAll();
}

33
resources/qml/Cura.qml Normal file → Executable file
View file

@ -266,11 +266,11 @@ UM.MainWindow
anchors.fill: parent;
onDropped:
{
if(drop.urls.length > 0)
if (drop.urls.length > 0)
{
// Import models
var imported_model = -1;
for(var i in drop.urls)
for (var i in drop.urls)
{
// There is no endsWith in this version of JS...
if ((drop.urls[i].length <= 12) || (drop.urls[i].substring(drop.urls[i].length-12) !== ".curaprofile")) {
@ -287,7 +287,7 @@ UM.MainWindow
var import_result = Cura.ContainerManager.importProfiles(drop.urls);
if (import_result.message !== "") {
messageDialog.text = import_result.message
if(import_result.status == "ok")
if (import_result.status == "ok")
{
messageDialog.icon = StandardIcon.Information
}
@ -306,18 +306,6 @@ UM.MainWindow
}
}
Legend
{
id: legend
anchors
{
top: parent.top
topMargin: UM.Theme.getSize("default_margin").height
right: sidebar.left
rightMargin: UM.Theme.getSize("default_margin").width
}
}
JobSpecs
{
id: jobSpecs
@ -882,6 +870,21 @@ UM.MainWindow
}
}
DiscardOrKeepProfileChangesDialog
{
id: discardOrKeepProfileChangesDialog
}
Connections
{
target: Printer
onShowDiscardOrKeepProfileChanges:
{
discardOrKeepProfileChangesDialog.show()
}
}
Connections
{
target: Cura.Actions.addMachine

208
resources/qml/DiscardOrKeepProfileChangesDialog.qml Normal file
View file

@ -0,0 +1,208 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.2
import UM 1.2 as UM
import Cura 1.1 as Cura
UM.Dialog
{
id: base
title: catalog.i18nc("@title:window", "Discard or Keep changes")
width: 800
height: 400
property var changesModel: Cura.UserChangesModel{ id: userChangesModel}
onVisibilityChanged:
{
if(visible)
{
changesModel.forceUpdate()
}
discardOrKeepProfileChangesDropDownButton.currentIndex = UM.Preferences.getValue("cura/choice_on_profile_override")
}
Column
{
anchors.fill: parent
spacing: UM.Theme.getSize("default_margin").width
UM.I18nCatalog
{
id: catalog;
name: "cura"
}
Row
{
height: childrenRect.height
anchors.margins: UM.Theme.getSize("default_margin").width
anchors.left: parent.left
anchors.right: parent.right
spacing: UM.Theme.getSize("default_margin").width
Label
{
text: "You have customized some profile settings.\nWould you like to keep or discard those settings?"
anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap
}
}
TableView
{
anchors.margins: UM.Theme.getSize("default_margin").width
anchors.left: parent.left
anchors.right: parent.right
height: base.height - 200
id: tableView
Component
{
id: labelDelegate
Label
{
property var extruder_name: userChangesModel.getItem(styleData.row).extruder
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("system")
text:
{
var result = styleData.value
if (extruder_name != "")
{
result += " (" + extruder_name + ")"
}
return result
}
}
}
Component
{
id: defaultDelegate
Label
{
text: styleData.value
font: UM.Theme.getFont("system")
color: UM.Theme.getColor("setting_control_disabled_text")
}
}
TableViewColumn
{
role: "label"
title: catalog.i18nc("@title:column", "Profile settings")
delegate: labelDelegate
width: tableView.width * 0.4
}
TableViewColumn
{
role: "original_value"
title: catalog.i18nc("@title:column", "Default")
width: tableView.width * 0.3
delegate: defaultDelegate
}
TableViewColumn
{
role: "user_value"
title: catalog.i18nc("@title:column", "Customized")
width: tableView.width * 0.3 - 1
}
section.property: "category"
section.delegate: Label
{
text: section
font.bold: true
}
model: base.changesModel
}
Item
{
anchors.right: parent.right
anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width
height:childrenRect.height
ComboBox
{
id: discardOrKeepProfileChangesDropDownButton
model: [
catalog.i18nc("@option:discardOrKeep", "Always ask me this"),
catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"),
catalog.i18nc("@option:discardOrKeep", "Keep and never ask again")
]
width: 300
currentIndex: UM.Preferences.getValue("cura/choice_on_profile_override")
onCurrentIndexChanged:
{
UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
if (currentIndex == 1) {
// 1 == "Discard and never ask again", so only enable the "Discard" button
discardButton.enabled = true
keepButton.enabled = false
}
else if (currentIndex == 2) {
// 2 == "Keep and never ask again", so only enable the "Keep" button
keepButton.enabled = true
discardButton.enabled = false
}
else {
// 0 == "Always ask me this", so show both
keepButton.enabled = true
discardButton.enabled = true
}
}
}
}
Item
{
anchors.right: parent.right
anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width
height:childrenRect.height
Button
{
id: discardButton
text: catalog.i18nc("@action:button", "Discard");
anchors.right: parent.right
onClicked:
{
Printer.discardOrKeepProfileChangesClosed("discard")
base.hide()
}
isDefault: true
}
Button
{
id: keepButton
text: catalog.i18nc("@action:button", "Keep");
anchors.right: discardButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
onClicked:
{
Printer.discardOrKeepProfileChangesClosed("keep")
base.hide()
}
}
Button
{
id: createNewProfileButton
text: catalog.i18nc("@action:button", "Create New Profile");
anchors.left: parent.left
action: Cura.Actions.addProfile
onClicked: base.hide()
}
}
}
}

65
resources/qml/Legend.qml
View file

@ -1,65 +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.Controls.Styles 1.1
import QtQuick.Layouts 1.1
import UM 1.1 as UM
import Cura 1.0 as Cura
Item {
id: base
UM.I18nCatalog { id: catalog; name:"cura"}
width: childrenRect.width
height: childrenRect.height
Connections
{
target: Printer
onViewLegendItemsChanged:
{
legendItemRepeater.model = items
}
}
Column
{
Repeater
{
id: legendItemRepeater
Item {
anchors.right: parent.right
height: childrenRect.height
width: childrenRect.width
Rectangle {
id: swatch
anchors.right: parent.right
anchors.verticalCenter: label.verticalCenter
height: UM.Theme.getSize("setting_control").height / 2
width: height
color: modelData.color
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("text_subtext")
}
Label {
id: label
text: modelData.title
font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text_subtext")
anchors.right: swatch.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
}
}
}
}
}

74
resources/qml/Preferences/GeneralPage.qml Normal file → Executable file
View file

@ -47,6 +47,8 @@ UM.PreferencesPage
centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select"))
UM.Preferences.resetPreference("view/top_layer_count");
topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count"))
UM.Preferences.resetPreference("cura/choice_on_profile_override")
choiceOnProfileOverrideDropDownButton.currentIndex = UM.Preferences.getValue("cura/choice_on_profile_override")
if (plugins.find("id", "SliceInfoPlugin") > -1) {
UM.Preferences.resetPreference("info/send_slice_info")
@ -257,44 +259,6 @@ UM.PreferencesPage
}
}
UM.TooltipArea {
width: childrenRect.width;
height: childrenRect.height;
text: catalog.i18nc("@info:tooltip","Display 5 top layers in layer view or only the top-most layer. Rendering 5 layers takes longer, but may show more information.")
CheckBox
{
id: topLayerCountCheckbox
text: catalog.i18nc("@action:button","Display five top layers in layer view compatibility mode");
checked: UM.Preferences.getValue("view/top_layer_count") == 5
onClicked:
{
if(UM.Preferences.getValue("view/top_layer_count") == 5)
{
UM.Preferences.setValue("view/top_layer_count", 1)
}
else
{
UM.Preferences.setValue("view/top_layer_count", 5)
}
}
}
}
UM.TooltipArea {
width: childrenRect.width
height: childrenRect.height
text: catalog.i18nc("@info:tooltip", "Should only the top layers be displayed in layerview?")
CheckBox
{
id: topLayersOnlyCheckbox
text: catalog.i18nc("@option:check", "Only display top layer(s) in layer view compatibility mode")
checked: boolCheck(UM.Preferences.getValue("view/only_show_top_layers"))
onCheckedChanged: UM.Preferences.setValue("view/only_show_top_layers", checked)
}
}
UM.TooltipArea {
width: childrenRect.width
height: childrenRect.height
@ -377,6 +341,40 @@ UM.PreferencesPage
}
}
Item
{
//: Spacer
height: UM.Theme.getSize("default_margin").height
width: UM.Theme.getSize("default_margin").width
}
Label
{
font.bold: true
text: catalog.i18nc("@label", "Override Profile")
}
UM.TooltipArea
{
width: childrenRect.width;
height: childrenRect.height;
text: catalog.i18nc("@info:tooltip", "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again.")
ComboBox
{
id: choiceOnProfileOverrideDropDownButton
model: [
catalog.i18nc("@option:discardOrKeep", "Always ask me this"),
catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"),
catalog.i18nc("@option:discardOrKeep", "Keep and never ask again")
]
width: 300
currentIndex: UM.Preferences.getValue("cura/choice_on_profile_override")
onCurrentIndexChanged: UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
}
}
Item
{

19
resources/qml/Preferences/MachinesPage.qml
View file

@ -89,15 +89,20 @@ UM.ManagementPage
id: machineActionRepeater
model: base.currentItem ? Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
Button
Item
{
text: machineActionRepeater.model[index].label
onClicked:
width: childrenRect.width + 2
height: childrenRect.height
Button
{
actionDialog.content = machineActionRepeater.model[index].displayItem;
machineActionRepeater.model[index].displayItem.reset();
actionDialog.title = machineActionRepeater.model[index].label;
actionDialog.show();
text: machineActionRepeater.model[index].label
onClicked:
{
actionDialog.content = machineActionRepeater.model[index].displayItem;
machineActionRepeater.model[index].displayItem.reset();
actionDialog.title = machineActionRepeater.model[index].label;
actionDialog.show();
}
}
}
}

12
resources/qml/Preferences/MaterialView.qml
View file

@ -155,8 +155,10 @@ TabView
decimals: 2
maximumValue: 1000
onEditingFinished: base.setMaterialPreferenceValue(properties.guid, "spool_cost", parseFloat(value))
onValueChanged: updateCostPerMeter()
onValueChanged: {
base.setMaterialPreferenceValue(properties.guid, "spool_cost", parseFloat(value))
updateCostPerMeter()
}
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
@ -170,8 +172,10 @@ TabView
decimals: 0
maximumValue: 10000
onEditingFinished: base.setMaterialPreferenceValue(properties.guid, "spool_weight", parseFloat(value))
onValueChanged: updateCostPerMeter()
onValueChanged: {
base.setMaterialPreferenceValue(properties.guid, "spool_weight", parseFloat(value))
updateCostPerMeter()
}
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }

4
resources/qml/Settings/SettingTextField.qml
View file

@ -98,9 +98,9 @@ SettingItem
selectByMouse: true;
maximumLength: 10;
maximumLength: (definition.type == "[int]") ? 20 : 10;
validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry
validator: RegExpValidator { regExp: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,9}\s*,)*(\s*-?[0-9]{0,9})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry
Binding
{

2
resources/qml/Settings/SettingView.qml
View file

@ -217,6 +217,8 @@ Item
{
case "int":
return "SettingTextField.qml"
case "[int]":
return "SettingTextField.qml"
case "float":
return "SettingTextField.qml"
case "enum":

3
resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
View file

@ -17,6 +17,9 @@ infill_wipe_dist = 0
layer_height = 0.2
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 5
prime_tower_size = 17
retraction_combing = off
retraction_hop = 0.2

3
resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
View file

@ -17,6 +17,9 @@ infill_wipe_dist = 0
layer_height = 0.15
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 5
prime_tower_size = 17
retraction_combing = off
retraction_hop = 0.2

4
resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg
View file

@ -14,7 +14,9 @@ brim_width = 7
cool_min_speed = 5
infill_wipe_dist = 0
layer_height = 0.06
material_print_temperature = =default_material_print_temperature + 2
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature - 3
prime_tower_size = 17
retraction_combing = off
retraction_hop = 0.2

4
resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg
View file

@ -13,7 +13,9 @@ weight = 0
brim_width = 7
cool_min_speed = 7
infill_wipe_dist = 0
material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature
prime_tower_size = 17
retraction_combing = off
retraction_hop = 0.2

3
resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
View file

@ -18,6 +18,9 @@ cool_min_speed = 6
infill_line_width = =round(line_width * 0.4 / 0.35, 2)
infill_overlap_mm = 0.05
layer_height = 0.2
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
material_print_temperature_layer_0 = =material_print_temperature + 5
ooze_shield_angle = 40
raft_airgap = 0.25

3
resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
View file

@ -19,6 +19,9 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2)
infill_overlap = =0
infill_overlap_mm = 0.05
layer_height = 0.15
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 10
material_print_temperature_layer_0 = =material_print_temperature + 5
ooze_shield_angle = 40
raft_airgap = 0.25

2
resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
View file

@ -17,6 +17,8 @@ cool_min_speed = 8
infill_line_width = =round(line_width * 0.4 / 0.35, 2)
infill_overlap_mm = 0.05
layer_height = 0.06
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature - 10
material_print_temperature_layer_0 = =material_print_temperature + 5
ooze_shield_angle = 40

2
resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
View file

@ -16,6 +16,8 @@ cool_min_layer_time_fan_speed_max = 5
cool_min_speed = 5
infill_line_width = =round(line_width * 0.4 / 0.35, 2)
infill_overlap_mm = 0.05
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature + 5
ooze_shield_angle = 40

5
resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
View file

@ -20,8 +20,11 @@ infill_pattern = tetrahedral
infill_sparse_density = 96
layer_height = 0.2
line_width = =machine_nozzle_size * 0.95
material_final_print_temperature = =material_print_temperature - 10
material_flow = 106
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 2
material_print_temperature_layer_0 = =material_print_temperature
retraction_count_max = 12
retraction_extra_prime_amount = 0.8
skin_overlap = 15

5
resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
View file

@ -20,8 +20,11 @@ infill_pattern = tetrahedral
infill_sparse_density = 96
layer_height = 0.15
line_width = =machine_nozzle_size * 0.95
material_final_print_temperature = =material_print_temperature - 10
material_flow = 106
material_print_temperature_layer_0 = =default_material_print_temperature + 2
material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 2
material_print_temperature_layer_0 = =material_print_temperature
retraction_amount = 7
retraction_count_max = 12
retraction_extra_prime_amount = 0.8

3
resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
View file

@ -19,10 +19,11 @@ infill_line_width = =round(line_width * 0.38 / 0.38, 2)
infill_pattern = tetrahedral
infill_sparse_density = 96
line_width = =machine_nozzle_size * 0.95
material_final_print_temperature = =material_print_temperature - 10
material_flow = 106
material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
retraction_count_max = 12
retraction_extra_prime_amount = 0.8
skin_overlap = 15

26
resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,26 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_nylon_ultimaker3_AA_0.8
weight = -2
[values]
brim_width = 8.0
cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_min_layer_time_fan_speed_max = 20
infill_before_walls = True
infill_pattern = triangles
machine_nozzle_cool_down_speed = 0.9
material_standby_temperature = 100
raft_airgap = =round(layer_height_0 * 0.85, 2)
raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
wall_line_width_x = =wall_line_width

27
resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg Normal file
View file

@ -0,0 +1,27 @@
[general]
version = 2
name = Superdraft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = superdraft
material = generic_nylon_ultimaker3_AA_0.8
weight = -2
[values]
brim_width = 8.0
cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_min_layer_time_fan_speed_max = 20
infill_before_walls = True
infill_pattern = triangles
layer_height = 0.4
machine_nozzle_cool_down_speed = 0.9
material_standby_temperature = 100
raft_airgap = =round(layer_height_0 * 0.85, 2)
raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
wall_line_width_x = =wall_line_width

27
resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg Normal file
View file

@ -0,0 +1,27 @@
[general]
version = 2
name = Verydraft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = verydraft
material = generic_nylon_ultimaker3_AA_0.8
weight = -2
[values]
brim_width = 8.0
cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_min_layer_time_fan_speed_max = 20
infill_before_walls = True
infill_pattern = triangles
layer_height = 0.3
machine_nozzle_cool_down_speed = 0.9
material_standby_temperature = 100
raft_airgap = =round(layer_height_0 * 0.85, 2)
raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
wall_line_width_x = =wall_line_width

34
resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,34 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
material = generic_pla_ultimaker3_AA_0.8
weight = 0
[values]
brim_line_count = =math.ceil(brim_width / skirt_brim_line_width)
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
gradual_infill_steps = 4
infill_line_width = =round(line_width * 0.535 / 0.75, 2)
infill_sparse_density = 80
line_width = =machine_nozzle_size * 0.9375
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
ooze_shield_angle = 60
raft_acceleration = =acceleration_print
raft_jerk = =jerk_print
raft_margin = 15
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
top_bottom_thickness = =layer_height * 4
wall_line_width = =round(line_width * 0.75 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x

35
resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg Normal file
View file

@ -0,0 +1,35 @@
[general]
version = 2
name = Superdraft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = superdraft
material = generic_pla_ultimaker3_AA_0.8
weight = 1
[values]
brim_line_count = =math.ceil(brim_width / skirt_brim_line_width)
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
gradual_infill_steps = 4
infill_line_width = =round(line_width * 0.535 / 0.75, 2)
infill_sparse_density = 80
layer_height = 0.4
line_width = =machine_nozzle_size * 0.9375
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 15
material_standby_temperature = 100
ooze_shield_angle = 60
raft_acceleration = =acceleration_print
raft_jerk = =jerk_print
raft_margin = 15
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
top_bottom_thickness = =layer_height * 4
wall_line_width = =round(line_width * 0.75 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x

35
resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg Normal file
View file

@ -0,0 +1,35 @@
[general]
version = 2
name = Verydraft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = verydraft
material = generic_pla_ultimaker3_AA_0.8
weight = 1
[values]
brim_line_count = =math.ceil(brim_width / skirt_brim_line_width)
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
gradual_infill_steps = 4
infill_line_width = =round(line_width * 0.535 / 0.75, 2)
infill_sparse_density = 80
layer_height = 0.3
line_width = =machine_nozzle_size * 0.9375
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
ooze_shield_angle = 60
raft_acceleration = =acceleration_print
raft_jerk = =jerk_print
raft_margin = 15
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
top_bottom_thickness = =layer_height * 4
wall_line_width = =round(line_width * 0.75 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x

14
resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,14 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = draft
weight = -2
material = generic_pva_ultimaker3_BB_0.8
[values]
material_print_temperature = =default_material_print_temperature + 5

14
resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg Normal file
View file

@ -0,0 +1,14 @@
[general]
version = 2
name = Superdraft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = superdraft
weight = -2
material = generic_pva_ultimaker3_BB_0.8
[values]
layer_height = 0.4

14
resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg Normal file
View file

@ -0,0 +1,14 @@
[general]
version = 2
name = Verydraft Print
definition = ultimaker3
[metadata]
type = quality
quality_type = verydraft
weight = -2
material = generic_pva_ultimaker3_BB_0.8
[values]
layer_height = 0.3

10
resources/themes/cura/theme.json
View file

@ -290,9 +290,15 @@
"slider_groove": [0.5, 0.5],
"slider_handle": [1.5, 1.5],
"slider_layerview_size": [1.0, 16.0],
"slider_layerview_size": [1.0, 22.0],
"slider_layerview_background": [4.0, 0.0],
"slider_layerview_margin": [3.0, 3.0],
"slider_layerview_margin": [1.0, 1.0],
"layerview_menu_size": [16.5, 21.0],
"layerview_menu_size_compatibility": [22, 23.0],
"layerview_legend_size": [1.0, 1.0],
"layerview_row": [11.0, 1.5],
"layerview_row_spacing": [0.0, 0.5],
"checkbox": [2.0, 2.0],

6
resources/variants/cartesio_0.25.inst.cfg
View file

@ -45,19 +45,19 @@ speed_travel_layer_0 = =round(speed_travel)
speed_support_interface = =round(speed_topbottom)
retraction_combing = off
retraction_hop_enabled = true
retraction_hop_enabled = True
retraction_hop = 1
support_z_distance = 0
support_xy_distance = 0.5
support_join_distance = 10
support_interface_enable = true
support_interface_enable = True
adhesion_type = skirt
skirt_gap = 0.5
skirt_brim_minimal_length = 50
coasting_enable = true
coasting_enable = True
coasting_volume = 0.1
coasting_min_volume = 0.17
coasting_speed = 90

6
resources/variants/cartesio_0.4.inst.cfg
View file

@ -45,19 +45,19 @@ speed_travel_layer_0 = =round(speed_travel)
speed_support_interface = =round(speed_topbottom)
retraction_combing = off
retraction_hop_enabled = true
retraction_hop_enabled = True
retraction_hop = 1
support_z_distance = 0
support_xy_distance = 0.5
support_join_distance = 10
support_interface_enable = true
support_interface_enable = True
adhesion_type = skirt
skirt_gap = 0.5
skirt_brim_minimal_length = 50
coasting_enable = true
coasting_enable = True
coasting_volume = 0.1
coasting_min_volume = 0.17
coasting_speed = 90

6
resources/variants/cartesio_0.8.inst.cfg
View file

@ -46,19 +46,19 @@ speed_travel_layer_0 = =round(speed_travel)
speed_support_interface = =round(speed_topbottom)
retraction_combing = off
retraction_hop_enabled = true
retraction_hop_enabled = True
retraction_hop = 1
support_z_distance = 0
support_xy_distance = 0.5
support_join_distance = 10
support_interface_enable = true
support_interface_enable = True
adhesion_type = skirt
skirt_gap = 0.5
skirt_brim_minimal_length = 50
coasting_enable = true
coasting_enable = True
coasting_volume = 0.1
coasting_min_volume = 0.17
coasting_speed = 90

64
resources/variants/ultimaker3_aa0.8.inst.cfg Normal file
View file

@ -0,0 +1,64 @@
[general]
name = AA 0.8
version = 2
definition = ultimaker3
[metadata]
author = ultimaker
type = variant
[values]
acceleration_enabled = True
acceleration_print = 4000
brim_line_count = 7
brim_width = 7
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed = 100
cool_fan_speed_max = 100
default_material_print_temperature = 200
infill_before_walls = False
infill_overlap = 0
infill_pattern = cubic
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
jerk_wall = =math.ceil(jerk_print * 25 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
layer_height = 0.2
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_size = 0.8
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
material_standby_temperature = 100
multiple_mesh_overlap = 0
ooze_shield_angle = 40
raft_acceleration = =acceleration_layer_0
raft_margin = 10
retract_at_layer_change = True
retraction_count_max = 25
retraction_extrusion_window = 1
retraction_hop = 2
retraction_hop_enabled = True
retraction_hop_only_when_collides = True
skin_overlap = 5
speed_equalize_flow_enabled = True
speed_layer_0 = 20
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 25 / 35)
speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
support_angle = 70
support_bottom_distance = =support_z_distance / 2
support_line_width = =line_width * 0.75
support_top_distance = =support_z_distance
support_xy_distance = =wall_line_width_0 * 1.5
support_z_distance = =layer_height * 2
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = 2

74
resources/variants/ultimaker3_bb0.8.inst.cfg Normal file
View file

@ -0,0 +1,74 @@
[general]
name = BB 0.8
version = 2
definition = ultimaker3
[metadata]
author = ultimaker
type = variant
[values]
acceleration_enabled = True
acceleration_print = 4000
acceleration_support_interface = =math.ceil(acceleration_topbottom * 100 / 500)
brim_width = 3
cool_fan_speed = 50
cool_min_speed = 5
infill_line_width = =round(line_width * 0.8 / 0.7, 2)
infill_overlap = 0
infill_pattern = triangles
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
jerk_support_interface = =math.ceil(jerk_topbottom * 1 / 5)
layer_height = 0.2
machine_min_cool_heat_time_window = 15
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_size = 0.8
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
raft_acceleration = =acceleration_layer_0
raft_airgap = 0
raft_base_speed = 20
raft_base_thickness = 0.3
raft_interface_line_spacing = 0.5
raft_interface_line_width = 0.5
raft_interface_speed = 20
raft_interface_thickness = 0.2
raft_margin = 10
raft_speed = 25
raft_surface_layers = 1
retraction_amount = 4.5
retraction_count_max = 15
retraction_hop = 2
retraction_hop_enabled = True
retraction_hop_only_when_collides = True
retraction_min_travel = 5
retraction_prime_speed = 15
skin_overlap = 5
speed_layer_0 = 20
speed_print = 35
speed_support_interface = =math.ceil(speed_topbottom * 15 / 20)
speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
support_angle = 60
support_bottom_height = =layer_height * 2
support_bottom_stair_step_height = =layer_height
support_infill_rate = 25
support_interface_enable = True
support_interface_height = =layer_height * 5
support_join_distance = 3
support_line_width = =round(line_width * 0.4 / 0.35, 2)
support_offset = 1.5
support_pattern = triangles
support_use_towers = False
support_xy_distance = =wall_line_width_0 / 2
support_xy_distance_overhang = =wall_line_width_0 / 4
support_z_distance = 0
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
wall_thickness = 1

64
resources/variants/ultimaker3_extended_aa0.8.inst.cfg Normal file
View file

@ -0,0 +1,64 @@
[general]
name = AA 0.8
version = 2
definition = ultimaker3_extended
[metadata]
author = ultimaker
type = variant
[values]
acceleration_enabled = True
acceleration_print = 4000
brim_line_count = 7
brim_width = 7
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed = 100
cool_fan_speed_max = 100
default_material_print_temperature = 200
infill_before_walls = False
infill_overlap = 0
infill_pattern = cubic
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
jerk_wall = =math.ceil(jerk_print * 25 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
layer_height = 0.2
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_size = 0.8
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
material_standby_temperature = 100
multiple_mesh_overlap = 0
ooze_shield_angle = 40
raft_acceleration = =acceleration_layer_0
raft_margin = 10
retract_at_layer_change = True
retraction_count_max = 25
retraction_extrusion_window = 1
retraction_hop = 2
retraction_hop_enabled = True
retraction_hop_only_when_collides = True
skin_overlap = 5
speed_equalize_flow_enabled = True
speed_layer_0 = 20
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 25 / 35)
speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
support_angle = 70
support_bottom_distance = =support_z_distance / 2
support_line_width = =line_width * 0.75
support_top_distance = =support_z_distance
support_xy_distance = =wall_line_width_0 * 1.5
support_z_distance = =layer_height * 2
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = 2

74
resources/variants/ultimaker3_extended_bb0.8.inst.cfg Normal file
View file

@ -0,0 +1,74 @@
[general]
name = BB 0.8
version = 2
definition = ultimaker3_extended
[metadata]
author = ultimaker
type = variant
[values]
acceleration_enabled = True
acceleration_print = 4000
acceleration_support_interface = =math.ceil(acceleration_topbottom * 100 / 500)
brim_width = 3
cool_fan_speed = 50
cool_min_speed = 5
infill_line_width = =round(line_width * 0.8 / 0.7, 2)
infill_overlap = 0
infill_pattern = triangles
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
jerk_support_interface = =math.ceil(jerk_topbottom * 1 / 5)
layer_height = 0.2
machine_min_cool_heat_time_window = 15
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_size = 0.8
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
raft_acceleration = =acceleration_layer_0
raft_airgap = 0
raft_base_speed = 20
raft_base_thickness = 0.3
raft_interface_line_spacing = 0.5
raft_interface_line_width = 0.5
raft_interface_speed = 20
raft_interface_thickness = 0.2
raft_margin = 10
raft_speed = 25
raft_surface_layers = 1
retraction_amount = 4.5
retraction_count_max = 15
retraction_hop = 2
retraction_hop_enabled = True
retraction_hop_only_when_collides = True
retraction_min_travel = 5
retraction_prime_speed = 15
skin_overlap = 5
speed_layer_0 = 20
speed_print = 35
speed_support_interface = =math.ceil(speed_topbottom * 15 / 20)
speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
support_angle = 60
support_bottom_height = =layer_height * 2
support_bottom_stair_step_height = =layer_height
support_infill_rate = 25
support_interface_enable = True
support_interface_height = =layer_height * 5
support_join_distance = 3
support_line_width = =round(line_width * 0.4 / 0.35, 2)
support_offset = 1.5
support_pattern = triangles
support_use_towers = False
support_xy_distance = =wall_line_width_0 / 2
support_xy_distance_overhang = =wall_line_width_0 / 4
support_z_distance = 0
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
wall_thickness = 1