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

CuraContainerStack now overrides getBottom, so it always returns a definition

Browse source
This commit is contained in:
Jaime van Kessel 2017-05-12 16:32:00 +02:00
parent 4474b16847
commit 7ee5a66c64
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/CuraContainerStack.py
View file

@ -254,6 +254,10 @@ class CuraContainerStack(ContainerStack):
def definition(self) -> DefinitionContainer: def definition(self) -> DefinitionContainer:
return self._containers[_ContainerIndexes.Definition] return self._containers[_ContainerIndexes.Definition]
@override(ContainerStack)
def getBottom(self) -> "DefinitionContainer":
return self.definition
## Check whether the specified setting has a 'user' value. ## Check whether the specified setting has a 'user' value.
# #
# A user value here is defined as the setting having a value in either # A user value here is defined as the setting having a value in either

3
cura/Settings/MachineManager.py
View file

@ -33,6 +33,7 @@ from typing import TYPE_CHECKING, Optional
if TYPE_CHECKING: if TYPE_CHECKING:
from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Settings.DefinitionContainer import DefinitionContainer
from cura.Settings.GlobalStack import GlobalStack
import os import os
@ -42,7 +43,7 @@ class MachineManager(QObject):
super().__init__(parent) super().__init__(parent)
self._active_container_stack = None # type: ContainerStack self._active_container_stack = None # type: ContainerStack
self._global_container_stack = None # type: ContainerStack self._global_container_stack = None # type: GlobalStack
self._error_check_timer = QTimer() self._error_check_timer = QTimer()
self._error_check_timer.setInterval(250) self._error_check_timer.setInterval(250)