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

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

Browse source
This commit is contained in:
Jaime van Kessel 2017-09-29 15:17:11 +02:00
commit 437da52f65
14 changed files with 116 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/MachineSettingsAction/MachineSettingsAction.py
View file

@ -112,13 +112,7 @@ class MachineSettingsAction(MachineAction):
if not self._global_container_stack:
return 0
# If there is a printer that originally is multi-extruder, it's not allowed to change the number of extruders
# It's just allowed in case of Custom FDM printers
definition_container = self._global_container_stack.getBottom()
if definition_container.getId() == "custom":
return len(self._global_container_stack.getMetaDataEntry("machine_extruder_trains"))
return 0
return len(self._global_container_stack.getMetaDataEntry("machine_extruder_trains"))
@pyqtSlot(int)
def setMachineExtruderCount(self, extruder_count):
@ -176,7 +170,6 @@ class MachineSettingsAction(MachineAction):
node.callDecoration("setActiveExtruder", extruder_manager.getExtruderStack(extruder_count - 1).getId())
definition_changes_container.setProperty("machine_extruder_count", "value", extruder_count)
self.forceUpdate()
if extruder_count > 1:
# Multiextrusion
@ -221,6 +214,8 @@ class MachineSettingsAction(MachineAction):
preferences.setValue("cura/choice_on_profile_override", choice_on_profile_override)
self.forceUpdate()
@pyqtSlot()
def forceUpdate(self):