mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 22:35:03 -06:00
Merge branch 'master' into feature_multiple_BP
This commit is contained in:
Diego Prado Gesto
commit
da4c98b204
194 changed files with 6801 additions and 5633 deletions
|
|
@ -47,9 +47,9 @@
|
|||
"default_value": 30
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG29 ;Auto Level\nG1 Z0.6 F{travel_speed} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0 ;zero the extruded length\nG1 X10 E30 F500 ;printing a Line from right to left\nG92 E0 ;zero the extruded length again\nG1 Z2\nG1 F{travel_speed}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" },
|
||||
"default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG29 ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0 ;zero the extruded length\nG1 X10 E30 F500 ;printing a Line from right to left\nG92 E0 ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" },
|
||||
"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 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
|
||||
"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 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@
|
|||
"default_value": "RepRap"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;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 max endstops\nG1 Z115.0 F{travel_speed} ;move th e platform up 20mm\nG28 Z0 ;move Z to max endstop\nG1 Z15.0 F{travel_speed} ;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 F{travel_speed}\nM301 H1 P26.38 I2.57 D67.78\n;Put printing message on LCD screen\nM117 Printing..."
|
||||
"default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;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 max endstops\nG1 Z115.0 F{speed_travel} ;move th e platform up 20mm\nG28 Z0 ;move Z to max endstop\nG1 Z15.0 F{speed_travel} ;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 F{speed_travel}\nM301 H1 P26.38 I2.57 D67.78\n;Put printing message on LCD screen\nM117 Printing..."
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": ";End GCode\nM104 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 F{travel_speed} ;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\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
|
||||
"default_value": ";End GCode\nM104 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 F{speed_travel} ;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\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,55 +1,69 @@
|
|||
{
|
||||
"version":2,
|
||||
"name":"Anycubic i3 Mega",
|
||||
"inherits":"fdmprinter",
|
||||
"metadata":{
|
||||
"visible":true,
|
||||
"author":"TheTobby",
|
||||
"manufacturer":"Anycubic",
|
||||
"file_formats":"text/x-gcode",
|
||||
"icon":"icon_ultimaker2",
|
||||
"platform":"anycubic_i3_mega_platform.stl",
|
||||
"has_materials": false,
|
||||
"has_machine_quality": true,
|
||||
"preferred_quality": "*normal*"
|
||||
"version": 2,
|
||||
"name": "Anycubic i3 Mega",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata":
|
||||
{
|
||||
"visible": true,
|
||||
"author": "TheTobby",
|
||||
"manufacturer": "Anycubic",
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2",
|
||||
"platform": "anycubic_i3_mega_platform.stl",
|
||||
"has_materials": false,
|
||||
"has_machine_quality": true,
|
||||
"preferred_quality": "*normal*"
|
||||
},
|
||||
|
||||
"overrides":{
|
||||
"machine_name":{
|
||||
"default_value":"Anycubic i3 Mega"
|
||||
|
||||
"overrides":
|
||||
{
|
||||
"machine_name":
|
||||
{
|
||||
"default_value": "Anycubic i3 Mega"
|
||||
},
|
||||
"machine_heated_bed":{
|
||||
"default_value":true
|
||||
"machine_heated_bed":
|
||||
{
|
||||
"default_value": true
|
||||
},
|
||||
"machine_width":{
|
||||
"default_value":210
|
||||
"machine_width":
|
||||
{
|
||||
"default_value": 210
|
||||
},
|
||||
"machine_height":{
|
||||
"default_value":205
|
||||
"machine_height":
|
||||
{
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_depth":{
|
||||
"default_value":210
|
||||
"machine_depth":
|
||||
{
|
||||
"default_value": 210
|
||||
},
|
||||
"machine_center_is_zero":{
|
||||
"default_value":false
|
||||
"machine_center_is_zero":
|
||||
{
|
||||
"default_value": false
|
||||
},
|
||||
"machine_nozzle_size":{
|
||||
"default_value":0.4
|
||||
"machine_nozzle_size":
|
||||
{
|
||||
"default_value": 0.4
|
||||
},
|
||||
"material_diameter":{
|
||||
"default_value":1.75
|
||||
"material_diameter":
|
||||
{
|
||||
"default_value": 1.75
|
||||
},
|
||||
"gantry_height":{
|
||||
"default_value":0
|
||||
"gantry_height":
|
||||
{
|
||||
"default_value": 0
|
||||
},
|
||||
"machine_gcode_flavor":{
|
||||
"default_value":"RepRap (Marlin/Sprinter)"
|
||||
"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 F{travel_speed} ;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 F{travel_speed}\nM117 Printing...\nG5"
|
||||
"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 F{speed_travel} ;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 F{speed_travel}\nM117 Printing...\nG5"
|
||||
},
|
||||
"machine_end_gcode":{
|
||||
"default_value":"M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
|
||||
"machine_end_gcode":
|
||||
{
|
||||
"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
},
|
||||
"overrides": {
|
||||
"machine_start_gcode": {
|
||||
"default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 \nG29 Z0.12 ;Auto-bedleveling with Z offset \nG92 E0 ;zero the extruded length \nG1 F2000 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\nM117 Printing...\n; -- end of START GCODE --"
|
||||
"default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 \nG29 Z0.12 ;Auto-bedleveling with Z offset \nG92 E0 ;zero the extruded length \nG1 F2000 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\n; -- end of START GCODE --"
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "; -- START GCODE --\nG28 ; Home all axes\nM104 S0 ;extruder heater off\n;M140 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\n;M84 ;steppers off\nG90 ;absolute positioning\n; -- end of START GCODE --"
|
||||
|
|
|
|||
|
|
@ -3664,7 +3664,7 @@
|
|||
"minimum_value": "0",
|
||||
"maximum_value_warning": "100",
|
||||
"default_value": 15,
|
||||
"value": "15 if support_enable else 0",
|
||||
"value": "15 if support_enable else 0 if support_tree_enable else 15",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
|
|
@ -4264,6 +4264,18 @@
|
|||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"enabled": "support_enable and support_use_towers",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_mesh_drop_down":
|
||||
{
|
||||
"label": "Drop Down Support Mesh",
|
||||
"description": "Make support everywhere below the support mesh, so that there's no overhang in the support mesh.",
|
||||
"type": "bool",
|
||||
"default_value": true,
|
||||
"enabled": "support_mesh",
|
||||
"settable_per_mesh": true,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false,
|
||||
"settable_globally": false
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -5292,18 +5304,6 @@
|
|||
"settable_per_meshgroup": false,
|
||||
"settable_globally": false
|
||||
},
|
||||
"support_mesh_drop_down":
|
||||
{
|
||||
"label": "Drop Down Support Mesh",
|
||||
"description": "Make support everywhere below the support mesh, so that there's no overhang in the support mesh.",
|
||||
"type": "bool",
|
||||
"default_value": true,
|
||||
"enabled": "support_mesh",
|
||||
"settable_per_mesh": true,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false,
|
||||
"settable_globally": false
|
||||
},
|
||||
"anti_overhang_mesh":
|
||||
{
|
||||
"label": "Anti Overhang Mesh",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
"id": "malyan_m180",
|
||||
"version": 2,
|
||||
"name": "Malyan M180",
|
||||
"inherits": "fdmprinter",
|
||||
85
resources/definitions/malyan_m200.def.json
Normal file
85
resources/definitions/malyan_m200.def.json
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{
|
||||
"id": "malyan_m200",
|
||||
"version": 2,
|
||||
"name": "Malyan M200",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"author": "Brian Corbino, Tyler Gibson",
|
||||
"manufacturer": "Malyan",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode",
|
||||
"platform": "malyan_m200_platform.stl",
|
||||
"has_machine_quality": true,
|
||||
"has_materials": true,
|
||||
"preferred_quality": "*normal*",
|
||||
"supports_usb_connection": true,
|
||||
"visible": true,
|
||||
"first_start_actions": ["MachineSettingsAction"],
|
||||
"supported_actions": ["MachineSettingsAction"]
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"machine_name": { "default_value": "Malyan M200" },
|
||||
"speed_print": { "default_value": 50 },
|
||||
"speed_wall_0": { "value": "round(speed_print * 0.75, 2)" },
|
||||
"speed_wall_x": { "value": "speed_print" },
|
||||
"speed_support": { "value": "speed_wall_0" },
|
||||
"speed_layer_0": { "value": "round(speed_print / 2.0, 2)" },
|
||||
"speed_travel": { "default_value": 50 },
|
||||
"speed_travel_layer_0": { "default_value": 40 },
|
||||
"speed_infill": { "value": "speed_print" },
|
||||
"speed_topbottom": {"value": "speed_print / 2"},
|
||||
|
||||
"layer_height": { "minimum_value": "0.04375", "maximum_value": "machine_nozzle_size * 0.875", "maximum_value_warning": "machine_nozzle_size * 0.48125 + 0.0875", "default_value": 0.13125 },
|
||||
"line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
|
||||
|
||||
"material_print_temperature": { "minimum_value": "0" },
|
||||
"material_print_temperature_layer_0": { "value": "min(material_print_temperature + 5, 245)" },
|
||||
"material_bed_temperature": { "minimum_value": "0" },
|
||||
"material_bed_temperature_layer_0": { "value": "min(material_bed_temperature + 5, 70)" },
|
||||
"material_standby_temperature": { "minimum_value": "0" },
|
||||
"machine_show_variants": { "default_value": true },
|
||||
"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;(Home the printer)\nG92 E0;(Reset the extruder to 0)\nG0 Z5 E5 F500;(Move up and prime the nozzle)\nG0 X-1 Z0;(Move outside the printable area)\nG1 Y60 E8 F500;(Draw a priming/wiping line to the rear)\nG1 X-1;(Move a little closer to the print area)\nG1 Y10 E16 F500;(draw more priming/wiping)\nG1 E15 F250;(Small retract)\nG92 E0;(Zero the extruder)"
|
||||
},
|
||||
"machine_end_gcode" : {
|
||||
"default_value": "G0 X0 Y127;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)"
|
||||
},
|
||||
"machine_width": { "default_value": 120 },
|
||||
"machine_depth": { "default_value": 120 },
|
||||
"machine_height": { "default_value": 120 },
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
"machine_center_is_zero": { "default_value": false },
|
||||
"material_diameter": { "value": 1.75 },
|
||||
"machine_nozzle_size": {
|
||||
"default_value": 0.4,
|
||||
"minimum_value": 0.15
|
||||
},
|
||||
"machine_max_feedrate_x": { "default_value": 150 },
|
||||
"machine_max_feedrate_y": { "default_value": 150 },
|
||||
"machine_max_feedrate_z": { "default_value": 1.5 },
|
||||
"machine_max_feedrate_e": { "default_value": 100 },
|
||||
"machine_max_acceleration_x": { "default_value": 800 },
|
||||
"machine_max_acceleration_y": { "default_value": 800 },
|
||||
"machine_max_acceleration_z": { "default_value": 20 },
|
||||
"machine_max_acceleration_e": { "default_value": 10000 },
|
||||
"machine_max_jerk_xy": { "default_value": 20 },
|
||||
"machine_max_jerk_z": { "default_value": 0.4 },
|
||||
"machine_max_jerk_e": { "default_value": 5},
|
||||
"adhesion_type": { "default_value": "raft" },
|
||||
"raft_margin": { "default_value": 5 },
|
||||
"raft_airgap": { "default_value": 0.2625 },
|
||||
"raft_base_thickness": { "value": "0.30625" },
|
||||
"raft_interface_thickness": { "value": "0.21875" },
|
||||
"raft_surface_layers": { "default_value": 1 },
|
||||
"skirt_line_count": { "default_value": 2},
|
||||
"brim_width" : { "default_value": 5},
|
||||
"start_layers_at_same_position": { "default_value": true},
|
||||
"retraction_combing": { "default_value": "noskin" },
|
||||
"retraction_amount" : { "default_value": 4.5},
|
||||
"retraction_speed" : { "default_value": 40},
|
||||
"coasting_enable": { "default_value": true },
|
||||
"prime_tower_enable": { "default_value": false}
|
||||
}
|
||||
}
|
||||
18
resources/definitions/monoprice_select_mini_v1.def.json
Normal file
18
resources/definitions/monoprice_select_mini_v1.def.json
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"id": "monoprice_select_mini_v1",
|
||||
"version": 2,
|
||||
"name": "Monoprice Select Mini V1",
|
||||
"inherits": "malyan_m200",
|
||||
"metadata": {
|
||||
"author": "Brian Corbino, Tyler Gibson",
|
||||
"manufacturer": "Monoprice",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode",
|
||||
"quality_definition": "malyan_m200",
|
||||
"visible": true
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"machine_name": { "default_value": "Monoprice Select Mini V1" }
|
||||
}
|
||||
}
|
||||
25
resources/definitions/monoprice_select_mini_v2.def.json
Normal file
25
resources/definitions/monoprice_select_mini_v2.def.json
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{
|
||||
"id": "monoprice_select_mini_v2",
|
||||
"version": 2,
|
||||
"name": "Monoprice Select Mini V2 (E3D)",
|
||||
"inherits": "malyan_m200",
|
||||
"metadata": {
|
||||
"author": "Tyler Gibson",
|
||||
"manufacturer": "Monoprice",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode",
|
||||
"has_machine_quality": true,
|
||||
"has_materials": true,
|
||||
"preferred_quality": "*normal*",
|
||||
"visible": true
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"machine_name": { "default_value": "Monoprice Select Mini V2" },
|
||||
"adhesion_type": { "default_value": "brim" },
|
||||
"retraction_combing": { "default_value": "noskin" },
|
||||
"retraction_amount" : { "default_value": 2.5},
|
||||
"retraction_speed" : { "default_value": 40},
|
||||
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }
|
||||
}
|
||||
}
|
||||
|
|
@ -8,46 +8,59 @@
|
|||
"manufacturer": "Tevo",
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2",
|
||||
"has_materials": false,
|
||||
"has_materials": false,
|
||||
"has_machine_quality": true,
|
||||
"platform": "prusai3_platform.stl",
|
||||
"preferred_quality": "*normal*"
|
||||
"platform": "tevo_blackwidow.stl",
|
||||
"preferred_quality": "*normal*"
|
||||
},
|
||||
"overrides": {
|
||||
"machine_name": {
|
||||
"overrides":
|
||||
{
|
||||
"machine_name":
|
||||
{
|
||||
"default_value": "Tevo Black Widow"
|
||||
},
|
||||
"machine_heated_bed": {
|
||||
"machine_heated_bed":
|
||||
{
|
||||
"default_value": true
|
||||
},
|
||||
"machine_width": {
|
||||
"machine_width":
|
||||
{
|
||||
"default_value": 350
|
||||
},
|
||||
"machine_height": {
|
||||
"machine_height":
|
||||
{
|
||||
"default_value": 250
|
||||
},
|
||||
"machine_depth": {
|
||||
"machine_depth":
|
||||
{
|
||||
"default_value": 250
|
||||
},
|
||||
"machine_center_is_zero": {
|
||||
"machine_center_is_zero":
|
||||
{
|
||||
"default_value": false
|
||||
},
|
||||
"machine_nozzle_size": {
|
||||
"machine_nozzle_size":
|
||||
{
|
||||
"default_value": 0.4
|
||||
},
|
||||
"material_diameter": {
|
||||
"default_value": 1.75
|
||||
"material_diameter":
|
||||
{
|
||||
"default_value": 1.75
|
||||
},
|
||||
"gantry_height": {
|
||||
"gantry_height":
|
||||
{
|
||||
"default_value": 0
|
||||
},
|
||||
"machine_gcode_flavor": {
|
||||
"machine_gcode_flavor":
|
||||
{
|
||||
"default_value": "RepRap (Marlin/Sprinter)"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"machine_start_gcode":
|
||||
{
|
||||
"default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\nM420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\nG28 ; home all\nG29 ; probe bed\nG92 E0 ;zero the extruded length\nG1 X0.0 Y50.0 Z10.0 F3600\n; perform wipe and prime\nG1 Z0.0 F1000\nG1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\nG1 Y100.0 E12.5 F1000.0 ; prime\nG92 E0 ; zero extruder again\nM117 Printing..."
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"machine_end_gcode":
|
||||
{
|
||||
"default_value": "G92 E0 ; zero the extruded length again\nG1 E-1.5 F500 ; retract the filament to release some of the pressure\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nG28 X0 ; home X axis\nG1 Y245 ; move Y axis to end position\nM84 ; disable motors\nM107 ; turn off fan"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
resources/meshes/malyan_m200_platform.stl
Normal file
BIN
resources/meshes/malyan_m200_platform.stl
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -396,6 +396,29 @@ UM.MainWindow
|
|||
anchors.top: parent.top
|
||||
}
|
||||
|
||||
Loader
|
||||
{
|
||||
id: main
|
||||
|
||||
anchors
|
||||
{
|
||||
top: topbar.bottom
|
||||
bottom: parent.bottom
|
||||
left: parent.left
|
||||
right: sidebar.left
|
||||
}
|
||||
|
||||
MouseArea
|
||||
{
|
||||
visible: UM.Controller.activeStage.mainComponent != ""
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.AllButtons
|
||||
onWheel: wheel.accepted = true
|
||||
}
|
||||
|
||||
source: UM.Controller.activeStage.mainComponent
|
||||
}
|
||||
|
||||
Loader
|
||||
{
|
||||
id: sidebar
|
||||
|
|
@ -456,29 +479,6 @@ UM.MainWindow
|
|||
}
|
||||
}
|
||||
|
||||
Loader
|
||||
{
|
||||
id: main
|
||||
|
||||
anchors
|
||||
{
|
||||
top: topbar.bottom
|
||||
bottom: parent.bottom
|
||||
left: parent.left
|
||||
right: sidebar.left
|
||||
}
|
||||
|
||||
MouseArea
|
||||
{
|
||||
visible: UM.Controller.activeStage.mainComponent != ""
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.AllButtons
|
||||
onWheel: wheel.accepted = true
|
||||
}
|
||||
|
||||
source: UM.Controller.activeStage.mainComponent
|
||||
}
|
||||
|
||||
UM.MessageStack
|
||||
{
|
||||
anchors
|
||||
|
|
|
|||
|
|
@ -17,15 +17,39 @@ Item
|
|||
|
||||
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
|
||||
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
|
||||
property real progress: printerConnected ? Cura.MachineManager.printerOutputDevices[0].progress : 0
|
||||
property var activePrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0].activePrinter : null
|
||||
property var activePrintJob: activePrinter ? activePrinter.activePrintJob: null
|
||||
property real progress:
|
||||
{
|
||||
if(!printerConnected)
|
||||
{
|
||||
return 0
|
||||
}
|
||||
if(activePrinter == null)
|
||||
{
|
||||
return 0
|
||||
}
|
||||
if(activePrintJob == null)
|
||||
{
|
||||
return 0
|
||||
}
|
||||
if(activePrintJob.timeTotal == 0)
|
||||
{
|
||||
return 0 // Prevent devision by 0
|
||||
}
|
||||
return activePrintJob.timeElapsed / activePrintJob.timeTotal * 100
|
||||
}
|
||||
|
||||
property int backendState: UM.Backend.state
|
||||
|
||||
property bool showProgress: {
|
||||
// determine if we need to show the progress bar + percentage
|
||||
if(!printerConnected || !printerAcceptsCommands) {
|
||||
if(activePrintJob == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
|
||||
switch(base.activePrintJob.state)
|
||||
{
|
||||
case "printing":
|
||||
case "paused":
|
||||
|
|
@ -46,18 +70,23 @@ Item
|
|||
|
||||
property variant statusColor:
|
||||
{
|
||||
if(!printerConnected || !printerAcceptsCommands)
|
||||
if(!printerConnected || !printerAcceptsCommands || activePrinter == null)
|
||||
{
|
||||
return UM.Theme.getColor("text");
|
||||
}
|
||||
|
||||
switch(Cura.MachineManager.printerOutputDevices[0].printerState)
|
||||
switch(activePrinter.state)
|
||||
{
|
||||
case "maintenance":
|
||||
return UM.Theme.getColor("status_busy");
|
||||
case "error":
|
||||
return UM.Theme.getColor("status_stopped");
|
||||
}
|
||||
|
||||
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
|
||||
if(base.activePrintJob == null)
|
||||
{
|
||||
return UM.Theme.getColor("text");
|
||||
}
|
||||
switch(base.activePrintJob.state)
|
||||
{
|
||||
case "printing":
|
||||
case "pre_print":
|
||||
|
|
@ -84,17 +113,30 @@ Item
|
|||
property string statusText:
|
||||
{
|
||||
if(!printerConnected)
|
||||
{
|
||||
return catalog.i18nc("@label:MonitorStatus", "Not connected to a printer");
|
||||
}
|
||||
if(!printerAcceptsCommands)
|
||||
{
|
||||
return catalog.i18nc("@label:MonitorStatus", "Printer does not accept commands");
|
||||
}
|
||||
|
||||
var printerOutputDevice = Cura.MachineManager.printerOutputDevices[0]
|
||||
|
||||
if(printerOutputDevice.printerState == "maintenance")
|
||||
if(activePrinter == null)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
if(activePrinter.state == "maintenance")
|
||||
{
|
||||
return catalog.i18nc("@label:MonitorStatus", "In maintenance. Please check the printer");
|
||||
}
|
||||
switch(printerOutputDevice.jobState)
|
||||
|
||||
if(base.activePrintJob == null)
|
||||
{
|
||||
return " "
|
||||
}
|
||||
|
||||
switch(base.activePrintJob.state)
|
||||
{
|
||||
case "offline":
|
||||
return catalog.i18nc("@label:MonitorStatus", "Lost connection with the printer");
|
||||
|
|
@ -162,7 +204,11 @@ Item
|
|||
{
|
||||
return false;
|
||||
}
|
||||
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
|
||||
if(base.activePrintJob == null)
|
||||
{
|
||||
return false
|
||||
}
|
||||
switch(base.activePrintJob.state)
|
||||
{
|
||||
case "pausing":
|
||||
case "resuming":
|
||||
|
|
@ -184,7 +230,8 @@ Item
|
|||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
|
||||
}
|
||||
|
||||
Row {
|
||||
Row
|
||||
{
|
||||
id: buttonsRow
|
||||
height: abortButton.height
|
||||
anchors.top: progressBar.bottom
|
||||
|
|
@ -193,7 +240,8 @@ Item
|
|||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
Row {
|
||||
Row
|
||||
{
|
||||
id: additionalComponentsRow
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
|
|
@ -224,19 +272,17 @@ Item
|
|||
property bool userClicked: false
|
||||
property string lastJobState: ""
|
||||
|
||||
visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canPause
|
||||
enabled: (!userClicked) && printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
|
||||
(["paused", "printing"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
|
||||
visible: printerConnected && activePrinter != null &&activePrinter.canPause
|
||||
enabled: (!userClicked) && printerConnected && printerAcceptsCommands && activePrintJob != null &&
|
||||
(["paused", "printing"].indexOf(activePrintJob.state) >= 0)
|
||||
|
||||
text: {
|
||||
var result = "";
|
||||
if (!printerConnected)
|
||||
if (!printerConnected || activePrintJob == null)
|
||||
{
|
||||
return "";
|
||||
return catalog.i18nc("@label:", "Pause");
|
||||
}
|
||||
var jobState = Cura.MachineManager.printerOutputDevices[0].jobState;
|
||||
|
||||
if (jobState == "paused")
|
||||
if (activePrintJob.state == "paused")
|
||||
{
|
||||
return catalog.i18nc("@label:", "Resume");
|
||||
}
|
||||
|
|
@ -247,14 +293,17 @@ Item
|
|||
}
|
||||
onClicked:
|
||||
{
|
||||
var current_job_state = Cura.MachineManager.printerOutputDevices[0].jobState
|
||||
if(current_job_state == "paused")
|
||||
if(activePrintJob == null)
|
||||
{
|
||||
Cura.MachineManager.printerOutputDevices[0].setJobState("print");
|
||||
return // Do nothing!
|
||||
}
|
||||
else if(current_job_state == "printing")
|
||||
if(activePrintJob.state == "paused")
|
||||
{
|
||||
Cura.MachineManager.printerOutputDevices[0].setJobState("pause");
|
||||
activePrintJob.setState("print");
|
||||
}
|
||||
else if(activePrintJob.state == "printing")
|
||||
{
|
||||
activePrintJob.setState("pause");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -265,9 +314,9 @@ Item
|
|||
{
|
||||
id: abortButton
|
||||
|
||||
visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canAbort
|
||||
enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
|
||||
(["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)
|
||||
visible: printerConnected && activePrinter != null && activePrinter.canAbort
|
||||
enabled: printerConnected && printerAcceptsCommands && activePrintJob != null &&
|
||||
(["paused", "printing", "pre_print"].indexOf(activePrintJob.state) >= 0)
|
||||
|
||||
height: UM.Theme.getSize("save_button_save_to_button").height
|
||||
|
||||
|
|
@ -286,7 +335,7 @@ Item
|
|||
text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
|
||||
standardButtons: StandardButton.Yes | StandardButton.No
|
||||
Component.onCompleted: visible = false
|
||||
onYes: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
|
||||
onYes: activePrintJob.setState("abort")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ UM.ManagementPage
|
|||
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
|
||||
property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null
|
||||
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
|
||||
|
||||
property var printJob: connectedPrinter != null ? connectedPrinter.activePrintJob: null
|
||||
Label
|
||||
{
|
||||
text: catalog.i18nc("@label", "Printer type:")
|
||||
|
|
@ -178,7 +178,12 @@ UM.ManagementPage
|
|||
return "";
|
||||
}
|
||||
|
||||
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
|
||||
if (machineInfo.printJob == null)
|
||||
{
|
||||
return catalog.i18nc("@label:MonitorStatus", "Waiting for a printjob");
|
||||
}
|
||||
|
||||
switch(machineInfo.printJob.state)
|
||||
{
|
||||
case "printing":
|
||||
return catalog.i18nc("@label:MonitorStatus", "Printing...");
|
||||
|
|
@ -194,10 +199,9 @@ UM.ManagementPage
|
|||
return catalog.i18nc("@label:MonitorStatus", "In maintenance. Please check the printer");
|
||||
case "abort": // note sure if this jobState actually occurs in the wild
|
||||
return catalog.i18nc("@label:MonitorStatus", "Aborting print...");
|
||||
case "ready": // ready to print or getting ready
|
||||
case "": // ready to print or getting ready
|
||||
return catalog.i18nc("@label:MonitorStatus", "Waiting for a printjob");
|
||||
|
||||
}
|
||||
return ""
|
||||
}
|
||||
visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId && machineInfo.printerAcceptsCommands
|
||||
wrapMode: Text.WordWrap
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ TabView
|
|||
width: scrollView.columnWidth;
|
||||
text: properties.name;
|
||||
readOnly: !base.editingEnabled;
|
||||
onEditingFinished: base.setName(properties.name, text)
|
||||
onEditingFinished: base.updateMaterialDisplayName(properties.name, text)
|
||||
}
|
||||
|
||||
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
|
||||
|
|
@ -82,11 +82,7 @@ TabView
|
|||
width: scrollView.columnWidth;
|
||||
text: properties.supplier;
|
||||
readOnly: !base.editingEnabled;
|
||||
onEditingFinished:
|
||||
{
|
||||
base.setMetaDataEntry("brand", properties.supplier, text);
|
||||
pane.objectList.currentIndex = pane.getIndexById(base.containerId);
|
||||
}
|
||||
onEditingFinished: base.updateMaterialSupplier(properties.supplier, text)
|
||||
}
|
||||
|
||||
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
|
||||
|
|
@ -95,23 +91,17 @@ TabView
|
|||
width: scrollView.columnWidth;
|
||||
text: properties.material_type;
|
||||
readOnly: !base.editingEnabled;
|
||||
onEditingFinished:
|
||||
{
|
||||
base.setMetaDataEntry("material", properties.material_type, text);
|
||||
pane.objectList.currentIndex = pane.getIndexById(base.containerId)
|
||||
}
|
||||
onEditingFinished: base.updateMaterialType(properties.material_type, text)
|
||||
}
|
||||
|
||||
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
|
||||
|
||||
Row
|
||||
{
|
||||
width: scrollView.columnWidth;
|
||||
height: parent.rowHeight;
|
||||
Row {
|
||||
width: scrollView.columnWidth
|
||||
height: parent.rowHeight
|
||||
spacing: Math.floor(UM.Theme.getSize("default_margin").width/2)
|
||||
|
||||
Rectangle
|
||||
{
|
||||
// color indicator square
|
||||
Rectangle {
|
||||
id: colorSelector
|
||||
color: properties.color_code
|
||||
|
||||
|
|
@ -121,17 +111,29 @@ TabView
|
|||
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
MouseArea { anchors.fill: parent; onClicked: colorDialog.open(); enabled: base.editingEnabled }
|
||||
// open the color selection dialog on click
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: colorDialog.open()
|
||||
enabled: base.editingEnabled
|
||||
}
|
||||
}
|
||||
ReadOnlyTextField
|
||||
{
|
||||
|
||||
// pretty color name text field
|
||||
ReadOnlyTextField {
|
||||
id: colorLabel;
|
||||
text: properties.color_name;
|
||||
readOnly: !base.editingEnabled
|
||||
onEditingFinished: base.setMetaDataEntry("color_name", properties.color_name, text)
|
||||
}
|
||||
|
||||
ColorDialog { id: colorDialog; color: properties.color_code; onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color) }
|
||||
// popup dialog to select a new color
|
||||
// if successful it sets the properties.color_code value to the new color
|
||||
ColorDialog {
|
||||
id: colorDialog
|
||||
color: properties.color_code
|
||||
onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color)
|
||||
}
|
||||
}
|
||||
|
||||
Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
|
||||
|
|
@ -401,11 +403,11 @@ TabView
|
|||
}
|
||||
|
||||
// Tiny convenience function to check if a value really changed before trying to set it.
|
||||
function setMetaDataEntry(entry_name, old_value, new_value)
|
||||
{
|
||||
if(old_value != new_value)
|
||||
{
|
||||
Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, entry_name, new_value);
|
||||
function setMetaDataEntry(entry_name, old_value, new_value) {
|
||||
if (old_value != new_value) {
|
||||
Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, entry_name, new_value)
|
||||
// make sure the UI properties are updated as well since we don't re-fetch the entire model here
|
||||
properties[entry_name] = new_value
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -435,14 +437,28 @@ TabView
|
|||
return 0;
|
||||
}
|
||||
|
||||
function setName(old_value, new_value)
|
||||
{
|
||||
if(old_value != new_value)
|
||||
{
|
||||
Cura.ContainerManager.setContainerName(base.containerId, new_value);
|
||||
// update material name label. not so pretty, but it works
|
||||
materialProperties.name = new_value;
|
||||
pane.objectList.currentIndex = pane.getIndexById(base.containerId)
|
||||
// update the display name of the material
|
||||
function updateMaterialDisplayName (old_name, new_name) {
|
||||
|
||||
// don't change when new name is the same
|
||||
if (old_name == new_name) {
|
||||
return
|
||||
}
|
||||
|
||||
// update the values
|
||||
Cura.ContainerManager.setContainerName(base.containerId, new_name)
|
||||
materialProperties.name = new_name
|
||||
}
|
||||
|
||||
// update the type of the material
|
||||
function updateMaterialType (old_type, new_type) {
|
||||
base.setMetaDataEntry("material", old_type, new_type)
|
||||
materialProperties.material_type = new_type
|
||||
}
|
||||
|
||||
// update the supplier of the material
|
||||
function updateMaterialSupplier (old_supplier, new_supplier) {
|
||||
base.setMetaDataEntry("brand", old_supplier, new_supplier)
|
||||
materialProperties.supplier = new_supplier
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,93 +132,73 @@ UM.ManagementPage
|
|||
}
|
||||
|
||||
buttons: [
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Activate");
|
||||
|
||||
// Activate button
|
||||
Button {
|
||||
text: catalog.i18nc("@action:button", "Activate")
|
||||
iconName: "list-activate";
|
||||
enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId && Cura.MachineManager.hasMaterials
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
onClicked: {
|
||||
forceActiveFocus()
|
||||
Cura.MachineManager.setActiveMaterial(base.currentItem.id)
|
||||
currentItem = base.model.getItem(base.objectList.currentIndex) // Refresh the current item.
|
||||
}
|
||||
},
|
||||
Button
|
||||
{
|
||||
|
||||
// Create button
|
||||
Button {
|
||||
text: catalog.i18nc("@action:button", "Create")
|
||||
iconName: "list-add"
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
var material_id = Cura.ContainerManager.createMaterial()
|
||||
if(material_id == "")
|
||||
{
|
||||
return
|
||||
}
|
||||
if(Cura.MachineManager.hasMaterials)
|
||||
{
|
||||
Cura.MachineManager.setActiveMaterial(material_id)
|
||||
}
|
||||
base.objectList.currentIndex = base.getIndexById(material_id);
|
||||
onClicked: {
|
||||
forceActiveFocus()
|
||||
Cura.ContainerManager.createMaterial()
|
||||
}
|
||||
},
|
||||
Button
|
||||
{
|
||||
|
||||
// Duplicate button
|
||||
Button {
|
||||
text: catalog.i18nc("@action:button", "Duplicate");
|
||||
iconName: "list-add";
|
||||
enabled: base.currentItem != null
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
var base_file = Cura.ContainerManager.getContainerMetaDataEntry(base.currentItem.id, "base_file")
|
||||
// We need to copy the base container instead of the specific variant.
|
||||
var material_id = base_file == "" ? Cura.ContainerManager.duplicateMaterial(base.currentItem.id): Cura.ContainerManager.duplicateMaterial(base_file)
|
||||
if(material_id == "")
|
||||
{
|
||||
return
|
||||
}
|
||||
if(Cura.MachineManager.hasMaterials)
|
||||
{
|
||||
Cura.MachineManager.setActiveMaterial(material_id)
|
||||
}
|
||||
// TODO: this doesn't work because the source is a bit delayed
|
||||
base.objectList.currentIndex = base.getIndexById(material_id);
|
||||
onClicked: {
|
||||
forceActiveFocus()
|
||||
Cura.ContainerManager.duplicateOriginalMaterial(base.currentItem.id)
|
||||
}
|
||||
},
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Remove");
|
||||
iconName: "list-remove";
|
||||
|
||||
// Remove button
|
||||
Button {
|
||||
text: catalog.i18nc("@action:button", "Remove")
|
||||
iconName: "list-remove"
|
||||
enabled: base.currentItem != null && !base.currentItem.readOnly && !Cura.ContainerManager.isContainerUsed(base.currentItem.id)
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
confirmDialog.open();
|
||||
onClicked: {
|
||||
forceActiveFocus()
|
||||
confirmDialog.open()
|
||||
}
|
||||
},
|
||||
Button
|
||||
{
|
||||
text: catalog.i18nc("@action:button", "Import");
|
||||
iconName: "document-import";
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
importDialog.open();
|
||||
|
||||
// Import button
|
||||
Button {
|
||||
text: catalog.i18nc("@action:button", "Import")
|
||||
iconName: "document-import"
|
||||
onClicked: {
|
||||
forceActiveFocus()
|
||||
importDialog.open()
|
||||
}
|
||||
visible: true;
|
||||
visible: true
|
||||
},
|
||||
Button
|
||||
{
|
||||
|
||||
// Export button
|
||||
Button {
|
||||
text: catalog.i18nc("@action:button", "Export")
|
||||
iconName: "document-export"
|
||||
onClicked:
|
||||
{
|
||||
forceActiveFocus();
|
||||
exportDialog.open();
|
||||
onClicked: {
|
||||
forceActiveFocus()
|
||||
exportDialog.open()
|
||||
}
|
||||
enabled: currentItem != null
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
Item {
|
||||
|
|
|
|||
|
|
@ -213,8 +213,8 @@ UM.ManagementPage
|
|||
ProfileTab
|
||||
{
|
||||
title: catalog.i18nc("@title:tab", "Global Settings");
|
||||
quality: base.currentItem != null ? base.currentItem.id : "";
|
||||
material: Cura.MachineManager.allActiveMaterialIds[Cura.MachineManager.activeMachineId]
|
||||
quality: Cura.MachineManager.activeMachine.qualityChanges.id
|
||||
material: Cura.MachineManager.activeMachine.material.id
|
||||
}
|
||||
|
||||
Repeater
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
201
resources/qml/PrinterOutput/ExtruderBox.qml
Normal file
201
resources/qml/PrinterOutput/ExtruderBox.qml
Normal file
|
|
@ -0,0 +1,201 @@
|
|||
import QtQuick 2.2
|
||||
import QtQuick.Controls 1.1
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
import QtQuick.Layouts 1.1
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
Item
|
||||
{
|
||||
property alias color: background.color
|
||||
property var extruderModel
|
||||
property var position: index
|
||||
//width: index == machineExtruderCount.properties.value - 1 && index % 2 == 0 ? extrudersGrid.width : Math.floor(extrudersGrid.width / 2 - UM.Theme.getSize("sidebar_lining_thin").width / 2)
|
||||
implicitWidth: parent.width
|
||||
implicitHeight: UM.Theme.getSize("sidebar_extruder_box").height
|
||||
Rectangle
|
||||
{
|
||||
id: background
|
||||
anchors.fill: parent
|
||||
|
||||
Label //Extruder name.
|
||||
{
|
||||
text: Cura.ExtruderManager.getExtruderName(position) != "" ? Cura.ExtruderManager.getExtruderName(position) : catalog.i18nc("@label", "Extruder")
|
||||
color: UM.Theme.getColor("text")
|
||||
font: UM.Theme.getFont("default")
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
|
||||
Label //Target temperature.
|
||||
{
|
||||
id: extruderTargetTemperature
|
||||
text: Math.round(extruderModel.targetHotendTemperature) + "°C"
|
||||
//text: (connectedPrinter != null && connectedPrinter.hotendIds[index] != null && connectedPrinter.targetHotendTemperatures[index] != null) ? Math.round(connectedPrinter.targetHotendTemperatures[index]) + "°C" : ""
|
||||
font: UM.Theme.getFont("small")
|
||||
color: UM.Theme.getColor("text_inactive")
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.bottom: extruderTemperature.bottom
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: extruderTargetTemperatureTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: extruderTargetTemperature.mapToItem(base, 0, -parent.height / 4).y},
|
||||
catalog.i18nc("@tooltip", "The target temperature of the hotend. The hotend will heat up or cool down towards this temperature. If this is 0, the hotend heating is turned off.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Label //Temperature indication.
|
||||
{
|
||||
id: extruderTemperature
|
||||
text: Math.round(extruderModel.hotendTemperature) + "°C"
|
||||
//text: (connectedPrinter != null && connectedPrinter.hotendIds[index] != null && connectedPrinter.hotendTemperatures[index] != null) ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : ""
|
||||
color: UM.Theme.getColor("text")
|
||||
font: UM.Theme.getFont("large")
|
||||
anchors.right: extruderTargetTemperature.left
|
||||
anchors.top: parent.top
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: extruderTemperatureTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: parent.mapToItem(base, 0, -parent.height / 4).y},
|
||||
catalog.i18nc("@tooltip", "The current temperature of this extruder.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle //Material colour indication.
|
||||
{
|
||||
id: materialColor
|
||||
width: Math.floor(materialName.height * 0.75)
|
||||
height: Math.floor(materialName.height * 0.75)
|
||||
radius: width / 2
|
||||
color: extruderModel.activeMaterial ? extruderModel.activeMaterial.color: "#00000000"
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: UM.Theme.getColor("lining")
|
||||
visible: extruderModel.activeMaterial != null
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: materialName.verticalCenter
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: materialColorTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: parent.mapToItem(base, 0, -parent.height / 2).y},
|
||||
catalog.i18nc("@tooltip", "The colour of the material in this extruder.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Label //Material name.
|
||||
{
|
||||
id: materialName
|
||||
text: extruderModel.activeMaterial != null ? extruderModel.activeMaterial.type : ""
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text")
|
||||
anchors.left: materialColor.right
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: materialNameTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: parent.mapToItem(base, 0, 0).y},
|
||||
catalog.i18nc("@tooltip", "The material in this extruder.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Label //Variant name.
|
||||
{
|
||||
id: variantName
|
||||
text: extruderModel.hotendID
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text")
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: variantNameTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: parent.mapToItem(base, 0, -parent.height / 4).y},
|
||||
catalog.i18nc("@tooltip", "The nozzle inserted in this extruder.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
352
resources/qml/PrinterOutput/HeatedBedBox.qml
Normal file
352
resources/qml/PrinterOutput/HeatedBedBox.qml
Normal file
|
|
@ -0,0 +1,352 @@
|
|||
import QtQuick 2.2
|
||||
import QtQuick.Controls 1.1
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
import QtQuick.Layouts 1.1
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
Item
|
||||
{
|
||||
implicitWidth: parent.width
|
||||
height: visible ? UM.Theme.getSize("sidebar_extruder_box").height : 0
|
||||
property var printerModel
|
||||
Rectangle
|
||||
{
|
||||
color: UM.Theme.getColor("sidebar")
|
||||
anchors.fill: parent
|
||||
|
||||
Label //Build plate label.
|
||||
{
|
||||
text: catalog.i18nc("@label", "Build plate")
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text")
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
|
||||
Label //Target temperature.
|
||||
{
|
||||
id: bedTargetTemperature
|
||||
text: printerModel != null ? printerModel.targetBedTemperature + "°C" : ""
|
||||
font: UM.Theme.getFont("small")
|
||||
color: UM.Theme.getColor("text_inactive")
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.bottom: bedCurrentTemperature.bottom
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: bedTargetTemperatureTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: bedTargetTemperature.mapToItem(base, 0, -parent.height / 4).y},
|
||||
catalog.i18nc("@tooltip", "The target temperature of the heated bed. The bed will heat up or cool down towards this temperature. If this is 0, the bed heating is turned off.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Label //Current temperature.
|
||||
{
|
||||
id: bedCurrentTemperature
|
||||
text: printerModel != null ? printerModel.bedTemperature + "°C" : ""
|
||||
font: UM.Theme.getFont("large")
|
||||
color: UM.Theme.getColor("text")
|
||||
anchors.right: bedTargetTemperature.left
|
||||
anchors.top: parent.top
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
|
||||
MouseArea //For tooltip.
|
||||
{
|
||||
id: bedTemperatureTooltipArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: bedCurrentTemperature.mapToItem(base, 0, -parent.height / 4).y},
|
||||
catalog.i18nc("@tooltip", "The current temperature of the heated bed.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Rectangle //Input field for pre-heat temperature.
|
||||
{
|
||||
id: preheatTemperatureControl
|
||||
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error_background") : UM.Theme.getColor("setting_validation_ok")
|
||||
property var showError:
|
||||
{
|
||||
if(bedTemperature.properties.maximum_value != "None" && bedTemperature.properties.maximum_value < Math.floor(preheatTemperatureInput.text))
|
||||
{
|
||||
return true;
|
||||
} else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
enabled:
|
||||
{
|
||||
if (printerModel == null)
|
||||
{
|
||||
return false; //Can't preheat if not connected.
|
||||
}
|
||||
if (!connectedPrinter.acceptsCommands)
|
||||
{
|
||||
return false; //Not allowed to do anything.
|
||||
}
|
||||
if (connectedPrinter.jobState == "printing" || connectedPrinter.jobState == "pre_print" || connectedPrinter.jobState == "resuming" || connectedPrinter.jobState == "pausing" || connectedPrinter.jobState == "paused" || connectedPrinter.jobState == "error" || connectedPrinter.jobState == "offline")
|
||||
{
|
||||
return false; //Printer is in a state where it can't react to pre-heating.
|
||||
}
|
||||
return true;
|
||||
}
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : preheatTemperatureInputMouseArea.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
|
||||
width: UM.Theme.getSize("setting_control").width
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
visible: printerModel != null ? printerModel.canPreHeatBed: true
|
||||
Rectangle //Highlight of input field.
|
||||
{
|
||||
anchors.fill: parent
|
||||
anchors.margins: UM.Theme.getSize("default_lining").width
|
||||
color: UM.Theme.getColor("setting_control_highlight")
|
||||
opacity: preheatTemperatureControl.hovered ? 1.0 : 0
|
||||
}
|
||||
MouseArea //Change cursor on hovering.
|
||||
{
|
||||
id: preheatTemperatureInputMouseArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.IBeamCursor
|
||||
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (containsMouse)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: preheatTemperatureInputMouseArea.mapToItem(base, 0, 0).y},
|
||||
catalog.i18nc("@tooltip of temperature input", "The temperature to pre-heat the bed to.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
TextInput
|
||||
{
|
||||
id: preheatTemperatureInput
|
||||
font: UM.Theme.getFont("default")
|
||||
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
|
||||
selectByMouse: true
|
||||
maximumLength: 10
|
||||
enabled: parent.enabled
|
||||
validator: RegExpValidator { regExp: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
renderType: Text.NativeRendering
|
||||
|
||||
Component.onCompleted:
|
||||
{
|
||||
if (!bedTemperature.properties.value)
|
||||
{
|
||||
text = "";
|
||||
}
|
||||
if ((bedTemperature.resolve != "None" && bedTemperature.resolve) && (bedTemperature.stackLevels[0] != 0) && (bedTemperature.stackLevels[0] != 1))
|
||||
{
|
||||
// We have a resolve function. Indicates that the setting is not settable per extruder and that
|
||||
// we have to choose between the resolved value (default) and the global value
|
||||
// (if user has explicitly set this).
|
||||
text = bedTemperature.resolve;
|
||||
}
|
||||
else
|
||||
{
|
||||
text = bedTemperature.properties.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Button //The pre-heat button.
|
||||
{
|
||||
id: preheatButton
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
visible: printerModel != null ? printerModel.canPreHeatBed: true
|
||||
enabled:
|
||||
{
|
||||
if (!preheatTemperatureControl.enabled)
|
||||
{
|
||||
return false; //Not connected, not authenticated or printer is busy.
|
||||
}
|
||||
if (printerModel.isPreheating)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (bedTemperature.properties.minimum_value != "None" && Math.floor(preheatTemperatureInput.text) < Math.floor(bedTemperature.properties.minimum_value))
|
||||
{
|
||||
return false; //Target temperature too low.
|
||||
}
|
||||
if (bedTemperature.properties.maximum_value != "None" && Math.floor(preheatTemperatureInput.text) > Math.floor(bedTemperature.properties.maximum_value))
|
||||
{
|
||||
return false; //Target temperature too high.
|
||||
}
|
||||
if (Math.floor(preheatTemperatureInput.text) == 0)
|
||||
{
|
||||
return false; //Setting the temperature to 0 is not allowed (since that cancels the pre-heating).
|
||||
}
|
||||
return true; //Preconditions are met.
|
||||
}
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
style: ButtonStyle {
|
||||
background: Rectangle
|
||||
{
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
|
||||
border.color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled_border");
|
||||
}
|
||||
else if(control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active_border");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered_border");
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("action_button_border");
|
||||
}
|
||||
}
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled");
|
||||
}
|
||||
else if(control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered");
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("action_button");
|
||||
}
|
||||
}
|
||||
Behavior on color
|
||||
{
|
||||
ColorAnimation
|
||||
{
|
||||
duration: 50
|
||||
}
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: actualLabel
|
||||
anchors.centerIn: parent
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled_text");
|
||||
}
|
||||
else if(control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active_text");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered_text");
|
||||
}
|
||||
else
|
||||
{
|
||||
return UM.Theme.getColor("action_button_text");
|
||||
}
|
||||
}
|
||||
font: UM.Theme.getFont("action_button")
|
||||
text:
|
||||
{
|
||||
if(printerModel == null)
|
||||
{
|
||||
return ""
|
||||
}
|
||||
if(printerModel.isPreheating )
|
||||
{
|
||||
return catalog.i18nc("@button Cancel pre-heating", "Cancel")
|
||||
} else
|
||||
{
|
||||
return catalog.i18nc("@button", "Pre-heat")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onClicked:
|
||||
{
|
||||
if (!printerModel.isPreheating)
|
||||
{
|
||||
printerModel.preheatBed(preheatTemperatureInput.text, 900);
|
||||
}
|
||||
else
|
||||
{
|
||||
printerModel.cancelPreheatBed();
|
||||
}
|
||||
}
|
||||
|
||||
onHoveredChanged:
|
||||
{
|
||||
if (hovered)
|
||||
{
|
||||
base.showTooltip(
|
||||
base,
|
||||
{x: 0, y: preheatButton.mapToItem(base, 0, 0).y},
|
||||
catalog.i18nc("@tooltip of pre-heat", "Heat the bed in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the bed to heat up when you're ready to print.")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
base.hideTooltip();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
442
resources/qml/PrinterOutput/ManualPrinterControl.qml
Normal file
442
resources/qml/PrinterOutput/ManualPrinterControl.qml
Normal file
|
|
@ -0,0 +1,442 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 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.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
Item
|
||||
{
|
||||
property var printerModel
|
||||
property var activePrintJob: printerModel != null ? printerModel.activePrintJob : null
|
||||
implicitWidth: parent.width
|
||||
implicitHeight: childrenRect.height
|
||||
|
||||
Component
|
||||
{
|
||||
id: monitorButtonStyle
|
||||
|
||||
ButtonStyle
|
||||
{
|
||||
background: Rectangle
|
||||
{
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled_border");
|
||||
}
|
||||
else if(control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active_border");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered_border");
|
||||
}
|
||||
return UM.Theme.getColor("action_button_border");
|
||||
}
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled");
|
||||
}
|
||||
else if(control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered");
|
||||
}
|
||||
return UM.Theme.getColor("action_button");
|
||||
}
|
||||
Behavior on color
|
||||
{
|
||||
ColorAnimation
|
||||
{
|
||||
duration: 50
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
label: Item
|
||||
{
|
||||
UM.RecolorImage
|
||||
{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
width: Math.floor(control.width / 2)
|
||||
height: Math.floor(control.height / 2)
|
||||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled_text");
|
||||
}
|
||||
else if(control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active_text");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered_text");
|
||||
}
|
||||
return UM.Theme.getColor("action_button_text");
|
||||
}
|
||||
source: control.iconSource
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Column
|
||||
{
|
||||
enabled:
|
||||
{
|
||||
if (printerModel == null)
|
||||
{
|
||||
return false; //Can't control the printer if not connected
|
||||
}
|
||||
|
||||
if (!connectedDevice.acceptsCommands)
|
||||
{
|
||||
return false; //Not allowed to do anything.
|
||||
}
|
||||
|
||||
if(activePrintJob == null)
|
||||
{
|
||||
return true
|
||||
}
|
||||
|
||||
if (activePrintJob.state == "printing" || activePrintJob.state == "resuming" || activePrintJob.state == "pausing" || activePrintJob.state == "error" || activePrintJob.state == "offline")
|
||||
{
|
||||
return false; //Printer is in a state where it can't react to manual control
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
MonitorSection
|
||||
{
|
||||
label: catalog.i18nc("@label", "Printer control")
|
||||
width: base.width
|
||||
}
|
||||
|
||||
Row
|
||||
{
|
||||
width: base.width - 2 * UM.Theme.getSize("default_margin").width
|
||||
height: childrenRect.height + UM.Theme.getSize("default_margin").width
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
Label
|
||||
{
|
||||
text: catalog.i18nc("@label", "Jog Position")
|
||||
color: UM.Theme.getColor("setting_control_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
|
||||
width: Math.floor(parent.width * 0.4) - UM.Theme.getSize("default_margin").width
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
||||
GridLayout
|
||||
{
|
||||
columns: 3
|
||||
rows: 4
|
||||
rowSpacing: UM.Theme.getSize("default_lining").width
|
||||
columnSpacing: UM.Theme.getSize("default_lining").height
|
||||
|
||||
Label
|
||||
{
|
||||
text: catalog.i18nc("@label", "X/Y")
|
||||
color: UM.Theme.getColor("setting_control_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
|
||||
Layout.row: 1
|
||||
Layout.column: 2
|
||||
Layout.preferredWidth: width
|
||||
Layout.preferredHeight: height
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
Layout.row: 2
|
||||
Layout.column: 2
|
||||
Layout.preferredWidth: width
|
||||
Layout.preferredHeight: height
|
||||
iconSource: UM.Theme.getIcon("arrow_top");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.moveHead(0, distancesRow.currentDistance, 0)
|
||||
}
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
Layout.row: 3
|
||||
Layout.column: 1
|
||||
Layout.preferredWidth: width
|
||||
Layout.preferredHeight: height
|
||||
iconSource: UM.Theme.getIcon("arrow_left");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.moveHead(-distancesRow.currentDistance, 0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
Layout.row: 3
|
||||
Layout.column: 3
|
||||
Layout.preferredWidth: width
|
||||
Layout.preferredHeight: height
|
||||
iconSource: UM.Theme.getIcon("arrow_right");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.moveHead(distancesRow.currentDistance, 0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
Layout.row: 4
|
||||
Layout.column: 2
|
||||
Layout.preferredWidth: width
|
||||
Layout.preferredHeight: height
|
||||
iconSource: UM.Theme.getIcon("arrow_bottom");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.moveHead(0, -distancesRow.currentDistance, 0)
|
||||
}
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
Layout.row: 3
|
||||
Layout.column: 2
|
||||
Layout.preferredWidth: width
|
||||
Layout.preferredHeight: height
|
||||
iconSource: UM.Theme.getIcon("home");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.homeHead()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Column
|
||||
{
|
||||
spacing: UM.Theme.getSize("default_lining").height
|
||||
|
||||
Label
|
||||
{
|
||||
text: catalog.i18nc("@label", "Z")
|
||||
color: UM.Theme.getColor("setting_control_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
width: UM.Theme.getSize("section").height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
iconSource: UM.Theme.getIcon("arrow_top");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.moveHead(0, 0, distancesRow.currentDistance)
|
||||
}
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
iconSource: UM.Theme.getIcon("home");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.homeBed()
|
||||
}
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
iconSource: UM.Theme.getIcon("arrow_bottom");
|
||||
style: monitorButtonStyle
|
||||
width: height
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
|
||||
onClicked:
|
||||
{
|
||||
printerModel.moveHead(0, 0, -distancesRow.currentDistance)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Row
|
||||
{
|
||||
id: distancesRow
|
||||
|
||||
width: base.width - 2 * UM.Theme.getSize("default_margin").width
|
||||
height: childrenRect.height + UM.Theme.getSize("default_margin").width
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
property real currentDistance: 10
|
||||
|
||||
Label
|
||||
{
|
||||
text: catalog.i18nc("@label", "Jog Distance")
|
||||
color: UM.Theme.getColor("setting_control_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
|
||||
width: Math.floor(parent.width * 0.4) - UM.Theme.getSize("default_margin").width
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
||||
Row
|
||||
{
|
||||
Repeater
|
||||
{
|
||||
model: distancesModel
|
||||
delegate: Button
|
||||
{
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
width: height + UM.Theme.getSize("default_margin").width
|
||||
|
||||
text: model.label
|
||||
exclusiveGroup: distanceGroup
|
||||
checkable: true
|
||||
checked: distancesRow.currentDistance == model.value
|
||||
onClicked: distancesRow.currentDistance = model.value
|
||||
|
||||
style: ButtonStyle {
|
||||
background: Rectangle {
|
||||
border.width: control.checked ? UM.Theme.getSize("default_lining").width * 2 : UM.Theme.getSize("default_lining").width
|
||||
border.color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled_border");
|
||||
}
|
||||
else if (control.checked || control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active_border");
|
||||
}
|
||||
else if(control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered_border");
|
||||
}
|
||||
return UM.Theme.getColor("action_button_border");
|
||||
}
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled");
|
||||
}
|
||||
else if (control.checked || control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active");
|
||||
}
|
||||
else if (control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered");
|
||||
}
|
||||
return UM.Theme.getColor("action_button");
|
||||
}
|
||||
Behavior on color { ColorAnimation { duration: 50; } }
|
||||
Label {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.leftMargin: UM.Theme.getSize("default_lining").width * 2
|
||||
anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2
|
||||
color:
|
||||
{
|
||||
if(!control.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled_text");
|
||||
}
|
||||
else if (control.checked || control.pressed)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_active_text");
|
||||
}
|
||||
else if (control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_hovered_text");
|
||||
}
|
||||
return UM.Theme.getColor("action_button_text");
|
||||
}
|
||||
font: UM.Theme.getFont("default")
|
||||
text: control.text
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
elide: Text.ElideMiddle
|
||||
}
|
||||
}
|
||||
label: Item { }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ListModel
|
||||
{
|
||||
id: distancesModel
|
||||
ListElement { label: "0.1"; value: 0.1 }
|
||||
ListElement { label: "1"; value: 1 }
|
||||
ListElement { label: "10"; value: 10 }
|
||||
ListElement { label: "100"; value: 100 }
|
||||
}
|
||||
ExclusiveGroup { id: distanceGroup }
|
||||
}
|
||||
}
|
||||
44
resources/qml/PrinterOutput/MonitorItem.qml
Normal file
44
resources/qml/PrinterOutput/MonitorItem.qml
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 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.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
Item
|
||||
{
|
||||
property string label: ""
|
||||
property string value: ""
|
||||
height: childrenRect.height;
|
||||
|
||||
Row
|
||||
{
|
||||
height: UM.Theme.getSize("setting_control").height
|
||||
width: Math.floor(base.width - 2 * UM.Theme.getSize("default_margin").width)
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
|
||||
Label
|
||||
{
|
||||
width: Math.floor(parent.width * 0.4)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: label
|
||||
color: connectedPrinter != null && connectedPrinter.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
Label
|
||||
{
|
||||
width: Math.floor(parent.width * 0.6)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: value
|
||||
color: connectedPrinter != null && connectedPrinter.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
|
||||
font: UM.Theme.getFont("default")
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
}
|
||||
}
|
||||
33
resources/qml/PrinterOutput/MonitorSection.qml
Normal file
33
resources/qml/PrinterOutput/MonitorSection.qml
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 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.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
Item
|
||||
{
|
||||
id: base
|
||||
property string label
|
||||
height: childrenRect.height;
|
||||
Rectangle
|
||||
{
|
||||
color: UM.Theme.getColor("setting_category")
|
||||
width: base.width
|
||||
height: UM.Theme.getSize("section").height
|
||||
|
||||
Label
|
||||
{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
text: label
|
||||
font: UM.Theme.getFont("setting_category")
|
||||
color: UM.Theme.getColor("setting_category_text")
|
||||
}
|
||||
}
|
||||
}
|
||||
59
resources/qml/PrinterOutput/OutputDeviceHeader.qml
Normal file
59
resources/qml/PrinterOutput/OutputDeviceHeader.qml
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
import QtQuick 2.2
|
||||
|
||||
import QtQuick.Controls 1.1
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
import QtQuick.Layouts 1.1
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
Item
|
||||
{
|
||||
implicitWidth: parent.width
|
||||
implicitHeight: Math.floor(childrenRect.height + UM.Theme.getSize("default_margin").height * 2)
|
||||
property var outputDevice: null
|
||||
|
||||
Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: UM.Theme.getColor("setting_category")
|
||||
property var activePrinter: outputDevice != null ? outputDevice.activePrinter : null
|
||||
|
||||
Label
|
||||
{
|
||||
id: outputDeviceNameLabel
|
||||
font: UM.Theme.getFont("large")
|
||||
color: UM.Theme.getColor("text")
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
text: outputDevice != null ? activePrinter.name : ""
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: outputDeviceAddressLabel
|
||||
text: (outputDevice != null && outputDevice.address != null) ? outputDevice.address : ""
|
||||
font: UM.Theme.getFont("small")
|
||||
color: UM.Theme.getColor("text_inactive")
|
||||
anchors.top: parent.top
|
||||
anchors.right: parent.right
|
||||
anchors.margins: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
text: outputDevice != null ? "" : catalog.i18nc("@info:status", "The printer is not connected.")
|
||||
color: outputDevice != null && outputDevice.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
|
||||
font: UM.Theme.getFont("very_small")
|
||||
wrapMode: Text.WordWrap
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -170,8 +170,8 @@ Item {
|
|||
|
||||
tooltip: [1, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@info:tooltip","Slice current printjob") : catalog.i18nc("@info:tooltip","Cancel slicing process")
|
||||
// 1 = not started, 2 = Processing
|
||||
enabled: base.backendState != "undefined" && (base.backendState == 1 || base.backendState == 2) && base.activity == true
|
||||
visible: base.backendState != "undefined" && !autoSlice && (base.backendState == 1 || base.backendState == 2) && base.activity == true
|
||||
enabled: base.backendState != "undefined" && ([1, 2].indexOf(base.backendState) != -1) && base.activity
|
||||
visible: base.backendState != "undefined" && !autoSlice && ([1, 2, 4].indexOf(base.backendState) != -1) && base.activity
|
||||
property bool autoSlice
|
||||
height: UM.Theme.getSize("save_button_save_to_button").height
|
||||
|
||||
|
|
@ -179,8 +179,8 @@ Item {
|
|||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
// 1 = not started, 5 = disabled
|
||||
text: [1, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
|
||||
// 1 = not started, 4 = error, 5 = disabled
|
||||
text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
|
||||
onClicked:
|
||||
{
|
||||
sliceOrStopSlicing();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.1 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.1 as UM
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2016 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.1 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Layouts 1.1
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.1 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2016 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.1 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.1 as UM
|
||||
|
||||
|
|
@ -135,14 +135,6 @@ SettingItem
|
|||
}
|
||||
}
|
||||
|
||||
onEditingFinished:
|
||||
{
|
||||
if (textHasChanged)
|
||||
{
|
||||
propertyProvider.setPropertyValue("value", text)
|
||||
}
|
||||
}
|
||||
|
||||
onActiveFocusChanged:
|
||||
{
|
||||
if(activeFocus)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.1
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
import QtQuick.Layouts 1.1
|
||||
|
|
@ -63,11 +63,9 @@ Item
|
|||
menu: ProfileMenu { }
|
||||
|
||||
function generateActiveQualityText () {
|
||||
var result = catalog.i18nc("@", "No Profile Available") // default text
|
||||
|
||||
if (Cura.MachineManager.isActiveQualitySupported ) {
|
||||
result = Cura.MachineManager.activeQualityName
|
||||
var result = Cura.MachineManager.activeQualityName;
|
||||
|
||||
if (Cura.MachineManager.isActiveQualitySupported) {
|
||||
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
|
||||
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
|
||||
result += " - "
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
import QtQuick.Layouts 1.3
|
||||
|
||||
import UM 1.2 as UM
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
// Copyright (c) 2015 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick.Controls 2.1
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import "Settings"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.8
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
import QtQuick.Layouts 1.3
|
||||
|
|
@ -195,11 +195,22 @@ Item
|
|||
text:
|
||||
{
|
||||
var result = ""
|
||||
if (Cura.MachineManager.activeMachine != null) {
|
||||
if(Cura.MachineManager.activeMachine != null)
|
||||
{
|
||||
result = Cura.ProfilesModel.getItem(index).layer_height_without_unit
|
||||
|
||||
if (result == undefined)
|
||||
result = ""
|
||||
if(result == undefined)
|
||||
{
|
||||
result = "";
|
||||
}
|
||||
else
|
||||
{
|
||||
result = Number(Math.round(result + "e+2") + "e-2"); //Round to 2 decimals. Javascript makes this difficult...
|
||||
if (result == undefined || result != result) //Parse failure.
|
||||
{
|
||||
result = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ Rectangle
|
|||
{
|
||||
id: viewOrientationControl
|
||||
height: 30
|
||||
|
||||
spacing: 2
|
||||
visible: UM.Controller.activeStage.stageId != "MonitorStage"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_abs_175
|
||||
weight = -2
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = fast
|
||||
material = generic_abs_175
|
||||
weight = -1
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = high
|
||||
material = generic_abs_175
|
||||
weight = 1
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_abs_175
|
||||
weight = 0
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = superdraft
|
||||
material = generic_abs_175
|
||||
weight = -5
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = thickerdraft
|
||||
material = generic_abs_175
|
||||
weight = -3
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Ultra Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = ultra
|
||||
material = generic_abs_175
|
||||
weight = 2
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Low Detail Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = verydraft
|
||||
material = generic_abs_175
|
||||
weight = -4
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
22
resources/quality/malyan_m200/malyan_m200_0.04375.inst.cfg
Normal file
22
resources/quality/malyan_m200/malyan_m200_0.04375.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M1 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 2
|
||||
quality_type = fine
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.04375
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/malyan_m200/malyan_m200_0.0875.inst.cfg
Normal file
22
resources/quality/malyan_m200/malyan_m200_0.0875.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M2 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 1
|
||||
quality_type = high
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.0875
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/malyan_m200/malyan_m200_0.13125.inst.cfg
Normal file
22
resources/quality/malyan_m200/malyan_m200_0.13125.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M3 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 0
|
||||
quality_type = normal
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.13125
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
23
resources/quality/malyan_m200/malyan_m200_0.175.inst.cfg
Normal file
23
resources/quality/malyan_m200/malyan_m200_0.175.inst.cfg
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M4 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -1
|
||||
quality_type = fast
|
||||
global_quality = true
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.175
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/malyan_m200/malyan_m200_0.21875.inst.cfg
Normal file
22
resources/quality/malyan_m200/malyan_m200_0.21875.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M5 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -2
|
||||
quality_type = faster
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.21875
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/malyan_m200/malyan_m200_0.2625.inst.cfg
Normal file
22
resources/quality/malyan_m200/malyan_m200_0.2625.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M6 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -3
|
||||
quality_type = draft
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.2625
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
22
resources/quality/malyan_m200/malyan_m200_0.30625.inst.cfg
Normal file
22
resources/quality/malyan_m200/malyan_m200_0.30625.inst.cfg
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M7 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -4
|
||||
quality_type = turbo
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.30625
|
||||
layer_height_0 = 0.30625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
23
resources/quality/malyan_m200/malyan_m200_0.35.inst.cfg
Normal file
23
resources/quality/malyan_m200/malyan_m200_0.35.inst.cfg
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = M8 Quality
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -5
|
||||
quality_type = hyper
|
||||
global_quality = true
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.35
|
||||
layer_height_0 = 0.35
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -2
|
||||
quality_type = draft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.21875
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -1
|
||||
quality_type = fast
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.175
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 1
|
||||
quality_type = high
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.0875
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 0
|
||||
quality_type = normal
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.13125
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -5
|
||||
quality_type = superdraft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.35
|
||||
layer_height_0 = 0.35
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -3
|
||||
quality_type = thickerdraft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.2625
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Ultra Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 2
|
||||
quality_type = ultra
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.04375
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Low Detail Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -4
|
||||
quality_type = verydraft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.30625
|
||||
layer_height_0 = 0.30625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_petg_175
|
||||
weight = -2
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = fast
|
||||
material = generic_petg_175
|
||||
weight = -1
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = high
|
||||
material = generic_petg_175
|
||||
weight = 1
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_petg_175
|
||||
weight = 0
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = superdraft
|
||||
material = generic_petg_175
|
||||
weight = -5
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = thickerdraft
|
||||
material = generic_petg_175
|
||||
weight = -3
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Ultra Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = ultra
|
||||
material = generic_petg_175
|
||||
weight = 2
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Low Detail Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = verydraft
|
||||
material = generic_petg_175
|
||||
weight = -4
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_pla_175
|
||||
weight = -2
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = fast
|
||||
material = generic_pla_175
|
||||
weight = -1
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = high
|
||||
material = generic_pla_175
|
||||
weight = 1
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_pla_175
|
||||
weight = 0
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = superdraft
|
||||
material = generic_pla_175
|
||||
weight = -5
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = thickerdraft
|
||||
material = generic_pla_175
|
||||
weight = -3
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Ultra Fine
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = ultra
|
||||
material = generic_pla_175
|
||||
weight = 2
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Low Detail Draft
|
||||
definition = malyan_m200
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = verydraft
|
||||
material = generic_pla_175
|
||||
weight = -4
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 60
|
||||
material_bed_temperature_layer_0 = 60
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_abs_175
|
||||
weight = -2
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = fast
|
||||
material = generic_abs_175
|
||||
weight = -1
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = high
|
||||
material = generic_abs_175
|
||||
weight = 1
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_abs_175
|
||||
weight = 0
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = superdraft
|
||||
material = generic_abs_175
|
||||
weight = -5
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = thickerdraft
|
||||
material = generic_abs_175
|
||||
weight = -3
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Ultra Fine
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = thickerdraft
|
||||
material = generic_abs_175
|
||||
weight = 2
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Low Detail Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = verydraft
|
||||
material = generic_abs_175
|
||||
weight = -4
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
material_bed_temperature = 70
|
||||
material_bed_temperature_layer_0 = 70
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -2
|
||||
quality_type = draft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.21875
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -1
|
||||
quality_type = fast
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.175
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 1
|
||||
quality_type = high
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.0875
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 0
|
||||
quality_type = normal
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.13125
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -5
|
||||
quality_type = superdraft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.35
|
||||
layer_height_0 = 0.35
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -3
|
||||
quality_type = thickerdraft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.2625
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Ultra Fine
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = 2
|
||||
quality_type = ultra
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.04375
|
||||
layer_height_0 = 0.2625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Low Detail Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
weight = -4
|
||||
quality_type = verydraft
|
||||
global_quality = True
|
||||
setting_version = 4
|
||||
|
||||
[values]
|
||||
layer_height = 0.30625
|
||||
layer_height_0 = 0.30625
|
||||
wall_thickness = 1.05
|
||||
top_bottom_thickness = 0.72
|
||||
infill_sparse_density = 22
|
||||
speed_print = 50
|
||||
speed_layer_0 = =round(speed_print * 30 / 50)
|
||||
speed_topbottom = 20
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 10
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fast
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = draft
|
||||
material = generic_nylon_175
|
||||
weight = -2
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Normal
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = fast
|
||||
material = generic_nylon_175
|
||||
weight = -1
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Finer
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = high
|
||||
material = generic_nylon_175
|
||||
weight = 1
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Fine
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = normal
|
||||
material = generic_nylon_175
|
||||
weight = 0
|
||||
setting_version = 4
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[general]
|
||||
version = 2
|
||||
name = Lowest Quality Draft
|
||||
definition = monoprice_select_mini_v2
|
||||
|
||||
[metadata]
|
||||
type = quality
|
||||
quality_type = superdraft
|
||||
material = generic_nylon_175
|
||||
weight = -5
|
||||
setting_version = 4
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue