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

Better naming for hasMachineTypeName()

Browse source 
CURA-6449
This commit is contained in:
Lipu Fei 2019-04-29 13:27:46 +02:00
parent 25bbc1e66e
commit 19cd8f4edc
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class DiscoveredPrinter(QObject):
# In ClusterUM3OutputDevice, when it updates a printer information, it updates the machine type using the field # In ClusterUM3OutputDevice, when it updates a printer information, it updates the machine type using the field
# "machine_variant", and for some reason, it's not the machine type ID/codename/... but a human-readable string # "machine_variant", and for some reason, it's not the machine type ID/codename/... but a human-readable string
# like "Ultimaker 3". The code below handles this case. # like "Ultimaker 3". The code below handles this case.
if machine_manager.hasMachineTypeName(self._machine_type): if machine_manager.hasHumanReadableMachineTypeName(self._machine_type):
readable_type = self._machine_type readable_type = self._machine_type
else: else:
readable_type = machine_manager.getMachineTypeNameFromId(self._machine_type) readable_type = machine_manager.getMachineTypeNameFromId(self._machine_type)
@ -82,7 +82,7 @@ class DiscoveredPrinter(QObject):
def isUnknownMachineType(self) -> bool: def isUnknownMachineType(self) -> bool:
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
machine_manager = CuraApplication.getInstance().getMachineManager() machine_manager = CuraApplication.getInstance().getMachineManager()
if machine_manager.hasMachineTypeName(self._machine_type): if machine_manager.hasHumanReadableMachineTypeName(self._machine_type):
readable_type = self._machine_type readable_type = self._machine_type
else: else:
readable_type = machine_manager.getMachineTypeNameFromId(self._machine_type) readable_type = machine_manager.getMachineTypeNameFromId(self._machine_type)

5
cura/Settings/MachineManager.py
View file

@ -1640,7 +1640,10 @@ class MachineManager(QObject):
return abbr_machine return abbr_machine
def hasMachineTypeName(self, machine_type_name: str) -> bool: # Checks if the given machine type name in the available machine list.
# The machine type is a code name such as "ultimaker_3", while the machine type name is the human-readable name of
# the machine type, which is "Ultimaker 3" for "ultimaker_3".
def hasHumanReadableMachineTypeName(self, machine_type_name: str) -> bool:
results = self._container_registry.findDefinitionContainersMetadata(name = machine_type_name) results = self._container_registry.findDefinitionContainersMetadata(name = machine_type_name)
return len(results) > 0 return len(results) > 0