Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2019-09-05 18:26:48 +0300
committerGhostkeeper <rubend@tutanota.com>2019-09-05 18:26:48 +0300
commit71b94f6d5b058bbe6746c7f7150953f1d1a849bf (patch)
treed696b60d5429e694587a89f4b8559ef68537586e /plugins/GCodeWriter
parent9a6f76c069d894dae00b8b06d61c165fb5a4832b (diff)
Create own quality changes profiles instead of asking quality manager
It was a protected function call on a different class anyway, so that should never have gotten accepted. Contributes to issue CURA-6600.
Diffstat (limited to 'plugins/GCodeWriter')
-rw-r--r--plugins/GCodeWriter/GCodeWriter.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py
index 9f9d6ebb79..edd0cebc96 100644
--- a/plugins/GCodeWriter/GCodeWriter.py
+++ b/plugins/GCodeWriter/GCodeWriter.py
@@ -116,17 +116,22 @@ class GCodeWriter(MeshWriter):
# \return A serialised string of the settings.
def _serialiseSettings(self, stack):
container_registry = self._application.getContainerRegistry()
- quality_manager = self._application.getQualityManager()
prefix = self._setting_keyword + str(GCodeWriter.version) + " " # The prefix to put before each line.
prefix_length = len(prefix)
quality_type = stack.quality.getMetaDataEntry("quality_type")
container_with_profile = stack.qualityChanges
+ machine_definition_id_for_quality = ContainerTree.getInstance().machines[stack.definition.getId()].quality_definition
if container_with_profile.getId() == "empty_quality_changes":
# If the global quality changes is empty, create a new one
quality_name = container_registry.uniqueName(stack.quality.getName())
- container_with_profile = quality_manager._createQualityChanges(quality_type, quality_name, stack, None)
+ quality_id = container_registry.uniqueName((stack.definition.getId() + "_" + quality_name).lower().replace(" ", "_"))
+ container_with_profile = InstanceContainer(quality_id)
+ container_with_profile.setName(quality_name)
+ container_with_profile.setMetaDataEntry("type", "quality_changes")
+ container_with_profile.setMetaDataEntry("quality_type", quality_type)
+ container_with_profile.setDefinition(machine_definition_id_for_quality)
flat_global_container = self._createFlattenedContainerInstance(stack.userChanges, container_with_profile)
# If the quality changes is not set, we need to set type manually
@@ -138,7 +143,6 @@ class GCodeWriter(MeshWriter):
flat_global_container.setMetaDataEntry("quality_type", stack.quality.getMetaDataEntry("quality_type", "normal"))
# Get the machine definition ID for quality profiles
- machine_definition_id_for_quality = ContainerTree.getInstance().machines[stack.definition.getId()].quality_definition
flat_global_container.setMetaDataEntry("definition", machine_definition_id_for_quality)
serialized = flat_global_container.serialize()
@@ -150,7 +154,12 @@ class GCodeWriter(MeshWriter):
if extruder_quality.getId() == "empty_quality_changes":
# Same story, if quality changes is empty, create a new one
quality_name = container_registry.uniqueName(stack.quality.getName())
- extruder_quality = quality_manager._createQualityChanges(quality_type, quality_name, stack, None)
+ quality_id = container_registry.uniqueName((stack.definition.getId() + "_" + quality_name).lower().replace(" ", "_"))
+ extruder_quality = InstanceContainer(quality_id)
+ extruder_quality.setName(quality_name)
+ extruder_quality.setMetaDataEntry("type", "quality_changes")
+ extruder_quality.setMetaDataEntry("quality_type", quality_type)
+ extruder_quality.setDefinition(machine_definition_id_for_quality)
flat_extruder_quality = self._createFlattenedContainerInstance(extruder.userChanges, extruder_quality)
# If the quality changes is not set, we need to set type manually