GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 04:05:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qml_speed_improvements' of github.com:Ultimaker/Cura into qml_speed_improvements

Browse Source
This commit is contained in:
Jaime van Kessel 2019-10-28 16:08:04 +01:00
commit 9906d454ce
No known key found for this signature in database
GPG Key ID: 3710727397403C91
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cura/Settings/MachineManager.py
View File

@ -291,8 +291,7 @@ class MachineManager(QObject):
@pyqtSlot(str) @pyqtSlot(str)
def setActiveMachine(self, stack_id: str) -> None: def setActiveMachine(self, stack_id: str) -> None:
self.blurSettings.emit() # Ensure no-one has focus. self.blurSettings.emit() # Ensure no-one has focus.
self._application.processEvents()
container_registry = CuraContainerRegistry.getInstance() container_registry = CuraContainerRegistry.getInstance()
containers = container_registry.findContainerStacks(id = stack_id) containers = container_registry.findContainerStacks(id = stack_id)
if not containers: if not containers:
@ -302,11 +301,9 @@ class MachineManager(QObject):
# Make sure that the default machine actions for this machine have been added # Make sure that the default machine actions for this machine have been added
self._application.getMachineActionManager().addDefaultMachineActions(global_stack) self._application.getMachineActionManager().addDefaultMachineActions(global_stack)
self._application.processEvents()
extruder_manager = ExtruderManager.getInstance() extruder_manager = ExtruderManager.getInstance()
extruder_manager.fixSingleExtrusionMachineExtruderDefinition(global_stack) extruder_manager.fixSingleExtrusionMachineExtruderDefinition(global_stack)
self._application.processEvents()
if not global_stack.isValid(): if not global_stack.isValid():
# Mark global stack as invalid # Mark global stack as invalid
ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId()) ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId())
@ -316,12 +313,8 @@ class MachineManager(QObject):
extruder_manager.addMachineExtruders(global_stack) extruder_manager.addMachineExtruders(global_stack)
self._application.setGlobalContainerStack(global_stack) self._application.setGlobalContainerStack(global_stack)
self._application.processEvents()
# Switch to the first enabled extruder # Switch to the first enabled extruder
self.updateDefaultExtruder() self.updateDefaultExtruder()
self._application.processEvents()
default_extruder_position = int(self.defaultExtruderPosition) default_extruder_position = int(self.defaultExtruderPosition)
old_active_extruder_index = extruder_manager.activeExtruderIndex old_active_extruder_index = extruder_manager.activeExtruderIndex
extruder_manager.setActiveExtruderIndex(default_extruder_position) extruder_manager.setActiveExtruderIndex(default_extruder_position)