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

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
fieldOfView 2016-07-18 09:41:50 +02:00
commit 935481e05f
9 changed files with 125 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/MachineManager.py
View file

@ -126,6 +126,9 @@ class MachineManager(QObject):
self._auto_change_material_hotend_flood_time = time.time()
self._auto_change_material_hotend_flood_last_choice = button
if button == QMessageBox.No:
return
Logger.log("d", "Setting hotend variant of hotend %d to %s" % (index, hotend_id))
extruder_manager = ExtruderManager.getInstance()
@ -174,6 +177,9 @@ class MachineManager(QObject):
self._auto_change_material_hotend_flood_time = time.time()
self._auto_change_material_hotend_flood_last_choice = button
if button == QMessageBox.No:
return
Logger.log("d", "Setting material of hotend %d to %s" % (index, material_id))
extruder_manager = ExtruderManager.getInstance()
@ -493,6 +499,7 @@ class MachineManager(QObject):
self.activeQualityChanged.emit()
@pyqtSlot(str)
@pyqtSlot()
def updateQualityContainerFromUserContainer(self, quality_id = None):
if not self._active_container_stack:
return