3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into refactoring_machine_manager

Browse source
This commit is contained in:
Lipu Fei 2018-02-21 14:05:19 +01:00
commit 9a354efd19
15 changed files with 197 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/GCodeWriter/GCodeWriter.py
View file

@ -121,9 +121,13 @@ class GCodeWriter(MeshWriter):
if flat_global_container.getMetaDataEntry("quality_type", None) is None:
flat_global_container.addMetaDataEntry("quality_type", stack.quality.getMetaDataEntry("quality_type", "normal"))
# Ensure that quality_definition is set. (Can happen if we have empty quality changes).
# Change the default defintion
default_machine_definition = "fdmprinter"
if parseBool(stack.getMetaDataEntry("has_machine_quality", "False")):
flat_global_container.addMetaDataEntry("quality_definition", stack.getMetaDataEntry("quality_definition"))
default_machine_definition = stack.getMetaDataEntry("quality_definition")
if not default_machine_definition:
default_machine_definition = stack.definition.getId()
flat_global_container.setMetaDataEntry("definition", default_machine_definition)
serialized = flat_global_container.serialize()
data = {"global_quality": serialized}
@ -145,6 +149,15 @@ class GCodeWriter(MeshWriter):
# Ensure that quality_type is set. (Can happen if we have empty quality changes).
if flat_extruder_quality.getMetaDataEntry("quality_type", None) is None:
flat_extruder_quality.addMetaDataEntry("quality_type", extruder.quality.getMetaDataEntry("quality_type", "normal"))
# Change the default defintion
default_extruder_definition = "fdmextruder"
if parseBool(stack.getMetaDataEntry("has_machine_quality", "False")):
default_extruder_definition = extruder.getMetaDataEntry("quality_definition")
if not default_extruder_definition:
default_extruder_definition = extruder.definition.getId()
flat_extruder_quality.setMetaDataEntry("definition", default_extruder_definition)
extruder_serialized = flat_extruder_quality.serialize()
data.setdefault("extruder_quality", []).append(extruder_serialized)