Revert "Prevent some unneeded calling of signals"

This reverts commit 85f10e7c4f.
The second time you start Cura, it won't slice due to the number of extruders being wrong.
This commit is contained in:
Ghostkeeper 2018-12-24 09:37:17 +01:00
parent e4af883f25
commit 42058a2e8f
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
3 changed files with 3 additions and 3 deletions

View file

@ -344,9 +344,7 @@ class ExtruderManager(QObject):
self._fixSingleExtrusionMachineExtruderDefinition(global_stack) self._fixSingleExtrusionMachineExtruderDefinition(global_stack)
if extruders_changed: if extruders_changed:
self.extrudersChanged.emit(global_stack_id) self.extrudersChanged.emit(global_stack_id)
self.setActiveExtruderIndex(0)
# Set it directly instead of using setActiveExtruder, since we want to force the signal to emitted.
self._active_extruder_index = 0
self.activeExtruderChanged.emit() self.activeExtruderChanged.emit()
# After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing # After 3.4, all single-extrusion machines have their own extruder definition files instead of reusing

View file

@ -385,6 +385,7 @@ class MachineManager(QObject):
self._application.setGlobalContainerStack(global_stack) self._application.setGlobalContainerStack(global_stack)
ExtruderManager.getInstance()._globalContainerStackChanged() ExtruderManager.getInstance()._globalContainerStackChanged()
self._initMachineState(global_stack) self._initMachineState(global_stack)
self._onGlobalContainerChanged()
self.__emitChangedSignals() self.__emitChangedSignals()

View file

@ -249,6 +249,7 @@ class SettingInheritanceManager(QObject):
if self._global_container_stack: if self._global_container_stack:
self._global_container_stack.containersChanged.connect(self._onContainersChanged) self._global_container_stack.containersChanged.connect(self._onContainersChanged)
self._global_container_stack.propertyChanged.connect(self._onPropertyChanged) self._global_container_stack.propertyChanged.connect(self._onPropertyChanged)
self._onActiveExtruderChanged()
def _onContainersChanged(self, container): def _onContainersChanged(self, container):
self._update_timer.start() self._update_timer.start()