3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' into WIP_improve_initialization

Browse source
This commit is contained in:
Diego Prado Gesto 2018-05-14 15:15:02 +02:00 • committed by GitHub
commit 8ad409ff55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 1810 additions and 778 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/MachineManager.py
View file

@ -6,6 +6,7 @@ import time
#Type hinting.
from typing import List, Dict, TYPE_CHECKING, Optional
from UM.ConfigurationErrorMessage import ConfigurationErrorMessage
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
from UM.Settings.InstanceContainer import InstanceContainer
from UM.Settings.Interfaces import ContainerInterface
@ -166,8 +167,6 @@ class MachineManager(QObject):
if active_machine_id != "" and ContainerRegistry.getInstance().findContainerStacksMetadata(id = active_machine_id):
# An active machine was saved, so restore it.
self.setActiveMachine(active_machine_id)
# Make sure _active_container_stack is properly initiated
ExtruderManager.getInstance().setActiveExtruderIndex(0)
def _onOutputDevicesChanged(self) -> None:
self._printer_output_devices = []
@ -358,6 +357,10 @@ class MachineManager(QObject):
return
global_stack = containers[0]
if not global_stack.isValid():
# Mark global stack as invalid
ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId())
return # We're done here
ExtruderManager.getInstance().setActiveExtruderIndex(0) # Switch to first extruder
self._global_container_stack = global_stack
self._application.setGlobalContainerStack(global_stack)