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

Merge branch 'develop' of github.com:alicevision/meshroom into dev/nodesAndTaskManager

Browse source 
Conflicts:
	meshroom/core/graph.py
	meshroom/ui/qml/main.qml
This commit is contained in:
Fabien Castan 2020-12-01 20:02:43 +01:00
commit 1102ce84e0
61 changed files with 1241 additions and 345 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meshroom/core/node.py
View file

@ -10,6 +10,7 @@ import platform
import re
import shutil
import time
import types
import uuid
from collections import defaultdict, namedtuple
from enum import Enum
@ -540,6 +541,7 @@ class BaseNode(BaseObject):
def getAttributes(self):
return self._attributes
@Slot(str, result=bool)
def hasAttribute(self, name):
return name in self._attributes.keys()
@ -607,15 +609,15 @@ class BaseNode(BaseObject):
def _buildCmdVars(self):
def _buildAttributeCmdVars(cmdVars, name, attr):
if attr.enabled:
if attr.attributeDesc.group is not None:
group = attr.attributeDesc.group(attr.node) if isinstance(attr.attributeDesc.group, types.FunctionType) else attr.attributeDesc.group
if group is not None:
# if there is a valid command line "group"
v = attr.getValueStr()
cmdVars[name] = '--{name} {value}'.format(name=name, value=v)
cmdVars[name + 'Value'] = str(v)
if v:
cmdVars[attr.attributeDesc.group] = cmdVars.get(attr.attributeDesc.group, '') + \
' ' + cmdVars[name]
cmdVars[group] = cmdVars.get(group, '') + ' ' + cmdVars[name]
elif isinstance(attr, GroupAttribute):
assert isinstance(attr.value, DictModel)
# if the GroupAttribute is not set in a single command line argument,