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

Rename vars and add typing in DiscoveredPrintersModel

Browse source
This commit is contained in:
Lipu Fei 2019-03-20 10:42:43 +01:00
parent e623c807ce
commit 105a07fc16
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cura/UI/MachineModels/DiscoveredPrintersModel.py
View file

@ -1,7 +1,7 @@
# Copyright (c) 2019 Ultimaker B.V. # Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from typing import Callable, List, Optional, TYPE_CHECKING from typing import Callable, Dict, List, Optional, TYPE_CHECKING
from PyQt5.QtCore import pyqtSlot, pyqtProperty, pyqtSignal, QObject from PyQt5.QtCore import pyqtSlot, pyqtProperty, pyqtSignal, QObject
@ -81,34 +81,34 @@ class DiscoveredPrintersModel(QObject):
def __init__(self, parent: Optional["QObject"]) -> None: def __init__(self, parent: Optional["QObject"]) -> None:
super().__init__(parent) super().__init__(parent)
self._discovered_printer_dict = dict() self._discovered_printer_by_ip_dict = dict() # type: Dict[str, DiscoveredPrinter]
discoveredPrintersChanged = pyqtSignal() discoveredPrintersChanged = pyqtSignal()
@pyqtProperty(list, notify = discoveredPrintersChanged) @pyqtProperty(list, notify = discoveredPrintersChanged)
def discovered_printers(self) -> "List[DiscoveredPrinter]": def discovered_printers(self) -> "List[DiscoveredPrinter]":
item_list = list(x for x in self._discovered_printer_dict.values()) item_list = list(x for x in self._discovered_printer_by_ip_dict.values())
item_list.sort(key = lambda x: x.name) item_list.sort(key = lambda x: x.name)
return item_list return item_list
def addDiscoveredPrinter(self, ip_address: str, key: str, name: str, create_callback: Callable[[str], None], def addDiscoveredPrinter(self, ip_address: str, key: str, name: str, create_callback: Callable[[str], None],
machine_type: str, device) -> None: machine_type: str, device) -> None:
if ip_address in self._discovered_printer_dict: if ip_address in self._discovered_printer_by_ip_dict:
Logger.log("e", "Printer with ip [%s] has already been added", ip_address) Logger.log("e", "Printer with ip [%s] has already been added", ip_address)
return return
discovered_printer = DiscoveredPrinter(ip_address, key, name, create_callback, machine_type, device, parent = self) discovered_printer = DiscoveredPrinter(ip_address, key, name, create_callback, machine_type, device, parent = self)
self._discovered_printer_dict[ip_address] = discovered_printer self._discovered_printer_by_ip_dict[ip_address] = discovered_printer
self.discoveredPrintersChanged.emit() self.discoveredPrintersChanged.emit()
def updateDiscoveredPrinter(self, ip_address: str, def updateDiscoveredPrinter(self, ip_address: str,
name: Optional[str] = None, name: Optional[str] = None,
machine_type: Optional[str] = None) -> None: machine_type: Optional[str] = None) -> None:
if ip_address not in self._discovered_printer_dict: if ip_address not in self._discovered_printer_by_ip_dict:
Logger.log("e", "Printer with ip [%s] is not known", ip_address) Logger.log("e", "Printer with ip [%s] is not known", ip_address)
return return
item = self._discovered_printer_dict[ip_address] item = self._discovered_printer_by_ip_dict[ip_address]
if name is not None: if name is not None:
item.setName(name) item.setName(name)
@ -116,11 +116,11 @@ class DiscoveredPrintersModel(QObject):
item.setMachineType(machine_type) item.setMachineType(machine_type)
def removeDiscoveredPrinter(self, ip_address: str) -> None: def removeDiscoveredPrinter(self, ip_address: str) -> None:
if ip_address not in self._discovered_printer_dict: if ip_address not in self._discovered_printer_by_ip_dict:
Logger.log("i", "Key [%s] does not exist in the discovered printers list.", ip_address) Logger.log("i", "Key [%s] does not exist in the discovered printers list.", ip_address)
return return
del self._discovered_printer_dict[ip_address] del self._discovered_printer_by_ip_dict[ip_address]
self.discoveredPrintersChanged.emit() self.discoveredPrintersChanged.emit()
@pyqtSlot("QVariant") @pyqtSlot("QVariant")