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

Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager

Browse source
This commit is contained in:
Jack Ha 2018-02-27 16:33:44 +01:00
commit 7507ba10a9
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/QualityManager.py
View file

@ -256,7 +256,6 @@ class QualityManager(QObject):
# Returns a dict of "custom profile name" -> QualityChangesGroup # Returns a dict of "custom profile name" -> QualityChangesGroup
def getQualityChangesGroups(self, machine: "GlobalStack") -> dict: def getQualityChangesGroups(self, machine: "GlobalStack") -> dict:
# TODO: How to make this simpler?
# Get machine definition ID for quality search # Get machine definition ID for quality search
machine_definition_id = getMachineDefinitionIDForQualitySearch(machine) machine_definition_id = getMachineDefinitionIDForQualitySearch(machine)
@ -280,7 +279,6 @@ class QualityManager(QObject):
return quality_changes_group_dict return quality_changes_group_dict
def getQualityGroups(self, machine: "GlobalStack") -> dict: def getQualityGroups(self, machine: "GlobalStack") -> dict:
# TODO: How to make this simpler, including the fall backs.
# Get machine definition ID for quality search # Get machine definition ID for quality search
machine_definition_id = getMachineDefinitionIDForQualitySearch(machine) machine_definition_id = getMachineDefinitionIDForQualitySearch(machine)
# This determines if we should only get the global qualities for the global stack and skip the global qualities for the extruder stacks # This determines if we should only get the global qualities for the global stack and skip the global qualities for the extruder stacks

6
cura/Settings/CuraStackBuilder.py
View file

@ -27,9 +27,9 @@ class CuraStackBuilder:
def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]: def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]:
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
application = CuraApplication.getInstance() application = CuraApplication.getInstance()
variant_manager = CuraApplication.getInstance()._variant_manager variant_manager = application.getVariantManager()
material_manager = CuraApplication.getInstance()._material_manager material_manager = application.getMaterialManager()
quality_manager = CuraApplication.getInstance()._quality_manager quality_manager = application.getQualityManager()
registry = ContainerRegistry.getInstance() registry = ContainerRegistry.getInstance()
definitions = registry.findDefinitionContainers(id = definition_id) definitions = registry.findDefinitionContainers(id = definition_id)

6
plugins/3MFReader/ThreeMFReader.py
View file

@ -122,10 +122,10 @@ class ThreeMFReader(MeshReader):
um_node.callDecoration("setActiveExtruder", default_stack.getId()) um_node.callDecoration("setActiveExtruder", default_stack.getId())
# Get the definition & set it # Get the definition & set it
definition_id = getMachineDefinitionIDForQualitySearch(global_container_stack.definition) definition_id = getMachineDefinitionIDForQualitySearch(global_container_stack)
um_node.callDecoration("getStack").userChanges.setDefinition(definition_id) um_node.callDecoration("getStack").getTop().setDefinition(definition_id)
setting_container = um_node.callDecoration("getStack").userChanges setting_container = um_node.callDecoration("getStack").getTop()
for key in settings: for key in settings:
setting_value = settings[key] setting_value = settings[key]