3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Jaime van Kessel 2019-10-28 10:31:18 +01:00
commit b8060f9bb7
No known key found for this signature in database
GPG key ID: 3710727397403C91
6 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.github/ISSUE_TEMPLATE.md vendored
View file

@ -11,23 +11,24 @@ Information about how to find the log file can be found at https://github.com/Ul
Thank you for using Cura! Thank you for using Cura!
--> -->
**Application Version** **Application version**
<!-- The version of the application this issue occurs with --> (The version of the application this issue occurs with.)
**Platform** **Platform**
<!-- Information about the operating system the issue occurs on --> (Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU.)
**Printer** **Printer**
<!-- Which printer was selected in Cura. Please attach project file as .curaproject.3mf.zip --> (Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip.)
**Steps to Reproduce** **Reproduction steps**
<!-- Add the steps needed that lead up to the issue --> 1. Something you did.
2. Something you did next.
**Actual Results** **Actual results**
<!-- What happens after the above steps have been followed --> (What happens after the above steps have been followed.)
**Expected results** **Expected results**
<!-- What should happen after the above steps have been followed --> (What should happen after the above steps have been followed.)
**Additional Information** **Additional information**
<!-- Extra information relevant to the issue, like screenshots --> (Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report.)

15
.github/ISSUE_TEMPLATE/bug-report.md vendored
View file

@ -22,22 +22,23 @@ Thank you for using Cura!
--> -->
**Application version** **Application version**
<!-- The version of the application this issue occurs with --> (The version of the application this issue occurs with.)
**Platform** **Platform**
<!-- Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU. --> (Information about the operating system the issue occurs on. Include at least the operating system. In the case of visual glitches/issues, also include information about your graphics drivers and GPU.)
**Printer** **Printer**
<!-- Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip --> (Which printer was selected in Cura? If possible, please attach project file as .curaproject.3mf.zip.)
**Reproduction steps** **Reproduction steps**
<!-- How did you encounter the bug? --> 1. Something you did.
2. Something you did next.
**Actual results** **Actual results**
<!-- What happens after the above steps have been followed --> (What happens after the above steps have been followed.)
**Expected results** **Expected results**
<!-- What should happen after the above steps have been followed --> (What should happen after the above steps have been followed.)
**Additional information** **Additional information**
<!-- Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report. --> (Extra information relevant to the issue, like screenshots. Don't forget to attach the log files with this issue report.)

11
.github/ISSUE_TEMPLATE/feature_request.md vendored
View file

@ -8,15 +8,16 @@ assignees: ''
--- ---
**Is your feature request related to a problem? Please describe.** **Is your feature request related to a problem? Please describe.**
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] --> (A clear and concise description of what the problem is. Ex. I'm always frustrated when [...])
**Describe the solution you'd like** **Describe the solution you'd like**
<!--A clear and concise description of what you want to happen. If possible, describe why you think this is a good solution.--> (A clear and concise description of what you want to happen. If possible, describe why you think this is a good solution.)
**Describe alternatives you've considered** **Describe alternatives you've considered**
<!-- A clear and concise description of any alternative solutions or features you've considered. Again, if possible, think about why these alternatives are not working out. --> (A clear and concise description of any alternative solutions or features you've considered. Again, if possible, think about why these alternatives are not working out.)
**Affected users and/or printers** **Affected users and/or printers**
<!-- Who do you think will benefit from this? Is everyone going to benefit from these changes? Only a few people? --> (Who do you think will benefit from this? Is everyone going to benefit from these changes? Or specific kinds of users?)
**Additional context** **Additional context**
<!-- Add any other context or screenshots about the feature request here. --> (Add any other context or screenshots about the feature request here.)

7
cura_app.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import argparse import argparse
@ -131,7 +131,10 @@ def exceptHook(hook_type, value, traceback):
# Set exception hook to use the crash dialog handler # Set exception hook to use the crash dialog handler
sys.excepthook = exceptHook sys.excepthook = exceptHook
# Enable dumping traceback for all threads # Enable dumping traceback for all threads
faulthandler.enable(all_threads = True) if sys.stderr:
faulthandler.enable(file = sys.stderr, all_threads = True)
else:
faulthandler.enable(file = sys.stdout, all_threads = True)
# Workaround for a race condition on certain systems where there # Workaround for a race condition on certain systems where there
# is a race condition between Arcus and PyQt. Importing Arcus # is a race condition between Arcus and PyQt. Importing Arcus

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

@ -6658,30 +6658,26 @@
}, },
"flow_rate_max_extrusion_offset": "flow_rate_max_extrusion_offset":
{ {
"label": "Flow rate compensation max extrusion offset", "label": "Flow Rate Compensation Max Extrusion Offset",
"description": "The maximum distance in mm to compensate.", "description": "The maximum distance in mm to move the filament to compensate for changes in flow rate.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "10", "maximum_value_warning": "10",
"default_value": 0, "default_value": 0,
"value": "0",
"enabled": true,
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
}, },
"flow_rate_extrusion_offset_factor": "flow_rate_extrusion_offset_factor":
{ {
"label": "Flow rate compensation factor", "label": "Flow Rate Compensation Factor",
"description": "The multiplication factor for the flow rate -> distance translation.", "description": "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion.",
"unit": "%", "unit": "%",
"type": "float", "type": "float",
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"default_value": 100, "default_value": 100,
"value": "100",
"enabled": true,
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -6704,7 +6700,7 @@
"unit": "mm", "unit": "mm",
"default_value": 3, "default_value": 3,
"value": "machine_nozzle_head_distance", "value": "machine_nozzle_head_distance",
"minimum_value": "0.0001", "minimum_value": "0.001",
"maximum_value_warning": "20", "maximum_value_warning": "20",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -6734,7 +6730,7 @@
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.05",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
@ -6750,11 +6746,11 @@
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.05",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
"value": "wireframe_printspeed", "value": "wireframe_printspeed_flat",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -6766,7 +6762,7 @@
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.05",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
@ -6782,7 +6778,7 @@
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.05",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2 + machine_max_feedrate_z ** 2)",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled",
@ -6798,7 +6794,7 @@
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 5, "default_value": 5,
"minimum_value": "0.1", "minimum_value": "0.05",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"value": "wireframe_printspeed", "value": "wireframe_printspeed",
@ -6921,7 +6917,7 @@
"default_value": 0.6, "default_value": 0.6,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "2.0", "maximum_value_warning": "2.0",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled and wireframe_strategy == 'knot'",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -6935,7 +6931,7 @@
"default_value": 0.5, "default_value": 0.5,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "wireframe_height", "maximum_value_warning": "wireframe_height",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled and wireframe_strategy == 'compensate'",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -6949,7 +6945,7 @@
"default_value": 0.6, "default_value": 0.6,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "wireframe_height", "maximum_value_warning": "wireframe_height",
"enabled": "wireframe_enabled", "enabled": "wireframe_enabled and wireframe_strategy == 'compensate'",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
@ -7072,7 +7068,7 @@
"default_value": 0.01, "default_value": 0.01,
"unit": "mm", "unit": "mm",
"settable_per_mesh": false, "settable_per_mesh": false,
"minimum_value": "0.0001", "minimum_value": "0.001",
"settable_per_extruder": false, "settable_per_extruder": false,
"settable_per_meshgroup": false "settable_per_meshgroup": false
}, },

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

@ -14,7 +14,7 @@
"has_variants": true, "has_variants": true,
"preferred_variant_name": "Standard 0.6", "preferred_variant_name": "Standard 0.6",
"preferred_material": "emotiontech_pla", "preferred_material": "emotiontech_pla",
"preferred_quality_type": "e", "preferred_quality_type": "c",
"variants_name": "Print Head", "variants_name": "Print Head",
"machine_extruder_trains": "machine_extruder_trains":
{ {