# HG changeset patch # User bimib # Date 1716537651 0 # Node ID 3da19e81987373b5c3a72c533c786595065d6e23 # Parent 58fad6dc622e5fd348efea47bf9ecc7936e50bbb Uploaded diff -r 58fad6dc622e -r 3da19e819873 marea_2_0/marea.xml --- a/marea_2_0/marea.xml Thu May 23 23:26:20 2024 +0000 +++ b/marea_2_0/marea.xml Fri May 24 08:00:51 2024 +0000 @@ -6,9 +6,9 @@ pandas scipy - lxml + lxml svglib - reportlab + reportlab pyvips cairosvg @@ -29,24 +29,24 @@ #if $cond.using_ras.check == 'true': --input_datas - #for $data in $cond.$using_ras.input_datasets: + #for $data in $cond.using_ras.input_datasets: ${data.input} #end for --names - #for $data in $cond.$using_ras.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.$using_rps.input_datasets_rps: + #for $data in $cond.using_rps.input_datasets_rps: ${data.input_rps} #end for --names_rps - #for $data in $cond.$using_rps.input_datasets_rps: + #for $data in $cond.using_rps.input_datasets_rps: ${data.input_name_rps} #end for #end if @@ -57,13 +57,13 @@ --using_RPS $cond.using_rps_all.check #if $cond.using_ras_all.check == 'true': - --input_data ${cond.$using_ras_all.input_data} - --input_class ${cond.$using_ras_all.input_class} + --input_data ${cond.using_ras_all.input_data} + --input_class ${cond.using_ras_all.input_class} #end if #if $cond.using_rps_all.check == 'true': - --input_data_rps ${cond.$using_rps_all.input_data_rps} - --input_class_rps ${cond.$using_rps_all.input_class_rps} + --input_data_rps ${cond.using_rps_all.input_data_rps} + --input_class_rps ${cond.using_rps_all.input_class_rps} #end if #end if