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

CURA-4870 Fix an error in the hash function that detects a matching when

Browse source 
the extruders are inverted.
Add pretty output to the configuration model.
This commit is contained in:
Diego Prado Gesto 2018-03-06 08:44:43 +01:00
parent 51686943e6
commit d83eb383d9
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura/PrinterOutput/ConfigurationModel.py
View file

@ -40,11 +40,19 @@ class ConfigurationModel(QObject):
def buildplateConfiguration(self):
return self._buildplate_configuration
def __str__(self):
info = "Printer type: " + self.printerType + "\n"
info += "Extruders: [\n"
for configuration in self.extruderConfigurations:
info += " " + str(configuration) + "\n"
info += "]"
return info
def __eq__(self, other):
return hash(self) == hash(other)
def __hash__(self):
extruder_hash = hash(0)
extruder_hash = hash(self.extruderConfigurations[0]) # Use the hash of the first extruder as a seed
for configuration in self.extruderConfigurations:
extruder_hash ^= configuration.__hash__()
return hash(self.printerType) ^ extruder_hash ^ hash(self.buildplateConfiguration)
extruder_hash ^= hash(configuration)
return hash(self._printer_type) ^ extruder_hash ^ hash(self._buildplate_configuration)