3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-12 08:36:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2038 from alicevision/fix/nodeTypeInUid

Browse source 
[core] Include the node's type in the UID computation
This commit is contained in:
Loïc Vital 2023-06-16 15:58:57 +02:00 • committed by GitHub
commit b6e22398f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meshroom/core/node.py
View file

@ -685,11 +685,15 @@ class BaseNode(BaseObject):
pass pass
def _computeUids(self): def _computeUids(self):
""" Compute node uids by combining associated attributes' uids. """ """ Compute node UIDs by combining associated attributes' UIDs. """
# Get all the attributes associated to a given UID index, specified in node descriptions with "uid=[index]"
# For now, the only index that is used is "0", so there will be a single iteration of the loop below
for uidIndex, associatedAttributes in self.attributesPerUid.items(): for uidIndex, associatedAttributes in self.attributesPerUid.items():
# uid is computed by hashing the sorted list of tuple (name, value) of all attributes impacting this uid # UID is computed by hashing the sorted list of tuple (name, value) of all attributes impacting this UID
uidAttributes = [(a.getName(), a.uid(uidIndex)) for a in associatedAttributes if a.enabled and a.value != a.uidIgnoreValue] uidAttributes = [(a.getName(), a.uid(uidIndex)) for a in associatedAttributes if a.enabled and a.value != a.uidIgnoreValue]
uidAttributes.sort() uidAttributes.sort()
# Adding the node type prevents ending up with two identical UIDs for different node types that have the exact same list of attributes
uidAttributes.append(self.nodeType)
self._uids[uidIndex] = hashValue(uidAttributes) self._uids[uidIndex] = hashValue(uidAttributes)
def _buildCmdVars(self): def _buildCmdVars(self):