Add missing typing

This commit is contained in:
Jaime van Kessel 2020-02-28 13:53:43 +01:00
parent 5e49a5fa24
commit e4930d3c3b
No known key found for this signature in database
GPG Key ID: 3710727397403C91

View File

@ -2,6 +2,7 @@
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt
from typing import Set
import cura.CuraApplication import cura.CuraApplication
from UM.Logger import Logger from UM.Logger import Logger
@ -23,7 +24,7 @@ class QualitySettingsModel(ListModel):
GLOBAL_STACK_POSITION = -1 GLOBAL_STACK_POSITION = -1
def __init__(self, parent = None): def __init__(self, parent = None) -> None:
super().__init__(parent = parent) super().__init__(parent = parent)
self.addRoleName(self.KeyRole, "key") self.addRoleName(self.KeyRole, "key")
@ -38,7 +39,9 @@ class QualitySettingsModel(ListModel):
self._application = cura.CuraApplication.CuraApplication.getInstance() self._application = cura.CuraApplication.CuraApplication.getInstance()
self._application.getMachineManager().activeStackChanged.connect(self._update) self._application.getMachineManager().activeStackChanged.connect(self._update)
self._selected_position = self.GLOBAL_STACK_POSITION #Must be either GLOBAL_STACK_POSITION or an extruder position (0, 1, etc.) # Must be either GLOBAL_STACK_POSITION or an extruder position (0, 1, etc.)
self._selected_position = self.GLOBAL_STACK_POSITION
self._selected_quality_item = None # The selected quality in the quality management page self._selected_quality_item = None # The selected quality in the quality management page
self._i18n_catalog = None self._i18n_catalog = None
@ -47,14 +50,14 @@ class QualitySettingsModel(ListModel):
selectedPositionChanged = pyqtSignal() selectedPositionChanged = pyqtSignal()
selectedQualityItemChanged = pyqtSignal() selectedQualityItemChanged = pyqtSignal()
def setSelectedPosition(self, selected_position): def setSelectedPosition(self, selected_position: int) -> None:
if selected_position != self._selected_position: if selected_position != self._selected_position:
self._selected_position = selected_position self._selected_position = selected_position
self.selectedPositionChanged.emit() self.selectedPositionChanged.emit()
self._update() self._update()
@pyqtProperty(int, fset = setSelectedPosition, notify = selectedPositionChanged) @pyqtProperty(int, fset = setSelectedPosition, notify = selectedPositionChanged)
def selectedPosition(self): def selectedPosition(self) -> int:
return self._selected_position return self._selected_position
def setSelectedQualityItem(self, selected_quality_item): def setSelectedQualityItem(self, selected_quality_item):
@ -67,7 +70,7 @@ class QualitySettingsModel(ListModel):
def selectedQualityItem(self): def selectedQualityItem(self):
return self._selected_quality_item return self._selected_quality_item
def _update(self): def _update(self) -> None:
Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__))
if not self._selected_quality_item: if not self._selected_quality_item:
@ -83,7 +86,7 @@ class QualitySettingsModel(ListModel):
quality_changes_group = self._selected_quality_item["quality_changes_group"] quality_changes_group = self._selected_quality_item["quality_changes_group"]
quality_node = None quality_node = None
settings_keys = set() settings_keys = set() # type: Set[str]
if quality_group: if quality_group:
if self._selected_position == self.GLOBAL_STACK_POSITION: if self._selected_position == self.GLOBAL_STACK_POSITION:
quality_node = quality_group.node_for_global quality_node = quality_group.node_for_global