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

Fix more minor typing mistakes

Browse source 
Contributes to issue CURA-5330.
This commit is contained in:
Ghostkeeper 2018-06-01 16:40:57 +02:00
parent c3bac474ab
commit e4a0345fe4
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cura/Settings/MachineManager.py
View file

@ -3,7 +3,7 @@
import collections import collections
import time import time
from typing import Any, List, Dict, TYPE_CHECKING, Optional from typing import Any, Callable, List, Dict, TYPE_CHECKING, Optional
from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.ConfigurationErrorMessage import ConfigurationErrorMessage
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
@ -79,12 +79,12 @@ class MachineManager(QObject):
self._stacks_have_errors = None # type: Optional[bool] self._stacks_have_errors = None # type: Optional[bool]
self._empty_container = ContainerRegistry.getInstance().getEmptyInstanceContainer() #type: InstanceContainer self._empty_container = CuraContainerRegistry.getInstance().getEmptyInstanceContainer() #type: InstanceContainer
self._empty_definition_changes_container = ContainerRegistry.getInstance().findContainers(id = "empty_definition_changes")[0] #type: InstanceContainer self._empty_definition_changes_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_definition_changes")[0] #type: InstanceContainer
self._empty_variant_container = ContainerRegistry.getInstance().findContainers(id = "empty_variant")[0] #type: InstanceContainer self._empty_variant_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_variant")[0] #type: InstanceContainer
self._empty_material_container = ContainerRegistry.getInstance().findContainers(id = "empty_material")[0] #type: InstanceContainer self._empty_material_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_material")[0] #type: InstanceContainer
self._empty_quality_container = ContainerRegistry.getInstance().findContainers(id = "empty_quality")[0] #type: InstanceContainer self._empty_quality_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_quality")[0] #type: InstanceContainer
self._empty_quality_changes_container = ContainerRegistry.getInstance().findContainers(id = "empty_quality_changes")[0] #type: InstanceContainer self._empty_quality_changes_container = CuraContainerRegistry.getInstance().findContainers(id = "empty_quality_changes")[0] #type: InstanceContainer
self._onGlobalContainerChanged() self._onGlobalContainerChanged()
@ -791,10 +791,11 @@ class MachineManager(QObject):
# \param machine_id string machine id to get the definition ID of # \param machine_id string machine id to get the definition ID of
# \returns DefinitionID if found, None otherwise # \returns DefinitionID if found, None otherwise
@pyqtSlot(str, result = str) @pyqtSlot(str, result = str)
def getDefinitionByMachineId(self, machine_id: str) -> str: def getDefinitionByMachineId(self, machine_id: str) -> Optional[str]:
containers = CuraContainerRegistry.getInstance().findContainerStacks(id = machine_id) containers = CuraContainerRegistry.getInstance().findContainerStacks(id = machine_id)
if containers: if containers:
return containers[0].definition.getId() return containers[0].definition.getId()
return None
def getIncompatibleSettingsOnEnabledExtruders(self, container: InstanceContainer) -> List[str]: def getIncompatibleSettingsOnEnabledExtruders(self, container: InstanceContainer) -> List[str]:
extruder_count = self._global_container_stack.getProperty("machine_extruder_count", "value") extruder_count = self._global_container_stack.getProperty("machine_extruder_count", "value")
@ -856,7 +857,7 @@ class MachineManager(QObject):
# Check to see if any objects are set to print with an extruder that will no longer exist # Check to see if any objects are set to print with an extruder that will no longer exist
root_node = self._application.getController().getScene().getRoot() root_node = self._application.getController().getScene().getRoot()
for node in DepthFirstIterator(root_node): for node in DepthFirstIterator(root_node): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax.
if node.getMeshData(): if node.getMeshData():
extruder_nr = node.callDecoration("getActiveExtruderPosition") extruder_nr = node.callDecoration("getActiveExtruderPosition")
@ -871,7 +872,7 @@ class MachineManager(QObject):
global_user_container = self._global_container_stack.userChanges global_user_container = self._global_container_stack.userChanges
# Make sure extruder_stacks exists # Make sure extruder_stacks exists
extruder_stacks = [] extruder_stacks = [] #type: List[ExtruderStack]
if previous_extruder_count == 1: if previous_extruder_count == 1:
extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()