# HG changeset patch # User bimib # Date 1584289598 14400 # Node ID ce8534417470f0a65dadc643e66730f1653ffb63 # Parent 69dfed656e0b99c6185d4b24a34d6ea84f70bf4d Uploaded diff -r 69dfed656e0b -r ce8534417470 Marea/marea.xml --- a/Marea/marea.xml Sun Mar 15 12:26:26 2020 -0400 +++ b/Marea/marea.xml Sun Mar 15 12:26:38 2020 -0400 @@ -1,4 +1,4 @@ - + marea_macros.xml @@ -28,11 +28,12 @@ ${data.input_name} #end for --comparison ${cond.comparis.comparison} - #if $cond.advanced.cond_map.cond_map_choice == 'true': - --custom_rules true - --custom_map ${cond.advanced.cond_map.custom_map} - #end if + #if $cond.advanced.choice == 'true': + #if $cond.advanced.cond_map.cond_map_choice == 'true': + --custom_rules true + --custom_map ${cond.advanced.cond_map.custom_map} + #end if --pValue ${cond.advanced.pValue} --fChange ${cond.advanced.fChange} --generate_svg ${cond.advanced.generateSvg} @@ -51,11 +52,11 @@ #if $cond.comparis.comparison == 'onevsmany' --control ${cond.comparis.controlgroup} #end if - #if $cond.advanced.cond_map.cond_map_choice == 'true': - --custom_rules true - --custom_map ${cond.advanced.cond_map.custom_map} - #end if #if $cond.advanced.choice == 'true': + #if $cond.advanced.cond_map.cond_map_choice == 'true': + --custom_rules true + --custom_map ${cond.advanced.cond_map.custom_map} + #end if --pValue ${cond.advanced.pValue} --fChange ${cond.advanced.fChange} --generate_svg ${cond.advanced.generateSvg}