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

Fix network config syncing

Browse source
This commit is contained in:
Jaime van Kessel 2019-08-27 14:46:33 +02:00
parent d1a8ce54a1
commit 8f75a12d27
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cura/Settings/MachineManager.py
View file

@ -1350,18 +1350,18 @@ class MachineManager(QObject):
disabled_used_extruder_position_set.add(int(position)) disabled_used_extruder_position_set.add(int(position))
else: else:
variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), machine_node = ContainerTree.getInstance().machines.get(self._global_container_stack.definition.getId())
extruder_configuration.hotendID) variant_node = machine_node.variants.get(extruder_configuration.hotendID)
if variant_node:
self._setVariantNode(position, variant_node)
else:
self._global_container_stack.extruders[position].variant = empty_variant_container
material_container_node = MaterialManager.getInstance().getMaterialNodeByType(self._global_container_stack, material_container_node = MaterialManager.getInstance().getMaterialNodeByType(self._global_container_stack,
position, position,
extruder_configuration.hotendID, extruder_configuration.hotendID,
configuration.buildplateConfiguration, configuration.buildplateConfiguration,
extruder_configuration.material.guid) extruder_configuration.material.guid)
if variant_container_node:
self._setVariantNode(position, variant_container_node)
else:
self._global_container_stack.extruders[position].variant = empty_variant_container
if material_container_node: if material_container_node:
self._setMaterial(position, material_container_node) self._setMaterial(position, material_container_node)
else: else:
@ -1371,15 +1371,6 @@ class MachineManager(QObject):
self.updateDefaultExtruder() self.updateDefaultExtruder()
self.updateNumberExtrudersEnabled() self.updateNumberExtrudersEnabled()
if configuration.buildplateConfiguration is not None:
global_variant_container_node = self._variant_manager.getBuildplateVariantNode(self._global_container_stack.definition.getId(), configuration.buildplateConfiguration)
if global_variant_container_node:
self._setGlobalVariant(global_variant_container_node)
else:
self._global_container_stack.variant = empty_variant_container
else:
self._global_container_stack.variant = empty_variant_container
self._updateQualityWithMaterial() self._updateQualityWithMaterial()
if need_to_show_message: if need_to_show_message: