From e7e64faad012a8717cde14f0ac5f365b65ce74af Mon Sep 17 00:00:00 2001 From: gregoire-dl Date: Fri, 21 Jul 2023 15:43:58 +0200 Subject: [PATCH] [micmac] Tawny: Fix cmd and disable some parameters --- meshroomMicmac/micmac/Tawny.py | 124 +++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 7 deletions(-) diff --git a/meshroomMicmac/micmac/Tawny.py b/meshroomMicmac/micmac/Tawny.py index 780dd91..332c391 100644 --- a/meshroomMicmac/micmac/Tawny.py +++ b/meshroomMicmac/micmac/Tawny.py @@ -5,7 +5,7 @@ from meshroomMicmac.custom import node class Tawny(node.MicmacNode): - commandLine = 'mm3d Tawny {dataDirectoryValue} {allParams}' + commandLine = 'mm3d Tawny {orthoDirectoryValue} {allParams}' documentation = 'Tawny' inputs = [ @@ -32,10 +32,20 @@ class Tawny(node.MicmacNode): uid=[0], value=True, ), + desc.BoolParam( + name='setDEq', + label='Set DEq', + description="Set DEq.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.IntParam( name='DEq', - label='D Eq', + label='DEq', description="Degree of equalization", + enabled=lambda node: node.setDEq.value, uid=[0], value=1, range=(-sys.maxsize, sys.maxsize, 1), @@ -76,18 +86,38 @@ class Tawny(node.MicmacNode): uid=[0], ), ]), + desc.BoolParam( + name='setAddCste', + label='Set Add Cste', + description="Set add cste.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.BoolParam( name='AddCste', label='Add Cste', description="Add unknown constant for equalization", + enabled=lambda node: node.setAddCste.value, uid=[0], value=False, advanced=True, ), + desc.BoolParam( + name='setDegRap', + label='Set DegRap', + description="Set DegRap.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.IntParam( name='DegRap', label='Deg Rap', description="Degree of rappel to initial values", + enabled=lambda node: node.setDegRap.value, uid=[0], value=0, range=(-sys.maxsize, sys.maxsize, 1), @@ -108,7 +138,7 @@ class Tawny(node.MicmacNode): description="Degree of rappel to initial values", brackets='[]', joinChar=',', - enabled=lambda node: node.DegRapXY.value, + enabled=lambda node: node.setDegRapXY.value, advanced=True, groupDesc=[ desc.IntParam( @@ -128,70 +158,150 @@ class Tawny(node.MicmacNode): uid=[0], ), ]), + desc.BoolParam( + name='setRGP', + label='Set RGP', + description="Set RGP.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.BoolParam( name='RGP', - label='R G P', + label='RGP', description="Rappel glob on physically equalized", + enabled=lambda node: node.setRGP.value, uid=[0], value=True, advanced=True, ), + desc.BoolParam( + name='setDynG', + label='Set DynG', + description="Set DynG.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.FloatParam( name='DynG', - label='Dyn G', + label='DynG', description="Global Dynamic (to correct saturation problems)", + enabled=lambda node: node.setDynG.value, uid=[0], value=0.0, range=(-float('inf'), float('inf'), 0.01), advanced=True, ), + desc.BoolParam( + name='setImPrio', + label='Set Im Prio', + description="Set Im Prio.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.StringParam( name='ImPrio', label='Im Prio', description="Pattern of image with high prio", + enabled=lambda node: node.setImPrio.value, uid=[0], value=".*", advanced=True, ), + desc.BoolParam( + name='setSzV', + label='Set SzV', + description="Set SzV.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.IntParam( name='SzV', - label='Sz V', - description="Sz of Window for equalization (1 means 3x3)", + label='SzV', + description="Size of Window for equalization (1 means 3x3)", + enabled=lambda node: node.setSzV.value, uid=[0], value=1, range=(-sys.maxsize, sys.maxsize, 1), advanced=True, ), + desc.BoolParam( + name='setCorThr', + label='Set Cor Thr', + description="Set Cor Thr.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.FloatParam( name='CorThr', label='Cor Thr', description="Threshold of correlation to validate homologous", + enabled=lambda node: node.setCorThr.value, uid=[0], value=0.7, range=(-float('inf'), float('inf'), 0.01), advanced=True, ), + desc.BoolParam( + name='setNbPerIm', + label='Set Nb Per Im', + description="Set Nb Per Im.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.FloatParam( name='NbPerIm', label='Nb Per Im', description="Average number of point per image", + enabled=lambda node: node.setNbPerIm.value, uid=[0], value=1e4, range=(-float('inf'), float('inf'), 0.01), advanced=True, ), + desc.BoolParam( + name='setL1F', + label='Set L1 F', + description="Set L1 F.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.BoolParam( name='L1F', label='L1 F', description="Do L1 Filter on couple", + enabled=lambda node: node.setL1F.value, uid=[0], value=True, advanced=True, ), + desc.BoolParam( + name='setSatThresh', + label='Set Sat Thresh', + description="Set Sat Thresh.", + uid=[0], + value=False, + group='', + advanced=True, + ), desc.FloatParam( name='SatThresh', label='Sat Thresh', description="Threshold determining saturation value (pixel >SatThresh will be ignored)", + enabled=lambda node: node.setSatThresh.value, uid=[0], value=0.0, range=(-float('inf'), float('inf'), 0.01),