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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jack Ha 2016-10-06 15:23:14 +02:00
commit ab23637f3b
37 changed files with 89 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1211,7 +1211,7 @@
"minimum_value": "0",
"minimum_value_warning": "1",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "25",
"maximum_value_warning": "70",
"enabled": "retraction_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -1225,7 +1225,7 @@
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"minimum_value_warning": "1",
"maximum_value_warning": "25",
"maximum_value_warning": "70",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": false,
@ -1240,7 +1240,7 @@
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"minimum_value_warning": "1",
"maximum_value_warning": "25",
"maximum_value_warning": "70",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": false,
@ -1363,7 +1363,9 @@
"enabled": "retraction_enable",
"default_value": 20,
"minimum_value": "0.1",
"maximum_value_warning": "25",
"minimum_value_warning": "1",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "70",
"settable_per_mesh": false,
"settable_per_extruder": true,
"children":
@ -1378,7 +1380,9 @@
"default_value": 20,
"value": "switch_extruder_retraction_speeds",
"minimum_value": "0.1",
"maximum_value_warning": "25",
"minimum_value_warning": "1",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "70",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -1392,7 +1396,9 @@
"default_value": 20,
"value": "switch_extruder_retraction_speeds",
"minimum_value": "0.1",
"maximum_value_warning": "25",
"minimum_value_warning": "1",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "70",
"settable_per_mesh": false,
"settable_per_extruder": true
}
@ -2865,7 +2871,7 @@
"type": "float",
"default_value": 15,
"minimum_value_warning": "raft_interface_line_width",
"maximum_value_warning": "10",
"maximum_value_warning": "20",
"enabled": "resolveOrValue('adhesion_type') == 'raft'",
"limit_to_extruder": "adhesion_extruder_nr",
"settable_per_mesh": false,
@ -2893,7 +2899,7 @@
"default_value": 0.22,
"value": "raft_airgap / 2",
"minimum_value": "0",
"maximum_value_warning": "layer_height",
"maximum_value_warning": "raft_airgap",
"enabled": "resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -2970,7 +2976,7 @@
"value": "layer_height * 1.5",
"minimum_value": "0.001",
"minimum_value_warning": "0.04",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'raft_interface_line_width')",
"enabled": "resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -3018,7 +3024,7 @@
"value": "resolveOrValue('layer_height_0') * 1.2",
"minimum_value": "0.001",
"minimum_value_warning": "0.04",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'raft_base_line_width')",
"enabled": "resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,

4
resources/qml/MonitorButton.qml
View file

@ -161,10 +161,6 @@ Rectangle
visible: showProgress;
indeterminate:
{
if(!showProgress)
{
return false; //Never be indeterminate when not visible, since that triggers a redraw of the screen.
}
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{
case "pausing":

2
resources/quality/high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = fdmprinter
[metadata]
type = quality
quality_type = high
weight = -3
weight = 1
[values]
layer_height = 0.06

2
resources/quality/normal.inst.cfg
View file

@ -6,6 +6,6 @@ definition = fdmprinter
[metadata]
type = quality
quality_type = normal
weight = -2
weight = 0
[values]

2
resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pla_ultimaker2_plus_0.25_mm
weight = -2
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pla_ultimaker2_plus_0.4_mm
weight = -3
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pla_ultimaker2_plus_0.4_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
material = generic_pla_ultimaker2_plus_0.6_mm
type = quality
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
material = generic_pla_ultimaker2_plus_0.8_mm
type = quality
weight = -2
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.25_mm
weight = -2
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.4_mm
weight = -3
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.4_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.6_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_abs_ultimaker2_plus_0.8_mm
weight = -2
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.25_mm
weight = -2
weight = -1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.4_mm
weight = -3
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.4_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.6_mm
weight = -2
weight = 0
quality_type = normal
[values]

2
resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_ultimaker2_plus_0.8_mm
weight = -2
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_plus_ultimaker2_plus_0.4_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_plus_ultimaker2_plus_0.6_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_cpe_plus_ultimaker2_plus_0.8_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.25_mm
weight = 0
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.4_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.6_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_nylon_ultimaker2_plus_0.8_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.25_mm
weight = 0
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.4_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.6_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_pc_ultimaker2_plus_0.8_mm
weight = 0
weight = -2
quality_type = draft
[values]

2
resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_tpu_ultimaker2_plus_0.25_mm
weight = 0
weight = 1
quality_type = high
[values]

2
resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
View file

@ -6,7 +6,7 @@ definition = ultimaker2_plus
[metadata]
type = quality
material = generic_tpu_ultimaker2_plus_0.6_mm
weight = 0
weight = -1
quality_type = fast
[values]

2
resources/themes/cura/styles.qml
View file

@ -237,7 +237,7 @@ QtObject {
SequentialAnimation on x {
id: xAnim
property int animEndPoint: Theme.getSize("message").width - (Theme.getSize("default_margin").width * 2) - Theme.getSize("progressbar_control").width
running: control.indeterminate
running: control.indeterminate && control.visible
loops: Animation.Infinite
NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;}
NumberAnimation { from: xAnim.animEndPoint; to: 0; duration: 2000;}