mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-10 15:25:09 -06:00
Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip
This commit is contained in:
commit
61821e6378
77 changed files with 2138 additions and 272 deletions
80
resources/definitions/anycubic_chiron.def.json
Normal file
80
resources/definitions/anycubic_chiron.def.json
Normal file
|
@ -0,0 +1,80 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Anycubic Chiron",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata":
|
||||
{
|
||||
"visible": true,
|
||||
"author": "Patrick Glatt",
|
||||
"manufacturer": "Anycubic",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2",
|
||||
"platform": "anycubic_chiron_platform.obj",
|
||||
"platform_texture": "anycubic-chiron.png",
|
||||
"has_materials": true,
|
||||
"preferred_material": "generic_pla",
|
||||
"has_machine_quality": true,
|
||||
"quality_definition": "anycubic_chiron",
|
||||
"preferred_quality_type": "normal",
|
||||
"machine_extruder_trains":
|
||||
{
|
||||
"0": "anycubic_chiron_extruder_0"
|
||||
},
|
||||
"firmware_file": "MarlinChiron.hex"
|
||||
},
|
||||
|
||||
"overrides":
|
||||
{
|
||||
"machine_name":
|
||||
{
|
||||
"default_value": "Anycubic Chiron"
|
||||
},
|
||||
"machine_heated_bed":
|
||||
{
|
||||
"default_value": true
|
||||
},
|
||||
"machine_width":
|
||||
{
|
||||
"default_value": 400
|
||||
},
|
||||
"machine_height":
|
||||
{
|
||||
"default_value": 450
|
||||
},
|
||||
"machine_depth":
|
||||
{
|
||||
"default_value": 400
|
||||
},
|
||||
"machine_center_is_zero":
|
||||
{
|
||||
"default_value": false
|
||||
},
|
||||
"gantry_height":
|
||||
{
|
||||
"default_value": 35
|
||||
},
|
||||
"machine_head_with_fans_polygon":
|
||||
{
|
||||
"default_value":
|
||||
[
|
||||
[-45, 50],
|
||||
[-45, -45],
|
||||
[45, 50],
|
||||
[45, -45]
|
||||
]
|
||||
},
|
||||
"machine_gcode_flavor":
|
||||
{
|
||||
"default_value": "RepRap (Marlin/Sprinter)"
|
||||
},
|
||||
"machine_start_gcode":
|
||||
{
|
||||
"default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n"
|
||||
},
|
||||
"machine_end_gcode":
|
||||
{
|
||||
"default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,61 +1,68 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Deltacomb 3D",
|
||||
"inherits": "fdmprinter",
|
||||
"version": 2,
|
||||
"name": "Deltacomb 3D",
|
||||
"inherits": "fdmprinter",
|
||||
|
||||
"metadata": {
|
||||
"author": "Gabriele Rossetti",
|
||||
"visible": true,
|
||||
"manufacturer": "Deltacomb 3D",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode",
|
||||
"platform": "deltacomb.stl",
|
||||
"has_machine_quality": true,
|
||||
"machine_extruder_trains":
|
||||
{
|
||||
"0": "deltacomb_extruder_0"
|
||||
}
|
||||
"author": "Gabriele Rossetti",
|
||||
"visible": true,
|
||||
"manufacturer": "Deltacomb 3D",
|
||||
"category": "Other",
|
||||
"file_formats": "text/x-gcode",
|
||||
"icon": "icon_ultimaker2",
|
||||
"platform": "deltacomb.stl",
|
||||
"has_machine_quality": true,
|
||||
"has_materials": true,
|
||||
"has_machine_materials": false,
|
||||
"has_variants": true,
|
||||
"variants_name": "Head",
|
||||
"preferred_variant_name": "E3D 0.40mm",
|
||||
"preferred_material": "generic_pla",
|
||||
"preferred_quality_type": "normal",
|
||||
"machine_extruder_trains": { "0": "deltacomb_extruder_0", "1": "deltacomb_extruder_1" }
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
"machine_width": { "default_value": 190 },
|
||||
"machine_height": { "default_value": 250 },
|
||||
"machine_depth": { "default_value": 190 },
|
||||
"machine_center_is_zero": { "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 all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."},
|
||||
"machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
|
||||
"machine_shape": { "default_value": "elliptic" },
|
||||
"retraction_hop_enabled": { "default_value": true },
|
||||
"retraction_amount" : { "default_value": 3.5 },
|
||||
"retraction_speed" : { "default_value": 50 },
|
||||
"material_final_print_temperature": { "value": "material_print_temperature - 5" },
|
||||
"material_initial_print_temperature": { "value": "material_print_temperature" },
|
||||
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"travel_avoid_distance": { "default_value": 1, "value": "1" },
|
||||
"speed_print" : { "default_value": 70 },
|
||||
"speed_travel": { "value": "150.0" },
|
||||
"speed_infill": { "value": "round(speed_print * 1.05, 0)" },
|
||||
"speed_topbottom": { "value": "round(speed_print * 0.95, 0)" },
|
||||
"speed_wall": { "value": "speed_print" },
|
||||
"speed_wall_0": { "value": "20" },
|
||||
"speed_wall_x": { "value": "speed_wall" },
|
||||
"speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
|
||||
"speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" },
|
||||
"skirt_brim_speed": { "value": "speed_layer_0" },
|
||||
"skirt_line_count": { "default_value": 3 },
|
||||
"skirt_brim_minimal_length": { "default_value": 150 },
|
||||
"infill_sparse_density": { "default_value": 90 },
|
||||
"gradual_infill_steps": { "default_value": 2 },
|
||||
"infill_before_walls" : { "default_value": false },
|
||||
"top_bottom_thickness": { "default_value": 0.6 },
|
||||
"support_z_distance": { "value": "layer_height * 2" },
|
||||
"support_bottom_distance": { "value": "layer_height" },
|
||||
"support_use_towers" : { "default_value": false },
|
||||
"jerk_wall_0" : { "value": "30" },
|
||||
"jerk_travel" : { "default_value": 20 },
|
||||
"acceleration_travel" : { "value": 10000 },
|
||||
"machine_max_feedrate_z" : { "default_value": 150 }
|
||||
"machine_extruder_count": { "default_value": 1 },
|
||||
"machine_heated_bed": { "default_value": true },
|
||||
"machine_width": { "default_value": 190 },
|
||||
"machine_height": { "default_value": 250 },
|
||||
"machine_depth": { "default_value": 190 },
|
||||
"machine_center_is_zero": { "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 all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."},
|
||||
"machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },
|
||||
"machine_shape": { "default_value": "elliptic" },
|
||||
"retraction_hop_enabled": { "default_value": true },
|
||||
"retraction_hop": { "default_value": 1 },
|
||||
"retraction_amount" : { "default_value": 3.5 },
|
||||
"retraction_speed" : { "default_value": 30 },
|
||||
"retraction_combing" : { "default_value": "noskin" },
|
||||
"travel_avoid_distance": { "default_value": 1, "value": "1" },
|
||||
"speed_print" : { "default_value": 80 },
|
||||
"speed_infill": { "value": "round(speed_print * 1.05, 0)" },
|
||||
"speed_topbottom": { "value": "round(speed_print * 0.95, 0)" },
|
||||
"speed_wall": { "value": "speed_print" },
|
||||
"speed_wall_0": { "value": "30" },
|
||||
"speed_wall_x": { "value": "speed_wall" },
|
||||
"speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" },
|
||||
"speed_travel": { "default_value": 150, "value": 150 },
|
||||
"speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" },
|
||||
"skirt_brim_speed": { "value": "speed_layer_0" },
|
||||
"skirt_line_count": { "default_value": 3 },
|
||||
"skirt_brim_minimal_length": { "default_value": 150 },
|
||||
"infill_sparse_density": { "default_value": 30 },
|
||||
"infill_pattern": { "value": "'cubic'" },
|
||||
"infill_before_walls" : { "default_value": false },
|
||||
"top_bottom_thickness": { "default_value": 0.8 },
|
||||
"support_z_distance": { "value": "layer_height * 2" },
|
||||
"support_bottom_distance": { "value": "layer_height" },
|
||||
"support_use_towers" : { "default_value": false },
|
||||
"jerk_enabled": { "default_value": 1, "value": "1" },
|
||||
"jerk_infill" : { "default_value": 5, "value": "5" },
|
||||
"jerk_support" : { "default_value": 5, "value": "5" },
|
||||
"acceleration_enabled": { "default_value": 1, "value": "1" },
|
||||
"acceleration_travel" : { "value": 5000 },
|
||||
"machine_max_feedrate_z" : { "default_value": 300 }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4579,7 +4579,7 @@
|
|||
"description": "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time.",
|
||||
"type": "bool",
|
||||
"resolve": "any(extruderValues('prime_blob_enable'))",
|
||||
"default_value": true,
|
||||
"default_value": false,
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"enabled": false
|
||||
|
|
|
@ -0,0 +1,119 @@
|
|||
{
|
||||
"version": 2,
|
||||
"name": "Discov3ry Complete (Ultimaker 2+)",
|
||||
"inherits": "fdmprinter",
|
||||
"metadata": {
|
||||
"author": "Andrew Finkle, CTO",
|
||||
"manufacturer": "Structur3d.io",
|
||||
"visible": true,
|
||||
"weight": 1,
|
||||
"file_formats": "text/x-gcode",
|
||||
"platform": "ultimaker2_platform.obj",
|
||||
"platform_texture": "Ultimaker2Plusbackplate.png",
|
||||
"platform_offset": [0, 0, 0],
|
||||
"has_materials": true,
|
||||
"has_variants": true,
|
||||
"variants_name": "Print core",
|
||||
"preferred_variant_name": "0.84mm (Green)",
|
||||
"has_machine_materials": true,
|
||||
"preferred_material": "structur3d_dap100silicone",
|
||||
"has_variant_materials": false,
|
||||
"has_machine_quality": false,
|
||||
"preferred_quality_type": "extra_fast",
|
||||
"first_start_actions": [],
|
||||
"supported_actions": [],
|
||||
"machine_extruder_trains":
|
||||
{
|
||||
"0": "structur3d_discov3ry1_complete_um2plus_extruder_0"
|
||||
},
|
||||
"firmware_file": "MarlinUltimaker2plus.hex"
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" },
|
||||
"speed_infill": {
|
||||
"value": "speed_print"
|
||||
},
|
||||
"infill_sparse_density": {
|
||||
"value": 100
|
||||
},
|
||||
"retraction_hop_enabled": {
|
||||
"value": true
|
||||
},
|
||||
"adhesion_type": {
|
||||
"default_value": "skirt"
|
||||
},
|
||||
"skirt_brim_minimal_length": {
|
||||
"value": 1500
|
||||
},
|
||||
"speed_print": {
|
||||
"value": 15
|
||||
},
|
||||
"speed_wall_x": {
|
||||
"value": "speed_wall"
|
||||
},
|
||||
"layer_height_0": {
|
||||
"value": "round(machine_nozzle_size / 1.5, 2)"
|
||||
},
|
||||
"line_width": {
|
||||
"value": "round(machine_nozzle_size * 0.875, 2)"
|
||||
},
|
||||
"speed_layer_0": {
|
||||
"default_value": 10
|
||||
},
|
||||
"speed_support": {
|
||||
"value": "speed_wall_0"
|
||||
},
|
||||
"machine_height": {
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_width": {
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_depth": {
|
||||
"default_value": 205
|
||||
},
|
||||
"machine_show_variants": {
|
||||
"default_value": true
|
||||
},
|
||||
"gantry_height": {
|
||||
"default_value": 52
|
||||
},
|
||||
"machine_nozzle_head_distance": {
|
||||
"default_value": 5
|
||||
},
|
||||
"machine_nozzle_expansion_angle": {
|
||||
"default_value": 45
|
||||
},
|
||||
"machine_heat_zone_length": {
|
||||
"default_value": 20
|
||||
},
|
||||
"machine_head_with_fans_polygon":
|
||||
{
|
||||
"default_value": [
|
||||
[ -44, 14 ],
|
||||
[ -44, -34 ],
|
||||
[ 64, 14 ],
|
||||
[ 64, -34 ]
|
||||
]
|
||||
},
|
||||
"machine_disallowed_areas": {
|
||||
"default_value": [
|
||||
[[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]],
|
||||
[[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]],
|
||||
[[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]],
|
||||
[[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]]
|
||||
]
|
||||
},
|
||||
"machine_gcode_flavor": {
|
||||
"default_value": "RepRap (Marlin/Sprinter)"
|
||||
},
|
||||
"machine_start_gcode": {
|
||||
"default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..."
|
||||
},
|
||||
"machine_end_gcode": {
|
||||
"default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it) \nM92 E282 ;reset extruder EEPROM steps/mm for plastic filament \nG91 ;relative positioning \nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure \nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more \nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way \nM84 ;steppers off\nG90 ;absolute positioning"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
"manufacturer": "Ultimaker B.V.",
|
||||
"category": "Ultimaker",
|
||||
"visible": false,
|
||||
"exclude_materials": [ "generic_hips", "generic_petg" ]
|
||||
"exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ]
|
||||
},
|
||||
"overrides": {
|
||||
"machine_max_feedrate_e": {
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
"prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" },
|
||||
"prime_tower_wipe_enabled": { "default_value": false },
|
||||
|
||||
"prime_blob_enable": { "enabled": true },
|
||||
"prime_blob_enable": { "enabled": true, "default_value": true },
|
||||
|
||||
"acceleration_enabled": { "value": "True" },
|
||||
"acceleration_layer_0": { "value": "acceleration_topbottom" },
|
||||
|
|
16
resources/extruders/anycubic_chiron_extruder_0.def.json
Normal file
16
resources/extruders/anycubic_chiron_extruder_0.def.json
Normal file
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "anycubic_chiron_extruder_0",
|
||||
"version": 2,
|
||||
"name": "Extruder 1",
|
||||
"inherits": "fdmextruder",
|
||||
"metadata": {
|
||||
"machine": "anycubic_chiron",
|
||||
"position": "0"
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"extruder_nr": { "default_value": 0 },
|
||||
"machine_nozzle_size": { "default_value": 0.4 },
|
||||
"material_diameter": { "default_value": 1.75 }
|
||||
}
|
||||
}
|
|
@ -9,8 +9,10 @@
|
|||
},
|
||||
|
||||
"overrides": {
|
||||
"extruder_nr": { "default_value": 0 },
|
||||
"machine_nozzle_size": { "default_value": 0.4 },
|
||||
"material_diameter": { "default_value": 1.75 }
|
||||
"extruder_nr": { "default_value": 0 },
|
||||
"machine_nozzle_size": { "default_value": 0.4 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_nozzle_offset_x": { "default_value": 0.0 },
|
||||
"machine_nozzle_offset_y": { "default_value": 0.0 }
|
||||
}
|
||||
}
|
||||
|
|
18
resources/extruders/deltacomb_extruder_1.def.json
Executable file
18
resources/extruders/deltacomb_extruder_1.def.json
Executable file
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"id": "deltacomb_extruder_1",
|
||||
"version": 2,
|
||||
"name": "Extruder 2",
|
||||
"inherits": "fdmextruder",
|
||||
"metadata": {
|
||||
"machine": "deltacomb",
|
||||
"position": "1"
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"extruder_nr": { "default_value": 1 },
|
||||
"machine_nozzle_size": { "default_value": 0.4 },
|
||||
"material_diameter": { "default_value": 1.75 },
|
||||
"machine_nozzle_offset_x": { "default_value": 0.0 },
|
||||
"machine_nozzle_offset_y": { "default_value": 0.0 }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"id": "structur3d_discov3ry1_complete_um2plus_extruder_0",
|
||||
"version": 2,
|
||||
"name": "Discov3ry Extruder",
|
||||
"inherits": "fdmextruder",
|
||||
"metadata": {
|
||||
"machine": "structur3d_discov3ry1_complete_um2plus",
|
||||
"position": "0"
|
||||
},
|
||||
|
||||
"overrides": {
|
||||
"extruder_nr": { "default_value": 0 },
|
||||
"machine_nozzle_size": { "default_value": 0.84 },
|
||||
"material_diameter": { "default_value": 3.175 }
|
||||
}
|
||||
}
|
BIN
resources/images/anycubic-chiron.png
Normal file
BIN
resources/images/anycubic-chiron.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 92 KiB |
150
resources/meshes/anycubic_chiron_platform.obj
Normal file
150
resources/meshes/anycubic_chiron_platform.obj
Normal file
|
@ -0,0 +1,150 @@
|
|||
# WaveFront *.obj file (generated by Autodesk ATF)
|
||||
#Author: Patrick Glatt
|
||||
mtllib ae48cbb4-79ca-43fd-95a7-5e2258fec6c5.mtl
|
||||
|
||||
o Anycubic Chiron Platform
|
||||
#vertex 1
|
||||
v 200.000000 200.000000 0.000000
|
||||
#vertex 2
|
||||
v 200.000000 -200.000000 0.000000
|
||||
#vertex 3
|
||||
v 200.000000 -200.000000 -4.000000
|
||||
#vertex 4
|
||||
v 200.000000 200.000000 -4.000000
|
||||
#vertex 5
|
||||
v -200.000000 200.000000 0.000000
|
||||
#vertex 6
|
||||
v -200.000000 200.000000 -4.000000
|
||||
#vertex 7
|
||||
v -200.000000 -200.000000 0.000000
|
||||
#vertex 8
|
||||
v -200.000000 -200.000000 -4.000000
|
||||
|
||||
#vt right
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
#vt front
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
#vt left
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
#vt back
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
#vt top (only the color of the (0.000000 1.000000 0.000000) corner in logo)
|
||||
#vt 0.000000 1.000000 0.000000
|
||||
#vt 0.000000 1.000000 0.000000
|
||||
#vt 0.000000 1.000000 0.000000
|
||||
#vt 0.000000 1.000000 0.000000
|
||||
#vt top (full logo)
|
||||
vt 0.00000 0.000000 0.000000
|
||||
vt 1.000000 0.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 1.000000 1.000000 0.000000
|
||||
#vt bottom
|
||||
vt 0.000000 0.000000 0.000000
|
||||
vt 1.000000 0.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 1.000000 1.000000 0.000000
|
||||
|
||||
#vn right
|
||||
vn 0.000000 0.000000 0.000000
|
||||
vn 0.100000 0.000000 0.000000
|
||||
vn 0.100000 0.000000 0.000000
|
||||
vn 0.100000 0.000000 0.000000
|
||||
#vn front
|
||||
vn 0.000000 0.100000 0.000000
|
||||
vn 0.000000 0.100000 0.000000
|
||||
vn 0.000000 0.100000 0.000000
|
||||
vn 0.000000 0.100000 0.000000
|
||||
#vn left
|
||||
vn -0.100000 0.000000 0.000000
|
||||
vn -0.100000 0.000000 0.000000
|
||||
vn -0.100000 0.000000 0.000000
|
||||
vn -0.100000 0.000000 0.000000
|
||||
#vn back
|
||||
vn 0.000000 -0.100000 0.000000
|
||||
vn 0.000000 -0.100000 0.000000
|
||||
vn 0.000000 -0.100000 0.000000
|
||||
vn 0.000000 -0.100000 0.000000
|
||||
#vn top
|
||||
vn 0.000000 -0.000000 0.100000
|
||||
vn 0.000000 -0.000000 0.100000
|
||||
vn 0.000000 -0.000000 0.100000
|
||||
vn 0.000000 -0.000000 0.100000
|
||||
#vn bottom
|
||||
vn 0.000000 0.000000 0.100000
|
||||
vn 0.000000 0.000000 0.100000
|
||||
vn 0.000000 0.000000 0.100000
|
||||
vn 0.000000 0.000000 0.100000
|
||||
|
||||
#faces f v{index}/vt{index}/vn{index}..
|
||||
#face right
|
||||
f 1/1/1 2/2/1 4/3/1
|
||||
f 4/3/1 2/2/1 3/4/1
|
||||
#face front
|
||||
f 5/5/5 1/6/5 6/7/5
|
||||
f 6/7/5 1/6/5 4/8/5
|
||||
#face left
|
||||
f 7/9/9 5/10/9 8/11/9
|
||||
f 8/11/9 5/10/9 6/12/9
|
||||
#face back
|
||||
f 2/13/13 7/14/13 3/15/13
|
||||
f 3/15/13 7/14/13 8/16/13
|
||||
#face top (uncomment this code if you want to see the logo on top too)
|
||||
#f 7/17/17 2/18/17 1/20/17 5/19/17
|
||||
#face bottom
|
||||
f 6/21/23 4/22/23 3/24/23 8/23/23
|
||||
|
||||
|
||||
o Small Logo Platform
|
||||
#9 front left
|
||||
v -50.000000 270.700000 70.700000
|
||||
#10 front right
|
||||
v 50.000000 270.700000 70.700000
|
||||
#11 back right
|
||||
v 50.000000 200.000000 0.000000
|
||||
#12 back left
|
||||
v -50.000000 200.000000 0.000000
|
||||
#13 front left 2
|
||||
v -50.000000 270.700000 66.700000
|
||||
#14 front right2
|
||||
v 50.000000 270.700000 66.700000
|
||||
#15 back right 3
|
||||
v 50.000000 200.000000 -4.000000
|
||||
#16 back left2
|
||||
v -50.000000 200.000000 -4.000000
|
||||
|
||||
#vt's
|
||||
vt 0.000000 1.000000 0.000000
|
||||
vt 0.000000 0.000000 0.000000
|
||||
vt 1.000000 0.000000 0.000000
|
||||
vt 1.000000 1.000000 0.000000
|
||||
vt 0.000000 1.000000 0.000000
|
||||
|
||||
#vn's
|
||||
vn 0.000000 0.000000 1.000000
|
||||
|
||||
#faces f v{index}/vt{index}/vn{index}...
|
||||
#right
|
||||
f 10/1/1 11/2/1 15/3/1 14/4/1
|
||||
#front
|
||||
f 9/4/5 10/8/5 14/7/5 13/8/5
|
||||
#left
|
||||
f 12/9/9 9/10/9 13/11/9 16/12/9
|
||||
#back
|
||||
f 11/13/13 12/14/13 16/15/13 15/16/13
|
||||
#top
|
||||
f 12/26/25 11/27/25 10/28/25 9/25/25
|
||||
#bottom
|
||||
f 13/13/23 14/14/23 15/15/23 16/16/23
|
||||
|
|
@ -14,7 +14,7 @@ UM.ManagementPage
|
|||
id: base;
|
||||
|
||||
title: catalog.i18nc("@title:tab", "Printers");
|
||||
model: Cura.MachineManagementModel { }
|
||||
model: Cura.GlobalStacksModel { }
|
||||
|
||||
activeId: Cura.MachineManager.activeMachineId
|
||||
activeIndex: activeMachineIndex()
|
||||
|
|
|
@ -19,12 +19,19 @@ Button
|
|||
checkable: true
|
||||
hoverEnabled: true
|
||||
|
||||
property bool selected: checked
|
||||
property bool printerTypeLabelAutoFit: false
|
||||
|
||||
property var outputDevice: null
|
||||
property var printerTypesList: []
|
||||
|
||||
property var updatePrinterTypesFunction: updatePrinterTypesList
|
||||
// This function converts the printer type string to another string.
|
||||
property var printerTypeLabelConversionFunction: Cura.MachineManager.getAbbreviatedMachineName
|
||||
|
||||
function updatePrinterTypesList()
|
||||
{
|
||||
printerTypesList = (checked && (outputDevice != null)) ? outputDevice.uniquePrinterTypes : []
|
||||
printerTypesList = (outputDevice != null) ? outputDevice.uniquePrinterTypes : []
|
||||
}
|
||||
|
||||
contentItem: Item
|
||||
|
@ -67,7 +74,8 @@ Button
|
|||
model: printerTypesList
|
||||
delegate: Cura.PrinterTypeLabel
|
||||
{
|
||||
text: Cura.MachineManager.getAbbreviatedMachineName(modelData)
|
||||
autoFit: printerTypeLabelAutoFit
|
||||
text: printerTypeLabelConversionFunction(modelData)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -76,29 +84,30 @@ Button
|
|||
background: Rectangle
|
||||
{
|
||||
id: backgroundRect
|
||||
color: machineSelectorButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent"
|
||||
color:
|
||||
{
|
||||
if (!machineSelectorButton.enabled)
|
||||
{
|
||||
return UM.Theme.getColor("action_button_disabled")
|
||||
}
|
||||
return machineSelectorButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent"
|
||||
}
|
||||
radius: UM.Theme.getSize("action_button_radius").width
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: machineSelectorButton.checked ? UM.Theme.getColor("primary") : "transparent"
|
||||
}
|
||||
|
||||
onClicked:
|
||||
{
|
||||
toggleContent()
|
||||
Cura.MachineManager.setActiveMachine(model.id)
|
||||
border.color: machineSelectorButton.selected ? UM.Theme.getColor("primary") : "transparent"
|
||||
}
|
||||
|
||||
Connections
|
||||
{
|
||||
target: outputDevice
|
||||
onUniqueConfigurationsChanged: updatePrinterTypesList()
|
||||
onUniqueConfigurationsChanged: updatePrinterTypesFunction()
|
||||
}
|
||||
|
||||
Connections
|
||||
{
|
||||
target: Cura.MachineManager
|
||||
onOutputDevicesChanged: updatePrinterTypesList()
|
||||
onOutputDevicesChanged: updatePrinterTypesFunction()
|
||||
}
|
||||
|
||||
Component.onCompleted: updatePrinterTypesList()
|
||||
Component.onCompleted: updatePrinterTypesFunction()
|
||||
}
|
||||
|
|
|
@ -42,5 +42,11 @@ ListView
|
|||
}
|
||||
return result
|
||||
}
|
||||
|
||||
onClicked:
|
||||
{
|
||||
toggleContent()
|
||||
Cura.MachineManager.setActiveMachine(model.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,9 @@ Item
|
|||
{
|
||||
property alias text: printerTypeLabel.text
|
||||
|
||||
width: UM.Theme.getSize("printer_type_label").width
|
||||
property bool autoFit: false
|
||||
|
||||
width: autoFit ? (printerTypeLabel.width + UM.Theme.getSize("default_margin").width) : UM.Theme.getSize("printer_type_label").width
|
||||
height: UM.Theme.getSize("printer_type_label").height
|
||||
|
||||
Rectangle
|
||||
|
|
|
@ -47,7 +47,7 @@ Cura.ExpandablePopup
|
|||
Label
|
||||
{
|
||||
id: title
|
||||
text: catalog.i18nc("@label", "View types")
|
||||
text: catalog.i18nc("@label", "View type")
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
height: parent.height
|
||||
elide: Text.ElideRight
|
||||
|
|
190
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
Normal file
190
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
Normal file
|
@ -0,0 +1,190 @@
|
|||
// Copyright (c) 2019 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
import UM 1.3 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
//
|
||||
// This is the scroll view widget for adding a (local) printer. This scroll view shows a list view with printers
|
||||
// categorized into 3 categories: "Ultimaker", "Custom", and "Other".
|
||||
//
|
||||
ScrollView
|
||||
{
|
||||
id: base
|
||||
|
||||
property var currentItem: (machineList.currentIndex >= 0)
|
||||
? machineList.model.getItem(machineList.currentIndex)
|
||||
: null
|
||||
property string currentSection: preferredCategory
|
||||
property string preferredCategory: "Ultimaker"
|
||||
|
||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
|
||||
|
||||
property int maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll.
|
||||
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
|
||||
|
||||
clip: true
|
||||
|
||||
function updateCurrentItemUponSectionChange()
|
||||
{
|
||||
// Find the first machine from this section
|
||||
for (var i = 0; i < machineList.count; i++)
|
||||
{
|
||||
var item = machineList.model.getItem(i)
|
||||
if (item.section == base.currentSection)
|
||||
{
|
||||
machineList.currentIndex = i
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted:
|
||||
{
|
||||
updateCurrentItemUponSectionChange()
|
||||
}
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: "white"
|
||||
}
|
||||
|
||||
ListView
|
||||
{
|
||||
id: machineList
|
||||
|
||||
model: UM.DefinitionContainersModel
|
||||
{
|
||||
id: machineDefinitionsModel
|
||||
filter: { "visible": true }
|
||||
sectionProperty: "category"
|
||||
preferredSectionValue: preferredCategory
|
||||
}
|
||||
|
||||
section.property: "section"
|
||||
section.delegate: sectionHeader
|
||||
delegate: machineButton
|
||||
}
|
||||
|
||||
Component
|
||||
{
|
||||
id: sectionHeader
|
||||
|
||||
Button
|
||||
{
|
||||
id: button
|
||||
width: ListView.view.width
|
||||
height: UM.Theme.getSize("action_button").height
|
||||
text: section
|
||||
|
||||
property bool isActive: base.currentSection == section
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: isActive ? UM.Theme.getColor("setting_control_highlight") : "transparent"
|
||||
}
|
||||
|
||||
contentItem: Item
|
||||
{
|
||||
width: childrenRect.width
|
||||
height: UM.Theme.getSize("action_button").height
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: arrow
|
||||
anchors.left: parent.left
|
||||
//anchors.verticalCenter: label.verticalCenter
|
||||
width: UM.Theme.getSize("standard_arrow").width
|
||||
height: UM.Theme.getSize("standard_arrow").height
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
color: UM.Theme.getColor("text")
|
||||
source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: label
|
||||
anchors.left: arrow.right
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
text: button.text
|
||||
font.bold: true
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
}
|
||||
|
||||
onClicked:
|
||||
{
|
||||
base.currentSection = section
|
||||
base.updateCurrentItemUponSectionChange()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component
|
||||
{
|
||||
id: machineButton
|
||||
|
||||
RadioButton
|
||||
{
|
||||
id: radioButton
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("standard_list_lineheight").width
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
height: visible ? UM.Theme.getSize("standard_list_lineheight").height : 0
|
||||
|
||||
checked: ListView.view.currentIndex == index
|
||||
text: name
|
||||
font: UM.Theme.getFont("default")
|
||||
visible: base.currentSection == section
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: "transparent"
|
||||
}
|
||||
|
||||
indicator: Rectangle
|
||||
{
|
||||
implicitWidth: 16
|
||||
implicitHeight: 16
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
radius: width / 2
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: radioButton.hovered ? UM.Theme.getColor("small_button_text") : UM.Theme.getColor("small_button_text_hover")
|
||||
|
||||
Rectangle {
|
||||
width: parent.width / 2
|
||||
height: width
|
||||
anchors.centerIn: parent
|
||||
radius: width / 2
|
||||
color: radioButton.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button")
|
||||
visible: radioButton.checked
|
||||
}
|
||||
}
|
||||
|
||||
contentItem: Label
|
||||
{
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
leftPadding: radioButton.indicator.width + radioButton.spacing
|
||||
text: radioButton.text
|
||||
font: radioButton.font
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
onClicked:
|
||||
{
|
||||
ListView.view.currentIndex = index
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
217
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
Normal file
217
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
Normal file
|
@ -0,0 +1,217 @@
|
|||
// Copyright (c) 2019 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
import UM 1.3 as UM
|
||||
import Cura 1.1 as Cura
|
||||
|
||||
import "../PrinterSelector"
|
||||
|
||||
|
||||
//
|
||||
// This is the widget for adding a network printer. There are 2 parts in this widget. One is a scroll view of a list
|
||||
// of discovered network printers. Beneath the scroll view is a container with 3 buttons: "Refresh", "Add by IP", and
|
||||
// "Troubleshooting".
|
||||
//
|
||||
Item
|
||||
{
|
||||
id: base
|
||||
height: networkPrinterInfo.height + controlsRectangle.height
|
||||
|
||||
property alias maxItemCountAtOnce: networkPrinterScrollView.maxItemCountAtOnce
|
||||
property var currentItem: (networkPrinterListView.currentIndex >= 0)
|
||||
? networkPrinterListView.model[networkPrinterListView.currentIndex]
|
||||
: null
|
||||
|
||||
signal refreshButtonClicked()
|
||||
signal addByIpButtonClicked()
|
||||
|
||||
Item
|
||||
{
|
||||
id: networkPrinterInfo
|
||||
height: networkPrinterScrollView.visible ? networkPrinterScrollView.height : noPrinterLabel.height
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
|
||||
Label
|
||||
{
|
||||
id: noPrinterLabel
|
||||
height: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("default_margin").height
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
text: catalog.i18nc("@label", "There is no printer found over your network.")
|
||||
renderType: Text.NativeRendering
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
visible: !networkPrinterScrollView.visible
|
||||
}
|
||||
|
||||
ScrollView
|
||||
{
|
||||
id: networkPrinterScrollView
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
|
||||
ScrollBar.horizontal.policy: ScrollBar.AsNeeded
|
||||
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
|
||||
|
||||
property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll.
|
||||
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height
|
||||
|
||||
visible: networkPrinterListView.model.length > 0
|
||||
|
||||
clip: true
|
||||
|
||||
ListView
|
||||
{
|
||||
id: networkPrinterListView
|
||||
anchors.fill: parent
|
||||
model: CuraApplication.getDiscoveredPrintersModel().discovered_printers
|
||||
|
||||
Component.onCompleted:
|
||||
{
|
||||
// select the first one that's not "unknown" by default.
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
|
||||
if (!model[i].is_unknown_machine_type)
|
||||
{
|
||||
currentIndex = i
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
delegate: MachineSelectorButton
|
||||
{
|
||||
text: modelData.device.name
|
||||
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 10
|
||||
outputDevice: modelData.device
|
||||
|
||||
enabled: !modelData.is_unknown_machine_type
|
||||
|
||||
printerTypeLabelAutoFit: true
|
||||
|
||||
updatePrinterTypesFunction: updateMachineTypes
|
||||
// show printer type as it is
|
||||
printerTypeLabelConversionFunction: function(value) { return value }
|
||||
|
||||
function updateMachineTypes()
|
||||
{
|
||||
printerTypesList = [ modelData.readable_machine_type ]
|
||||
}
|
||||
|
||||
checkable: false
|
||||
selected: ListView.view.currentIndex == model.index
|
||||
onClicked:
|
||||
{
|
||||
ListView.view.currentIndex = index
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Cura.RoundedRectangle
|
||||
{
|
||||
id: controlsRectangle
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.top: networkPrinterInfo.bottom
|
||||
// Make sure that the left, right, and bottom borders do not show up, otherwise you see double
|
||||
// borders.
|
||||
anchors.bottomMargin: -border.width
|
||||
anchors.leftMargin: -border.width
|
||||
anchors.rightMargin: -border.width
|
||||
|
||||
height: UM.Theme.getSize("message_action_button").height + UM.Theme.getSize("default_margin").height
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: UM.Theme.getColor("lining")
|
||||
color: "white"
|
||||
cornerSide: Cura.RoundedRectangle.Direction.Down
|
||||
|
||||
Cura.SecondaryButton
|
||||
{
|
||||
id: refreshButton
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: catalog.i18nc("@label", "Refresh")
|
||||
height: UM.Theme.getSize("message_action_button").height
|
||||
onClicked: base.refreshButtonClicked()
|
||||
}
|
||||
|
||||
Cura.SecondaryButton
|
||||
{
|
||||
id: addPrinterByIpButton
|
||||
anchors.left: refreshButton.right
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: catalog.i18nc("@label", "Add printer by IP")
|
||||
height: UM.Theme.getSize("message_action_button").height
|
||||
onClicked: base.addByIpButtonClicked()
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: troubleshootingButton
|
||||
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
height: troubleshoortingLinkIcon.height
|
||||
width: troubleshoortingLinkIcon.width + troubleshoortingLabel.width + UM.Theme.getSize("default_margin").width
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: troubleshoortingLinkIcon
|
||||
anchors.right: troubleshoortingLabel.left
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
height: troubleshoortingLabel.height
|
||||
width: height
|
||||
sourceSize.height: width
|
||||
color: UM.Theme.getColor("text_link")
|
||||
source: UM.Theme.getIcon("external_link")
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: troubleshoortingLabel
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: catalog.i18nc("@label", "Troubleshooting")
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text_link")
|
||||
linkColor: UM.Theme.getColor("text_link")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onClicked:
|
||||
{
|
||||
// open the throubleshooting URL with web browser
|
||||
var url = "https://ultimaker.com/incoming-links/cura/material-compatibilty" // TODO
|
||||
Qt.openUrlExternally(url)
|
||||
}
|
||||
onEntered:
|
||||
{
|
||||
troubleshoortingLabel.font.underline = true
|
||||
}
|
||||
onExited:
|
||||
{
|
||||
troubleshoortingLabel.font.underline = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -201,7 +201,7 @@ Item
|
|||
text: catalog.i18nc("@button", "Cancel")
|
||||
width: 140
|
||||
fixedWidthMode: true
|
||||
onClicked: base.showPreviousPage()
|
||||
onClicked: base.gotoPage("add_printer_by_selection")
|
||||
|
||||
enabled: true
|
||||
}
|
||||
|
|
154
resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
Normal file
154
resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
Normal file
|
@ -0,0 +1,154 @@
|
|||
// Copyright (c) 2019 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
import UM 1.3 as UM
|
||||
import Cura 1.1 as Cura
|
||||
|
||||
|
||||
//
|
||||
// This component contains the content for the "Add a printer" (network) page of the welcome on-boarding process.
|
||||
//
|
||||
Item
|
||||
{
|
||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||
|
||||
Label
|
||||
{
|
||||
id: titleLabel
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 40
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: catalog.i18nc("@label", "Add a printer")
|
||||
color: UM.Theme.getColor("primary_button")
|
||||
font: UM.Theme.getFont("large_bold")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
DropDownWidget
|
||||
{
|
||||
id: addNetworkPrinterDropDown
|
||||
|
||||
anchors.top: titleLabel.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: 20
|
||||
|
||||
title: catalog.i18nc("@label", "Add a networked printer")
|
||||
contentShown: true // by default expand the network printer list
|
||||
|
||||
onClicked:
|
||||
{
|
||||
if (contentShown)
|
||||
{
|
||||
addLocalPrinterDropDown.contentShown = false
|
||||
}
|
||||
}
|
||||
|
||||
contentComponent: networkPrinterListComponent
|
||||
|
||||
Component
|
||||
{
|
||||
id: networkPrinterListComponent
|
||||
|
||||
AddNetworkPrinterScrollView
|
||||
{
|
||||
id: networkPrinterScrollView
|
||||
|
||||
maxItemCountAtOnce: 6 // show at max 6 items at once, otherwise you need to scroll.
|
||||
|
||||
onRefreshButtonClicked:
|
||||
{
|
||||
UM.OutputDeviceManager.startDiscovery()
|
||||
}
|
||||
|
||||
onAddByIpButtonClicked:
|
||||
{
|
||||
base.gotoPage("add_printer_by_ip")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DropDownWidget
|
||||
{
|
||||
id: addLocalPrinterDropDown
|
||||
|
||||
anchors.top: addNetworkPrinterDropDown.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: 20
|
||||
|
||||
title: catalog.i18nc("@label", "Add a non-networked printer")
|
||||
|
||||
onClicked:
|
||||
{
|
||||
if (contentShown)
|
||||
{
|
||||
addNetworkPrinterDropDown.contentShown = false
|
||||
}
|
||||
}
|
||||
|
||||
contentComponent: localPrinterListComponent
|
||||
|
||||
Component
|
||||
{
|
||||
id: localPrinterListComponent
|
||||
|
||||
AddLocalPrinterScrollView
|
||||
{
|
||||
id: localPrinterView
|
||||
|
||||
maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Cura.PrimaryButton
|
||||
{
|
||||
id: nextButton
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.margins: 40
|
||||
enabled:
|
||||
{
|
||||
// If the network printer dropdown is expanded, make sure that there is a selected item
|
||||
if (addNetworkPrinterDropDown.contentShown)
|
||||
{
|
||||
return addNetworkPrinterDropDown.contentItem.currentItem != null
|
||||
}
|
||||
else
|
||||
{
|
||||
return addLocalPrinterDropDown.contentItem.currentItem != null
|
||||
}
|
||||
}
|
||||
|
||||
text: catalog.i18nc("@button", "Next")
|
||||
width: 140
|
||||
fixedWidthMode: true
|
||||
onClicked:
|
||||
{
|
||||
// Create a network printer or a local printer according to the selection
|
||||
if (addNetworkPrinterDropDown.contentShown)
|
||||
{
|
||||
// Create a network printer
|
||||
const networkPrinterItem = addNetworkPrinterDropDown.contentItem.currentItem
|
||||
CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
|
||||
}
|
||||
else
|
||||
{
|
||||
// Create a local printer
|
||||
const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
|
||||
Cura.MachineManager.addMachine(localPrinterItem.id)
|
||||
}
|
||||
|
||||
// TODO: implement machine actions
|
||||
|
||||
// If we have created a machine, go to the last page, which is the "cloud" page.
|
||||
base.gotoPage("cloud")
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,106 +0,0 @@
|
|||
// Copyright (c) 2019 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.10
|
||||
import QtQuick.Controls 2.3
|
||||
|
||||
import UM 1.3 as UM
|
||||
import Cura 1.1 as Cura
|
||||
|
||||
import "../PrinterSelector"
|
||||
|
||||
//
|
||||
// This component contains the content for the "Add a printer" (network) page of the welcome on-boarding process.
|
||||
//
|
||||
Item
|
||||
{
|
||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||
|
||||
Label
|
||||
{
|
||||
id: titleLabel
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 40
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: catalog.i18nc("@label", "Add a printer")
|
||||
color: UM.Theme.getColor("primary_button")
|
||||
font: UM.Theme.getFont("large_bold")
|
||||
renderType: Text.NativeRendering
|
||||
}
|
||||
|
||||
DropDownWidget
|
||||
{
|
||||
id: addNetworkPrinterDropDown
|
||||
|
||||
anchors.top: titleLabel.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: 20
|
||||
|
||||
title: catalog.i18nc("@label", "Add a network printer")
|
||||
|
||||
contentComponent: networkPrinterListComponent
|
||||
|
||||
Component
|
||||
{
|
||||
id: networkPrinterListComponent
|
||||
|
||||
ScrollView
|
||||
{
|
||||
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
|
||||
ScrollBar.vertical.policy: ScrollBar.AlwaysOn
|
||||
|
||||
property int maxItemCountAtOnce: 5 // show at max 10 items at once, otherwise you need to scroll.
|
||||
height: maxItemCountAtOnce * (UM.Theme.getSize("action_button").height)
|
||||
|
||||
clip: true
|
||||
|
||||
ListView
|
||||
{
|
||||
id: listView
|
||||
anchors.fill: parent
|
||||
model: Cura.GlobalStacksModel {} // TODO: change this to the network printers
|
||||
|
||||
delegate: MachineSelectorButton
|
||||
{
|
||||
text: model.name
|
||||
width: listView.width - UM.Theme.getSize("default_margin").width
|
||||
outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
|
||||
|
||||
checked: ListView.view.currentIndex == index
|
||||
onClicked:
|
||||
{
|
||||
ListView.view.currentIndex = index
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DropDownWidget
|
||||
{
|
||||
id: addLocalPrinterDropDown
|
||||
|
||||
anchors.top: addNetworkPrinterDropDown.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.margins: 20
|
||||
|
||||
title: catalog.i18nc("@label", "Add a non-network printer")
|
||||
}
|
||||
|
||||
Cura.PrimaryButton
|
||||
{
|
||||
id: nextButton
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.margins: 40
|
||||
enabled: true // TODO
|
||||
text: catalog.i18nc("@button", "Next")
|
||||
width: 140
|
||||
fixedWidthMode: true
|
||||
onClicked: base.showNextPage()
|
||||
}
|
||||
}
|
|
@ -99,14 +99,13 @@ Item
|
|||
text: catalog.i18nc("@button", "Create an account")
|
||||
width: 140
|
||||
fixedWidthMode: true
|
||||
onClicked: base.showNextPage() // TODO: create account
|
||||
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
|
||||
}
|
||||
|
||||
Cura.SecondaryButton
|
||||
{
|
||||
id: signInButton
|
||||
anchors.left: createAccountButton.right
|
||||
//anchors.leftMargin: 10
|
||||
anchors.verticalCenter: finishButton.verticalCenter
|
||||
text: catalog.i18nc("@button", "Sign in")
|
||||
width: 80
|
||||
|
@ -115,6 +114,6 @@ Item
|
|||
hoverColor: "transparent"
|
||||
textHoverColor: UM.Theme.getColor("text_light_blue")
|
||||
fixedWidthMode: true
|
||||
onClicked: base.showNextPage() // TODO: sign in
|
||||
onClicked: Cura.API.account.login()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ import ".."
|
|||
|
||||
|
||||
//
|
||||
// This is DropDown Header bar of the expandable drop down list.
|
||||
// This is DropDown Header bar of the expandable drop down list. See comments in DropDownWidget for details.
|
||||
//
|
||||
Cura.RoundedRectangle
|
||||
{
|
||||
|
@ -34,6 +34,8 @@ Cura.RoundedRectangle
|
|||
// If the content is shown
|
||||
property bool contentShown: false
|
||||
|
||||
signal clicked()
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
|
@ -41,7 +43,7 @@ Cura.RoundedRectangle
|
|||
onEntered: base.hovered = true
|
||||
onExited: base.hovered = false
|
||||
|
||||
onClicked: base.contentShown = !base.contentShown
|
||||
onClicked: base.clicked()
|
||||
}
|
||||
|
||||
Label
|
||||
|
|
|
@ -8,6 +8,13 @@ import UM 1.3 as UM
|
|||
import Cura 1.1 as Cura
|
||||
|
||||
|
||||
//
|
||||
// This is the dropdown list widget in the welcome wizard. The dropdown list has a header bar which is always present,
|
||||
// and its content whose visibility can be toggled by clicking on the header bar. The content is displayed as an
|
||||
// expandable dropdown box that will appear below the header bar.
|
||||
//
|
||||
// The content is configurable via the property "contentComponent", which will be loaded by a Loader when set.
|
||||
//
|
||||
Item
|
||||
{
|
||||
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||
|
@ -15,12 +22,25 @@ Item
|
|||
id: base
|
||||
|
||||
implicitWidth: 200
|
||||
height: header.contentShown ? childrenRect.height : header.height
|
||||
height: header.contentShown ? (header.height + contentRectangle.height + 30) : header.height
|
||||
|
||||
property var contentComponent: null
|
||||
property alias contentItem: contentLoader.item
|
||||
|
||||
property alias title: header.title
|
||||
property alias contentShown: header.contentShown
|
||||
property bool contentShown: false
|
||||
|
||||
signal clicked()
|
||||
|
||||
Connections
|
||||
{
|
||||
target: header
|
||||
onClicked:
|
||||
{
|
||||
base.contentShown = !base.contentShown
|
||||
clicked()
|
||||
}
|
||||
}
|
||||
|
||||
DropDownHeader
|
||||
{
|
||||
|
@ -30,15 +50,16 @@ Item
|
|||
anchors.right: parent.right
|
||||
height: UM.Theme.getSize("expandable_component_content_header").height
|
||||
rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")
|
||||
contentShown: base.contentShown
|
||||
}
|
||||
|
||||
Cura.RoundedRectangle
|
||||
{
|
||||
id: contentRectangle
|
||||
anchors.top: header.bottom
|
||||
anchors.horizontalCenter: header.horizontalCenter
|
||||
width: header.width
|
||||
height: childrenRect.height
|
||||
anchors.left: header.left
|
||||
anchors.right: header.right
|
||||
height: contentLoader.height + 2
|
||||
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: UM.Theme.getColor("lining")
|
||||
|
@ -53,7 +74,6 @@ Item
|
|||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
height: childrenRect.height
|
||||
anchors.margins: 1
|
||||
sourceComponent: base.contentComponent != null ? base.contentComponent : emptyComponent
|
||||
}
|
||||
|
|
|
@ -33,6 +33,7 @@ Item
|
|||
signal showNextPage()
|
||||
signal showPreviousPage()
|
||||
signal passLastPage() // Emitted when there is no more page to show
|
||||
signal gotoPage(string page_id) // Go to a specific page by the given page_id.
|
||||
|
||||
onShowNextPage:
|
||||
{
|
||||
|
@ -53,6 +54,29 @@ Item
|
|||
}
|
||||
}
|
||||
|
||||
onGotoPage:
|
||||
{
|
||||
// find the page index
|
||||
var page_index = -1
|
||||
for (var i = 0; i < base.model.count; i++)
|
||||
{
|
||||
const item = base.model.getItem(i)
|
||||
if (item.id == page_id)
|
||||
{
|
||||
page_index = i
|
||||
break
|
||||
}
|
||||
}
|
||||
if (page_index > 0)
|
||||
{
|
||||
currentStep = page_index
|
||||
}
|
||||
else
|
||||
{
|
||||
console.log("Error: cannot find page with page_id = [", page_id, "]")
|
||||
}
|
||||
}
|
||||
|
||||
onVisibleChanged:
|
||||
{
|
||||
if (visible)
|
||||
|
|
|
@ -0,0 +1,61 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Draft
|
||||
definition = anycubic_chiron
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = draft
|
||||
weight = -2
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
acceleration_print = 1800
|
||||
acceleration_travel = 3000
|
||||
adhesion_type = skirt
|
||||
brim_width = 4.0
|
||||
cool_fan_full_at_height = 0.5
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_0 = 100
|
||||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 25
|
||||
initial_layer_line_width_factor = 140
|
||||
jerk_enabled = True
|
||||
jerk_print = 8
|
||||
jerk_travel = 10
|
||||
layer_height = 0.3
|
||||
layer_height_0 = 0.3
|
||||
material_bed_temperature = 60
|
||||
material_diameter = 1.75
|
||||
material_print_temperature = 200
|
||||
material_print_temperature_layer_0 = 0
|
||||
retract_at_layer_change = False
|
||||
retraction_amount = 6
|
||||
retraction_hop = 0.075
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 1.5
|
||||
retraction_speed = 40
|
||||
skirt_brim_speed = 40
|
||||
skirt_gap = 5
|
||||
skirt_line_count = 3
|
||||
speed_infill = =speed_print
|
||||
speed_print = 60
|
||||
speed_support = 60
|
||||
speed_topbottom = =math.ceil(speed_print * 30 / 60)
|
||||
speed_travel = 100
|
||||
speed_wall = =speed_print
|
||||
speed_wall_x = =speed_print
|
||||
support_angle = 60
|
||||
support_enable = True
|
||||
support_interface_enable = True
|
||||
support_pattern = triangles
|
||||
support_roof_enable = True
|
||||
support_type = everywhere
|
||||
support_use_towers = False
|
||||
support_xy_distance = 0.7
|
||||
top_bottom_thickness = 1.2
|
||||
wall_thickness = 1.2
|
|
@ -0,0 +1,61 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = High
|
||||
definition = anycubic_chiron
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
acceleration_print = 1800
|
||||
acceleration_travel = 3000
|
||||
adhesion_type = skirt
|
||||
brim_width = 4.0
|
||||
cool_fan_full_at_height = 0.5
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_0 = 100
|
||||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 25
|
||||
initial_layer_line_width_factor = 140
|
||||
jerk_enabled = True
|
||||
jerk_print = 8
|
||||
jerk_travel = 10
|
||||
layer_height = 0.1
|
||||
layer_height_0 = 0.1
|
||||
material_bed_temperature = 60
|
||||
material_diameter = 1.75
|
||||
material_print_temperature = 200
|
||||
material_print_temperature_layer_0 = 0
|
||||
retract_at_layer_change = False
|
||||
retraction_amount = 6
|
||||
retraction_hop = 0.075
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 1.5
|
||||
retraction_speed = 40
|
||||
skirt_brim_speed = 40
|
||||
skirt_gap = 5
|
||||
skirt_line_count = 3
|
||||
speed_infill = =speed_print
|
||||
speed_print = 50
|
||||
speed_support = 30
|
||||
speed_topbottom = =math.ceil(speed_print * 20 / 50)
|
||||
speed_travel = 50
|
||||
speed_wall = =speed_print
|
||||
speed_wall_x = =speed_print
|
||||
support_angle = 60
|
||||
support_enable = True
|
||||
support_interface_enable = True
|
||||
support_pattern = triangles
|
||||
support_roof_enable = True
|
||||
support_type = everywhere
|
||||
support_use_towers = False
|
||||
support_xy_distance = 0.7
|
||||
top_bottom_thickness = 1.2
|
||||
wall_thickness = 1.2
|
|
@ -0,0 +1,61 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = anycubic_chiron
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
acceleration_enabled = True
|
||||
acceleration_print = 1800
|
||||
acceleration_travel = 3000
|
||||
adhesion_type = skirt
|
||||
brim_width = 4.0
|
||||
cool_fan_full_at_height = 0.5
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_0 = 100
|
||||
infill_overlap = 15
|
||||
infill_pattern = zigzag
|
||||
infill_sparse_density = 25
|
||||
initial_layer_line_width_factor = 140
|
||||
jerk_enabled = True
|
||||
jerk_print = 8
|
||||
jerk_travel = 10
|
||||
layer_height = 0.2
|
||||
layer_height_0 = 0.2
|
||||
material_bed_temperature = 60
|
||||
material_diameter = 1.75
|
||||
material_print_temperature = 200
|
||||
material_print_temperature_layer_0 = 0
|
||||
retract_at_layer_change = False
|
||||
retraction_amount = 6
|
||||
retraction_hop = 0.075
|
||||
retraction_hop_enabled = True
|
||||
retraction_hop_only_when_collides = True
|
||||
retraction_min_travel = 1.5
|
||||
retraction_speed = 40
|
||||
skirt_brim_speed = 40
|
||||
skirt_gap = 5
|
||||
skirt_line_count = 3
|
||||
speed_infill = =speed_print
|
||||
speed_print = 50
|
||||
speed_support = 30
|
||||
speed_topbottom = =math.ceil(speed_print * 20 / 50)
|
||||
speed_travel = 100
|
||||
speed_wall = =speed_print
|
||||
speed_wall_x = =speed_print
|
||||
support_angle = 60
|
||||
support_enable = True
|
||||
support_interface_enable = True
|
||||
support_pattern = triangles
|
||||
support_roof_enable = True
|
||||
support_type = everywhere
|
||||
support_use_towers = False
|
||||
support_xy_distance = 0.7
|
||||
top_bottom_thickness = 1.2
|
||||
wall_thickness = 1.2
|
2
resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_abs
|
|||
[values]
|
||||
adhesion_type = raft
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 2
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
cool_fan_speed_min = 50
|
||||
|
|
2
resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_abs
|
|||
[values]
|
||||
adhesion_type = raft
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 2
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
cool_fan_speed_min = 50
|
||||
|
|
4
resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg
Normal file → Executable file
4
resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg
Normal file → Executable file
|
@ -7,13 +7,13 @@ definition = deltacomb
|
|||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
weight = 0
|
||||
material = generic_abs
|
||||
|
||||
[values]
|
||||
adhesion_type = raft
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 2
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
cool_fan_speed_min = 50
|
||||
|
|
2
resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_abs
|
|||
[values]
|
||||
adhesion_type = raft
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 2
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
cool_fan_speed_min = 50
|
||||
|
|
2
resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_abs
|
|||
[values]
|
||||
adhesion_type = raft
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 2
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 50
|
||||
cool_fan_speed_max = 50
|
||||
cool_fan_speed_min = 50
|
||||
|
|
|
@ -7,7 +7,7 @@ definition = deltacomb
|
|||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
weight = 0
|
||||
global_quality = True
|
||||
|
||||
[values]
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Fast
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = draft
|
||||
weight = -2
|
||||
material = generic_petg
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 60
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 60
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
speed_print = 50
|
||||
default_material_print_temperature = 235
|
||||
material_standby_temperature = 215
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
material = generic_petg
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 60
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 60
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
speed_print = 50
|
||||
default_material_print_temperature = 235
|
||||
material_standby_temperature = 215
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Extra Fine
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 0
|
||||
material = generic_petg
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 60
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 60
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
speed_print = 50
|
||||
default_material_print_temperature = 235
|
||||
material_standby_temperature = 215
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Fine
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
material = generic_petg
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 60
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 60
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
speed_print = 50
|
||||
default_material_print_temperature = 235
|
||||
material_standby_temperature = 215
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
|
@ -0,0 +1,25 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Extra Fast
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = verydraft
|
||||
weight = -3
|
||||
material = generic_petg
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 60
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 60
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
speed_print = 50
|
||||
default_material_print_temperature = 235
|
||||
material_standby_temperature = 215
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
2
resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_pla
|
|||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
|
|
2
resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_pla
|
|||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
|
|
4
resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg
Normal file → Executable file
4
resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg
Normal file → Executable file
|
@ -7,13 +7,13 @@ definition = deltacomb
|
|||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 1
|
||||
weight = 0
|
||||
material = generic_pla
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
|
|
2
resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_pla
|
|||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
|
|
2
resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg
Normal file → Executable file
2
resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg
Normal file → Executable file
|
@ -13,7 +13,7 @@ material = generic_pla
|
|||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height
|
||||
cool_fan_full_at_height = =layer_height * 4
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 100
|
||||
|
|
27
resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg
Executable file
27
resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg
Executable file
|
@ -0,0 +1,27 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Fast
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = draft
|
||||
weight = -2
|
||||
material = generic_tpu
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 70
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
||||
speed_print = 25
|
||||
speed_travel = 300
|
||||
acceleration_travel = 10000
|
||||
retraction_amount = 5
|
||||
retraction_hop_enabled = False
|
27
resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg
Executable file
27
resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg
Executable file
|
@ -0,0 +1,27 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Normal
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = fast
|
||||
weight = -1
|
||||
material = generic_tpu
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 70
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
||||
speed_print = 25
|
||||
speed_travel = 300
|
||||
acceleration_travel = 10000
|
||||
retraction_amount = 5
|
||||
retraction_hop_enabled = False
|
27
resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg
Executable file
27
resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg
Executable file
|
@ -0,0 +1,27 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Extra Fine
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = high
|
||||
weight = 0
|
||||
material = generic_tpu
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 70
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
||||
speed_print = 25
|
||||
speed_travel = 300
|
||||
acceleration_travel = 10000
|
||||
retraction_amount = 5
|
||||
retraction_hop_enabled = False
|
27
resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg
Executable file
27
resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg
Executable file
|
@ -0,0 +1,27 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Fine
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = normal
|
||||
weight = 0
|
||||
material = generic_tpu
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 70
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
||||
speed_print = 25
|
||||
speed_travel = 300
|
||||
acceleration_travel = 10000
|
||||
retraction_amount = 5
|
||||
retraction_hop_enabled = False
|
27
resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg
Executable file
27
resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg
Executable file
|
@ -0,0 +1,27 @@
|
|||
[general]
|
||||
version = 4
|
||||
name = Extra Fast
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = quality
|
||||
quality_type = verydraft
|
||||
weight = -3
|
||||
material = generic_tpu
|
||||
|
||||
[values]
|
||||
adhesion_type = skirt
|
||||
cool_fan_enabled = True
|
||||
cool_fan_full_at_height = =layer_height * 6
|
||||
cool_fan_speed = 100
|
||||
cool_fan_speed_max = 100
|
||||
cool_fan_speed_min = 70
|
||||
cool_min_layer_time = 5
|
||||
cool_min_speed = 20
|
||||
material_print_temperature_layer_0 = =default_material_print_temperature + 5
|
||||
speed_print = 25
|
||||
speed_travel = 300
|
||||
acceleration_travel = 10000
|
||||
retraction_amount = 5
|
||||
retraction_hop_enabled = False
|
13
resources/variants/deltacomb_025_e3d.inst.cfg
Executable file
13
resources/variants/deltacomb_025_e3d.inst.cfg
Executable file
|
@ -0,0 +1,13 @@
|
|||
[general]
|
||||
name = E3D 0.25mm
|
||||
version = 4
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
author = Deltacomb 3D
|
||||
setting_version = 5
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 0.25
|
13
resources/variants/deltacomb_040_e3d.inst.cfg
Executable file
13
resources/variants/deltacomb_040_e3d.inst.cfg
Executable file
|
@ -0,0 +1,13 @@
|
|||
[general]
|
||||
name = E3D 0.40mm
|
||||
version = 4
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
author = Deltacomb 3D
|
||||
setting_version = 5
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 0.4
|
13
resources/variants/deltacomb_080_e3d.inst.cfg
Executable file
13
resources/variants/deltacomb_080_e3d.inst.cfg
Executable file
|
@ -0,0 +1,13 @@
|
|||
[general]
|
||||
name = E3D 0.80mm
|
||||
version = 4
|
||||
definition = deltacomb
|
||||
|
||||
[metadata]
|
||||
author = Deltacomb 3D
|
||||
setting_version = 5
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_size = 0.8
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 0.20mm (Clear)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 0.20mm (Clear)
|
||||
machine_nozzle_size = 0.20
|
||||
machine_nozzle_tip_outer_diameter = 0.30
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 0.25mm (Red)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 0.25mm (Red)
|
||||
machine_nozzle_size = 0.25
|
||||
machine_nozzle_tip_outer_diameter = 0.35
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 0.41mm (Blue)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 0.41mm (Blue)
|
||||
machine_nozzle_size = 0.41
|
||||
machine_nozzle_tip_outer_diameter = 0.51
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 0.58mm (Pink)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 0.58mm (Pink)
|
||||
machine_nozzle_size = 0.58
|
||||
machine_nozzle_tip_outer_diameter = 0.68
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 0.84mm (Green)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 0.84mm (Green)
|
||||
machine_nozzle_size = 0.84
|
||||
machine_nozzle_tip_outer_diameter = 0.94
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 1.19mm (Grey)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 1.19mm (Grey)
|
||||
machine_nozzle_size = 1.19
|
||||
machine_nozzle_tip_outer_diameter = 1.29
|
|
@ -0,0 +1,14 @@
|
|||
[general]
|
||||
name = 1.60mm (Olive)
|
||||
version = 4
|
||||
definition = structur3d_discov3ry1_complete_um2plus
|
||||
|
||||
[metadata]
|
||||
setting_version = 7
|
||||
type = variant
|
||||
hardware_type = nozzle
|
||||
|
||||
[values]
|
||||
machine_nozzle_id = 1.60mm (Olive)
|
||||
machine_nozzle_size = 1.60
|
||||
machine_nozzle_tip_outer_diameter = 1.70
|
Loading…
Add table
Add a link
Reference in a new issue