# HG changeset patch # User bimib # Date 1716495002 0 # Node ID 005831b3ae9c009d925d7f1a4819548272c22191 # Parent 685db5efd0731f999c576bc911edf527b91fb3a2 Uploaded diff -r 685db5efd073 -r 005831b3ae9c marea_2_0/marea.xml --- a/marea_2_0/marea.xml Thu May 23 20:04:37 2024 +0000 +++ b/marea_2_0/marea.xml Thu May 23 20:10:02 2024 +0000 @@ -6,10 +6,11 @@ pandas scipy - lxml + lxml svglib - reportlab + reportlab pyvips + cairosvg @@ -25,37 +26,37 @@ #if $cond.type_selector == 'datasets': #if $cond.using_RAS.check == 'true': --input_datas - #for $data in $cond.input_Datasets: + #for $data in $cond.using_RAS.input_Datasets: ${data.input} #end for --names - #for $data in $cond.input_Datasets: + #for $data in $cond.using_RAS.input_Datasets: ${data.input_name} #end for #end if #if $cond.using_RPS.check == 'true': --input_datas_rps - #for $data in $cond.input_Datasets_RPS: + #for $data in $cond.using_RPS.input_Datasets_RPS: ${data.input_rps} #end for --names_rps - #for $data in $cond.input_Datasets_RPS: + #for $data in $cond.using_RPS.input_Datasets_RPS: ${data.input_name_rps} #end for #end if #elif $cond.type_selector == 'dataset_class': #if $cond.using_RAS.check == 'true': - --input_data ${cond.input_data} - --input_class ${cond.input_class} + --input_data ${cond.using_RAS.input_data} + --input_class ${cond.using_RAS.input_class} #end if #if $cond.using_RPS.check == 'true': - --input_data_rps ${cond.input_data_rps} - --input_class_rps ${cond.input_class_rps} + --input_data_rps ${cond.using_RPS.input_data_rps} + --input_class_rps ${cond.using_RPS.input_class_rps} #end if #end if