GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 17:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ghostkeeper 2019-08-08 20:51:21 +02:00
commit 81fce5d779
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
resources/definitions/fdmprinter.def.json
View File

@ -1399,6 +1399,28 @@
"limit_to_extruder": "wall_0_extruder_nr", "limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"z_seam_position":
{
"label": "Z Seam Position",
"description": "The position near where to start printing each part in a layer.",
"type": "enum",
"options":
{
"backleft": "Back Left",
"back": "Back",
"backright": "Back Right",
"right": "Right",
"frontright": "Front Right",
"front": "Front",
"frontleft": "Front Left",
"left": "Left"
},
"enabled": "z_seam_type == 'back'",
"default_value": "back",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true,
"children":
{
"z_seam_x": "z_seam_x":
{ {
"label": "Z Seam X", "label": "Z Seam X",
@ -1406,7 +1428,7 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 100.0, "default_value": 100.0,
"value": "machine_width / 2", "value": "0 if (z_seam_position == 'frontleft' or z_seam_position == 'left' or z_seam_position == 'backleft') else machine_width/2 if (z_seam_position == 'front' or z_seam_position == 'back') else machine_width",
"enabled": "z_seam_type == 'back'", "enabled": "z_seam_type == 'back'",
"limit_to_extruder": "wall_0_extruder_nr", "limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
@ -1418,10 +1440,12 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 100.0, "default_value": 100.0,
"value": "machine_depth * 3", "value": "0 if (z_seam_position == 'frontleft' or z_seam_position == 'front' or z_seam_position == 'frontright') else machine_depth/2 if (z_seam_position == 'left' or z_seam_position == 'right') else machine_depth",
"enabled": "z_seam_type == 'back'", "enabled": "z_seam_type == 'back'",
"limit_to_extruder": "wall_0_extruder_nr", "limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}
}
}, },
"z_seam_corner": "z_seam_corner":
{ {

7
scripts/lionbridge_import.py
View File

@ -2,6 +2,7 @@
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import argparse #To get the source directory from command line arguments. import argparse #To get the source directory from command line arguments.
import io # To fix encoding issues in Windows
import os #To find files from the source. import os #To find files from the source.
import os.path #To find files from the source and the destination path. import os.path #To find files from the source and the destination path.
@ -34,12 +35,12 @@ def lionbridge_import(source: str) -> None:
else: else:
raise Exception("Unknown file: " + source_file + "... Is this Cura or Uranium?") raise Exception("Unknown file: " + source_file + "... Is this Cura or Uranium?")
with open(os.path.join(directory, file_pot)) as f: with io.open(os.path.join(directory, file_pot), encoding = "utf8") as f:
source_str = f.read() source_str = f.read()
with open(destination_file) as f: with io.open(destination_file, encoding = "utf8") as f:
destination_str = f.read() destination_str = f.read()
result = merge(source_str, destination_str) result = merge(source_str, destination_str)
with open(destination_file, "w") as f: with io.open(destination_file, "w", encoding = "utf8") as f:
f.write(result) f.write(result)
## Gets the destination path to copy the translations for Cura to. ## Gets the destination path to copy the translations for Cura to.