mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 23:46:22 -06:00
Use camelcase for pyqtProperty names
This commit is contained in:
parent
84de34341d
commit
b28fdc2b0b
3 changed files with 12 additions and 12 deletions
|
@ -47,7 +47,7 @@ class DiscoveredPrinter(QObject):
|
|||
machineTypeChanged = pyqtSignal()
|
||||
|
||||
@pyqtProperty(str, notify = machineTypeChanged)
|
||||
def machine_type(self) -> str:
|
||||
def machineType(self) -> str:
|
||||
return self._machine_type
|
||||
|
||||
def setMachineType(self, machine_type: str) -> None:
|
||||
|
@ -57,7 +57,7 @@ class DiscoveredPrinter(QObject):
|
|||
|
||||
# Human readable machine type string
|
||||
@pyqtProperty(str, notify = machineTypeChanged)
|
||||
def readable_machine_type(self) -> str:
|
||||
def readableMachineType(self) -> str:
|
||||
from cura.CuraApplication import CuraApplication
|
||||
readable_type = CuraApplication.getInstance().getMachineManager().getMachineTypeNameFromId(self._machine_type)
|
||||
if not readable_type:
|
||||
|
@ -65,8 +65,8 @@ class DiscoveredPrinter(QObject):
|
|||
return readable_type
|
||||
|
||||
@pyqtProperty(bool, notify = machineTypeChanged)
|
||||
def is_unknown_machine_type(self) -> bool:
|
||||
return self.readable_machine_type.lower() == "unknown"
|
||||
def isUnknownMachineType(self) -> bool:
|
||||
return self.readableMachineType.lower() == "unknown"
|
||||
|
||||
@pyqtProperty(QObject, constant = True)
|
||||
def device(self) -> "NetworkedPrinterOutputDevice":
|
||||
|
@ -88,7 +88,7 @@ class DiscoveredPrintersModel(QObject):
|
|||
discoveredPrintersChanged = pyqtSignal()
|
||||
|
||||
@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.sort(key = lambda x: x.name)
|
||||
return item_list
|
||||
|
|
|
@ -69,14 +69,14 @@ Item
|
|||
{
|
||||
id: networkPrinterListView
|
||||
anchors.fill: parent
|
||||
model: CuraApplication.getDiscoveredPrintersModel().discovered_printers
|
||||
model: CuraApplication.getDiscoveredPrintersModel().discoveredPrinters
|
||||
|
||||
Component.onCompleted:
|
||||
{
|
||||
// Select the first one that's not "unknown" by default.
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
if (!model[i].is_unknown_machine_type)
|
||||
if (!model[i].isUnknownMachineType)
|
||||
{
|
||||
currentIndex = i
|
||||
break
|
||||
|
@ -93,7 +93,7 @@ Item
|
|||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
outputDevice: modelData.device
|
||||
|
||||
enabled: !modelData.is_unknown_machine_type
|
||||
enabled: !modelData.isUnknownMachineType
|
||||
|
||||
printerTypeLabelAutoFit: true
|
||||
|
||||
|
@ -103,7 +103,7 @@ Item
|
|||
|
||||
function updateMachineTypes()
|
||||
{
|
||||
printerTypesList = [ modelData.readable_machine_type ]
|
||||
printerTypesList = [ modelData.readableMachineType ]
|
||||
}
|
||||
|
||||
checkable: false
|
||||
|
|
|
@ -15,12 +15,12 @@ def test_discoveredPrinters(discovered_printer_model):
|
|||
|
||||
mocked_callback = MagicMock()
|
||||
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)
|
||||
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
|
||||
discovered_printer_model.removeDiscoveredPrinter("ip")
|
||||
assert len(discovered_printer_model.discovered_printers) == 0
|
||||
assert len(discovered_printer_model.discoveredPrinters) == 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue