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

Use camelcase for pyqtProperty names

Browse source
This commit is contained in:
Lipu Fei 2019-03-28 14:22:27 +01:00
parent 84de34341d
commit b28fdc2b0b
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/Machines/Models/DiscoveredPrintersModel.py
View file

@ -47,7 +47,7 @@ class DiscoveredPrinter(QObject):
machineTypeChanged = pyqtSignal() machineTypeChanged = pyqtSignal()
@pyqtProperty(str, notify = machineTypeChanged) @pyqtProperty(str, notify = machineTypeChanged)
def machine_type(self) -> str: def machineType(self) -> str:
return self._machine_type return self._machine_type
def setMachineType(self, machine_type: str) -> None: def setMachineType(self, machine_type: str) -> None:
@ -57,7 +57,7 @@ class DiscoveredPrinter(QObject):
# Human readable machine type string # Human readable machine type string
@pyqtProperty(str, notify = machineTypeChanged) @pyqtProperty(str, notify = machineTypeChanged)
def readable_machine_type(self) -> str: def readableMachineType(self) -> str:
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
readable_type = CuraApplication.getInstance().getMachineManager().getMachineTypeNameFromId(self._machine_type) readable_type = CuraApplication.getInstance().getMachineManager().getMachineTypeNameFromId(self._machine_type)
if not readable_type: if not readable_type:
@ -65,8 +65,8 @@ class DiscoveredPrinter(QObject):
return readable_type return readable_type
@pyqtProperty(bool, notify = machineTypeChanged) @pyqtProperty(bool, notify = machineTypeChanged)
def is_unknown_machine_type(self) -> bool: def isUnknownMachineType(self) -> bool:
return self.readable_machine_type.lower() == "unknown" return self.readableMachineType.lower() == "unknown"
@pyqtProperty(QObject, constant = True) @pyqtProperty(QObject, constant = True)
def device(self) -> "NetworkedPrinterOutputDevice": def device(self) -> "NetworkedPrinterOutputDevice":
@ -88,7 +88,7 @@ class DiscoveredPrintersModel(QObject):
discoveredPrintersChanged = pyqtSignal() discoveredPrintersChanged = pyqtSignal()
@pyqtProperty(list, notify = discoveredPrintersChanged) @pyqtProperty(list, notify = discoveredPrintersChanged)
def discovered_printers(self) -> List["DiscoveredPrinter"]: def discoveredPrinters(self) -> List["DiscoveredPrinter"]:
item_list = list(x for x in self._discovered_printer_by_ip_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

8
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -69,14 +69,14 @@ Item
{ {
id: networkPrinterListView id: networkPrinterListView
anchors.fill: parent anchors.fill: parent
model: CuraApplication.getDiscoveredPrintersModel().discovered_printers model: CuraApplication.getDiscoveredPrintersModel().discoveredPrinters
Component.onCompleted: Component.onCompleted:
{ {
// Select the first one that's not "unknown" by default. // Select the first one that's not "unknown" by default.
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
if (!model[i].is_unknown_machine_type) if (!model[i].isUnknownMachineType)
{ {
currentIndex = i currentIndex = i
break break
@ -93,7 +93,7 @@ Item
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
outputDevice: modelData.device outputDevice: modelData.device
enabled: !modelData.is_unknown_machine_type enabled: !modelData.isUnknownMachineType
printerTypeLabelAutoFit: true printerTypeLabelAutoFit: true
@ -103,7 +103,7 @@ Item
function updateMachineTypes() function updateMachineTypes()
{ {
printerTypesList = [ modelData.readable_machine_type ] printerTypesList = [ modelData.readableMachineType ]
} }
checkable: false checkable: false

6
tests/Machines/Models/TestDiscoveredPrintersModel.py
View file

@ -15,12 +15,12 @@ def test_discoveredPrinters(discovered_printer_model):
mocked_callback = MagicMock() mocked_callback = MagicMock()
discovered_printer_model.addDiscoveredPrinter("ip", "key", "name", mocked_callback, "machine_type", mocked_device) discovered_printer_model.addDiscoveredPrinter("ip", "key", "name", mocked_callback, "machine_type", mocked_device)
device = discovered_printer_model.discovered_printers[0] device = discovered_printer_model.discoveredPrinters[0]
discovered_printer_model.createMachineFromDiscoveredPrinter(device) discovered_printer_model.createMachineFromDiscoveredPrinter(device)
mocked_callback.assert_called_with("key") mocked_callback.assert_called_with("key")
assert len(discovered_printer_model.discovered_printers) == 1 assert len(discovered_printer_model.discoveredPrinters) == 1
# Test if removing it works # Test if removing it works
discovered_printer_model.removeDiscoveredPrinter("ip") discovered_printer_model.removeDiscoveredPrinter("ip")
assert len(discovered_printer_model.discovered_printers) == 0 assert len(discovered_printer_model.discoveredPrinters) == 0