Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness

This commit is contained in:
Lipu Fei 2019-10-14 12:23:49 +02:00
commit 8b913f4009
31 changed files with 103 additions and 93 deletions

View file

@ -34,3 +34,11 @@ class MaterialOutputModel(QObject):
@pyqtProperty(str, constant = True)
def name(self) -> str:
return self._name
def __eq__(self, other):
if self is other:
return True
if type(other) is not MaterialOutputModel:
return False
return self.guid == other.guid and self.type == other.type and self.brand == other.brand and self.color == other.color and self.name == other.name