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

CURA-4870 Add function to set the configuration from the printer back to

Browse source 
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
This commit is contained in:
Diego Prado Gesto 2018-03-06 16:08:50 +01:00
parent d11d850f7c
commit f625fa8a90
8 changed files with 66 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/PrinterOutput/ExtruderConfigurationModel.py
View file

@ -24,7 +24,7 @@ class ExtruderConfigurationModel(QObject):
def setMaterial(self, material):
self._material = material
@pyqtProperty(str, fset = setMaterial, notify = extruderConfigurationChanged)
@pyqtProperty(QObject, fset = setMaterial, notify = extruderConfigurationChanged)
def material(self):
return self._material
@ -36,12 +36,14 @@ class ExtruderConfigurationModel(QObject):
return self._hotend_id
def __str__(self):
if self._material is None or self._hotend_id is None:
if self._material is None or self._hotend_id is None or self.material.type is None:
return "No information"
return "Position: " + str(self._position) + " - Material: " + self._material + " - HotendID: " + self._hotend_id
return "Position: " + str(self._position) + " - Material: " + self._material.type + " - HotendID: " + self._hotend_id
def __eq__(self, other):
return hash(self) == hash(other)
# Calculating a hash function using the position of the extruder, the material GUID and the hotend id to check if is
# unique within a set
def __hash__(self):
return hash(self._position) ^ hash(self._material) ^ hash(self._hotend_id)
return hash(self._position) ^ (hash(self._material.guid) if self.material is not None else hash(0)) ^ hash(self._hotend_id)