mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-22 06:03:57 -06:00
Add a selectedObjectExtruders property to ExtruderManager
It exposes a list of the extruders used by the current selection. Contributes to CURA-3609
This commit is contained in:
parent
5f65cb25c6
commit
9fd0239cd5
2 changed files with 36 additions and 1 deletions
|
@ -8,12 +8,13 @@ from UM.Application import Application #To get the global container stack to fin
|
||||||
from UM.Logger import Logger
|
from UM.Logger import Logger
|
||||||
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
|
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
|
||||||
from UM.Scene.SceneNode import SceneNode
|
from UM.Scene.SceneNode import SceneNode
|
||||||
|
from UM.Scene.Selection import Selection
|
||||||
from UM.Settings.ContainerRegistry import ContainerRegistry #Finding containers by ID.
|
from UM.Settings.ContainerRegistry import ContainerRegistry #Finding containers by ID.
|
||||||
from UM.Settings.InstanceContainer import InstanceContainer
|
from UM.Settings.InstanceContainer import InstanceContainer
|
||||||
from UM.Settings.SettingFunction import SettingFunction
|
from UM.Settings.SettingFunction import SettingFunction
|
||||||
from UM.Settings.ContainerStack import ContainerStack
|
from UM.Settings.ContainerStack import ContainerStack
|
||||||
from UM.Settings.DefinitionContainer import DefinitionContainer
|
from UM.Settings.DefinitionContainer import DefinitionContainer
|
||||||
from typing import Optional
|
from typing import Optional, List
|
||||||
|
|
||||||
## Manages all existing extruder stacks.
|
## Manages all existing extruder stacks.
|
||||||
#
|
#
|
||||||
|
@ -34,10 +35,13 @@ class ExtruderManager(QObject):
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._extruder_trains = { } #Per machine, a dictionary of extruder container stack IDs.
|
self._extruder_trains = { } #Per machine, a dictionary of extruder container stack IDs.
|
||||||
self._active_extruder_index = 0
|
self._active_extruder_index = 0
|
||||||
|
self._selected_object_extruders = []
|
||||||
Application.getInstance().globalContainerStackChanged.connect(self.__globalContainerStackChanged)
|
Application.getInstance().globalContainerStackChanged.connect(self.__globalContainerStackChanged)
|
||||||
self._global_container_stack_definition_id = None
|
self._global_container_stack_definition_id = None
|
||||||
self._addCurrentMachineExtruders()
|
self._addCurrentMachineExtruders()
|
||||||
|
|
||||||
|
Selection.selectionChanged.connect(self.resetSelectedObjectExtruders)
|
||||||
|
|
||||||
## Gets the unique identifier of the currently active extruder stack.
|
## Gets the unique identifier of the currently active extruder stack.
|
||||||
#
|
#
|
||||||
# The currently active extruder stack is the stack that is currently being
|
# The currently active extruder stack is the stack that is currently being
|
||||||
|
@ -117,6 +121,34 @@ class ExtruderManager(QObject):
|
||||||
except IndexError:
|
except IndexError:
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
## Emitted whenever the selectedObjectExtruders property changes.
|
||||||
|
selectedObjectExtrudersChanged = pyqtSignal()
|
||||||
|
|
||||||
|
## Provides a list of extruder IDs used by the current selected objects.
|
||||||
|
@pyqtProperty("QVariantList", notify = selectedObjectExtrudersChanged)
|
||||||
|
def selectedObjectExtruders(self) -> List[str]:
|
||||||
|
if not self._selected_object_extruders:
|
||||||
|
object_extruders = set()
|
||||||
|
for node in Selection.getAllSelectedObjects():
|
||||||
|
extruder = node.callDecoration("getActiveExtruder")
|
||||||
|
if extruder:
|
||||||
|
object_extruders.add(extruder)
|
||||||
|
else:
|
||||||
|
global_stack = Application.getInstance().getGlobalContainerStack()
|
||||||
|
object_extruders.add(self._extruder_trains[global_stack.getId()]["0"].getId())
|
||||||
|
|
||||||
|
self._selected_object_extruders = list(object_extruders)
|
||||||
|
|
||||||
|
return self._selected_object_extruders
|
||||||
|
|
||||||
|
## Reset the internal list used for the selectedObjectExtruders property
|
||||||
|
#
|
||||||
|
# This will trigger a recalculation of the extruders used for the
|
||||||
|
# selection.
|
||||||
|
def resetSelectedObjectExtruders(self) -> None:
|
||||||
|
self._selected_object_extruders = []
|
||||||
|
self.selectedObjectExtrudersChanged.emit()
|
||||||
|
|
||||||
def getActiveExtruderStack(self) -> ContainerStack:
|
def getActiveExtruderStack(self) -> ContainerStack:
|
||||||
global_container_stack = Application.getInstance().getGlobalContainerStack()
|
global_container_stack = Application.getInstance().getGlobalContainerStack()
|
||||||
|
|
||||||
|
@ -444,6 +476,8 @@ class ExtruderManager(QObject):
|
||||||
self.globalContainerStackDefinitionChanged.emit()
|
self.globalContainerStackDefinitionChanged.emit()
|
||||||
self.activeExtruderChanged.emit()
|
self.activeExtruderChanged.emit()
|
||||||
|
|
||||||
|
self.resetSelectedObjectExtruders()
|
||||||
|
|
||||||
## Adds the extruders of the currently active machine.
|
## Adds the extruders of the currently active machine.
|
||||||
def _addCurrentMachineExtruders(self) -> None:
|
def _addCurrentMachineExtruders(self) -> None:
|
||||||
global_stack = Application.getInstance().getGlobalContainerStack()
|
global_stack = Application.getInstance().getGlobalContainerStack()
|
||||||
|
|
|
@ -109,6 +109,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
|
||||||
def setActiveExtruder(self, extruder_stack_id):
|
def setActiveExtruder(self, extruder_stack_id):
|
||||||
self._extruder_stack = extruder_stack_id
|
self._extruder_stack = extruder_stack_id
|
||||||
self._updateNextStack()
|
self._updateNextStack()
|
||||||
|
ExtruderManager.getInstance().resetSelectedObjectExtruders()
|
||||||
self.activeExtruderChanged.emit()
|
self.activeExtruderChanged.emit()
|
||||||
|
|
||||||
def getStack(self):
|
def getStack(self):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue