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

Actually perform the filtering based on machine type

Browse source 
CURA-2475
This commit is contained in:
Jaime van Kessel 2016-10-05 14:54:22 +02:00
parent 84defb27cf
commit ec63d6931e
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
DiscoverUM3Action.py
View file

@ -75,7 +75,10 @@ class DiscoverUM3Action(MachineAction):
@pyqtProperty("QVariantList", notify = printersChanged) @pyqtProperty("QVariantList", notify = printersChanged)
def foundDevices(self): def foundDevices(self):
if self._network_plugin: if self._network_plugin:
global_printer_type = Application.getInstance().getGlobalContainerStack().getBottom().getId()
printers = list(self._network_plugin.getPrinters().values()) printers = list(self._network_plugin.getPrinters().values())
# TODO; There are still some testing printers that don't have a correct printer type, so don't filter out unkown ones just yet.
printers = [printer for printer in printers if printer.printerType == global_printer_type or printer.printerType == "unknown"]
printers.sort(key = lambda k: k.name) printers.sort(key = lambda k: k.name)
return printers return printers
else: else:

4
NetworkPrinterOutputDevice.py
View file

@ -168,9 +168,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
printer_type = self._properties.get(b"machine", b"").decode("utf-8") printer_type = self._properties.get(b"machine", b"").decode("utf-8")
if printer_type == "9511.0": if printer_type == "9511.0":
self._updatePrinterType("UM3Extended") self._updatePrinterType("ultimaker3_extended")
elif printer_type == "9066.0": elif printer_type == "9066.0":
self._updatePrinterType("UM3") self._updatePrinterType("ultimaker3")
else: else:
self._updatePrinterType("unknown") self._updatePrinterType("unknown")