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

Merge branch 'main' into work/cff

Browse Source
This commit is contained in:
Stefano Serioli 2022-10-20 12:21:22 -07:00 committed by GitHub
commit d9ccbd2f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/PrinterOutput/PrinterOutputDevice.py
View File

@ -252,7 +252,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
# List could end up empty! # List could end up empty!
Logger.log("e", "Found a broken configuration in the synced list!") Logger.log("e", "Found a broken configuration in the synced list!")
all_configurations.remove(None) all_configurations.remove(None)
new_configurations = sorted(all_configurations, key = lambda config: config.printerType or "") new_configurations = sorted(all_configurations, key = lambda config: config.printerType or "", reverse = True)
if new_configurations != self._unique_configurations: if new_configurations != self._unique_configurations:
self._unique_configurations = new_configurations self._unique_configurations = new_configurations
self.uniqueConfigurationsChanged.emit() self.uniqueConfigurationsChanged.emit()

2
tests/PrinterOutput/TestPrinterOutputDevice.py
View File

@ -71,7 +71,7 @@ def test_uniqueConfigurations(printer_output_device):
loaded_right_extruder = ExtruderConfigurationModel(1) loaded_right_extruder = ExtruderConfigurationModel(1)
loaded_right_extruder.setMaterial(loaded_material) loaded_right_extruder.setMaterial(loaded_material)
printer.printerConfiguration.setExtruderConfigurations([loaded_left_extruder, loaded_right_extruder]) printer.printerConfiguration.setExtruderConfigurations([loaded_left_extruder, loaded_right_extruder])
assert printer_output_device.uniqueConfigurations == [configuration, printer.printerConfiguration] assert set(printer_output_device.uniqueConfigurations) == set([configuration, printer.printerConfiguration])
def test_uniqueConfigurations_empty_is_filtered_out(printer_output_device): def test_uniqueConfigurations_empty_is_filtered_out(printer_output_device):