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

Get Quality Groups from container tree rather than quality manager

Browse source 
The quality manager is deprecated after all.

Contributes to issue CURA-6600.
This commit is contained in:
Ghostkeeper 2019-08-23 14:23:18 +02:00
parent 617419ccc6
commit f1f25e5350
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/Settings/MachineManager.py
View file

@ -22,6 +22,8 @@ from UM.Message import Message
from UM.Settings.SettingFunction import SettingFunction from UM.Settings.SettingFunction import SettingFunction
from UM.Signal import postponeSignals, CompressTechnique from UM.Signal import postponeSignals, CompressTechnique
import cura.CuraApplication # Imported like this to prevent circular references.
from cura.Machines.ContainerTree import ContainerTree from cura.Machines.ContainerTree import ContainerTree
from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch, QualityManager
from cura.Machines.MaterialManager import MaterialManager from cura.Machines.MaterialManager import MaterialManager
@ -283,10 +285,11 @@ class MachineManager(QObject):
self.activeStackValueChanged.emit() self.activeStackValueChanged.emit()
## Given a global_stack, make sure that it's all valid by searching for this quality group and applying it again ## Given a global_stack, make sure that it's all valid by searching for this quality group and applying it again
def _initMachineState(self, global_stack: "CuraContainerStack") -> None: def _initMachineState(self) -> None:
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
material_dict = {} material_dict = {}
for position, extruder in global_stack.extruders.items(): for position, extruder in global_stack.extruders.items():
material_dict[position] = extruder.material.getMetaDataEntry("base_file") material_dict[position] = extruder.material.base_file
self._current_root_material_id = material_dict self._current_root_material_id = material_dict
# Update materials to make sure that the diameters match with the machine's # Update materials to make sure that the diameters match with the machine's
@ -301,7 +304,7 @@ class MachineManager(QObject):
# Try to set the same quality/quality_changes as the machine specified. # Try to set the same quality/quality_changes as the machine specified.
# If the quality/quality_changes is not available, switch to the default or the first quality that's available. # If the quality/quality_changes is not available, switch to the default or the first quality that's available.
same_quality_found = False same_quality_found = False
quality_groups = self._application.getQualityManager().getQualityGroups(global_stack) quality_groups = ContainerTree.getInstance().getCurrentQualityGroups()
if global_quality_changes.getId() != "empty_quality_changes": if global_quality_changes.getId() != "empty_quality_changes":
quality_changes_groups = self._application.getQualityManager().getQualityChangesGroups(global_stack) quality_changes_groups = self._application.getQualityManager().getQualityChangesGroups(global_stack)
@ -357,7 +360,7 @@ class MachineManager(QObject):
self._global_container_stack = global_stack self._global_container_stack = global_stack
self._application.setGlobalContainerStack(global_stack) self._application.setGlobalContainerStack(global_stack)
ExtruderManager.getInstance()._globalContainerStackChanged() ExtruderManager.getInstance()._globalContainerStackChanged()
self._initMachineState(global_stack) self._initMachineState()
self._onGlobalContainerChanged() self._onGlobalContainerChanged()
# Switch to the first enabled extruder # Switch to the first enabled extruder