Merge branch 'feature_z_seam_location'

This commit is contained in:
Ghostkeeper 2016-11-30 16:34:50 +01:00
commit f6422769b5
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 26 additions and 2 deletions

View file

@ -231,6 +231,8 @@ class CuraApplication(QtApplication):
shell shell
wall_thickness wall_thickness
top_bottom_thickness top_bottom_thickness
z_seam_x
z_seam_y
infill infill
infill_sparse_density infill_sparse_density
material material

View file

@ -961,17 +961,39 @@
"z_seam_type": "z_seam_type":
{ {
"label": "Z Seam Alignment", "label": "Z Seam Alignment",
"description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these at the back, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.", "description": "Starting point of each path in a layer. When paths in consecutive layers start at the same point a vertical seam may show on the print. When aligning these near a user specified location, the seam is easiest to remove. When placed randomly the inaccuracies at the paths' start will be less noticeable. When taking the shortest path the print will be quicker.",
"type": "enum", "type": "enum",
"options": "options":
{ {
"back": "Back", "back": "User Specified",
"shortest": "Shortest", "shortest": "Shortest",
"random": "Random" "random": "Random"
}, },
"default_value": "shortest", "default_value": "shortest",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"z_seam_x":
{
"label": "Z Seam X",
"description": "The X coordinate of the position near where to start printing each part in a layer.",
"unit": "mm",
"type": "float",
"default_value": 100.0,
"value": "machine_width / 2",
"enabled": "z_seam_type == 'back'",
"settable_per_mesh": true
},
"z_seam_y":
{
"label": "Z Seam Y",
"description": "The Y coordinate of the position near where to start printing each part in a layer.",
"unit": "mm",
"type": "float",
"default_value": 100.0,
"value": "machine_depth / 2",
"enabled": "z_seam_type == 'back'",
"settable_per_mesh": true
},
"skin_no_small_gaps_heuristic": "skin_no_small_gaps_heuristic":
{ {
"label": "Ignore Small Z Gaps", "label": "Ignore Small Z Gaps",