GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 16:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix not displaying configuration with both extruders empty

Browse Source
This commit is contained in:
ChrisTerBeke 2019-08-23 16:23:51 +02:00
parent c491d7f3e2
commit 36f6dba2fc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/PrinterOutput/Models/PrinterConfigurationModel.py
View File

@ -58,6 +58,14 @@ class PrinterConfigurationModel(QObject):
return False
return self._printer_type != ""
def hasAnyMaterialLoaded(self) -> bool:
if not self.isValid():
return False
for configuration in self._extruder_configurations:
if configuration.activeMaterial and configuration.activeMaterial.type != "empty":
return True
return False
def __str__(self):
message_chunks = []
message_chunks.append("Printer type: " + self._printer_type)

2
cura/PrinterOutput/PrinterOutputDevice.py
View File

@ -222,7 +222,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
def _updateUniqueConfigurations(self) -> None:
all_configurations = set()
for printer in self._printers:
if printer.printerConfiguration is not None:
if printer.printerConfiguration is not None and printer.printerConfiguration.hasAnyMaterialLoaded():
all_configurations.add(printer.printerConfiguration)
all_configurations.update(printer.availableConfigurations)
new_configurations = sorted(all_configurations, key = lambda config: config.printerType)