Mercurial > repos > bgruening > sklearn_data_preprocess

diff main_macros.xml @ 28:50b3e080cef0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/sklearn commit 02087ce2966cf8b4aac9197a41171e7f986c11d1-dirty"
author bgruening
date Wed, 02 Oct 2019 03:55:06 -0400
parents 4952fe39b61d
children 66df2aa6cd6b
line wrap: on
line diff
--- a/main_macros.xml	Fri Sep 13 12:09:45 2019 -0400
+++ b/main_macros.xml	Wed Oct 02 03:55:06 2019 -0400
@@ -421,27 +421,46 @@
 
   <xml name="sl_mixed_input">
     <conditional name="input_options">
-      <param name="selected_input" type="select" label="Select input type:">
-          <option value="tabular" selected="true">tabular data</option>
-          <option value="sparse">sparse matrix</option>
-          <option value="seq_fasta">sequnences in a fasta file</option>
-          <option value="refseq_and_interval">reference genome and intervals</option>
-      </param>
-      <when value="tabular">
-          <expand macro="samples_tabular" multiple1="true" multiple2="false"/>
-      </when>
-      <when value="sparse">
-          <expand macro="sparse_target"/>
-      </when>
-      <when value="seq_fasta">
-          <expand macro="inputs_seq_fasta"/>
-      </when>
-      <when value="refseq_and_interval">
-          <expand macro="inputs_refseq_and_interval"/>
-      </when>
+        <expand macro="data_input_options"/>
+        <expand macro="data_input_whens"/>
     </conditional>
   </xml>
 
+  <xml name="sl_mixed_input_plus_sequence">
+    <conditional name="input_options">
+        <expand macro="data_input_options">
+            <option value="seq_fasta">sequnences in a fasta file</option>
+            <option value="refseq_and_interval">reference genome and intervals</option>
+        </expand>
+        <expand macro="data_input_whens">
+            <when value="seq_fasta">
+                <expand macro="inputs_seq_fasta"/>
+            </when>
+            <when value="refseq_and_interval">
+                <expand macro="inputs_refseq_and_interval"/>
+            </when>
+        </expand>
+    </conditional>
+  </xml>
+
+  <xml name="data_input_options">
+    <param name="selected_input" type="select" label="Select input type:">
+        <option value="tabular" selected="true">tabular data</option>
+        <option value="sparse">sparse matrix</option>
+        <yield/>
+    </param>
+  </xml>
+
+  <xml name="data_input_whens">
+    <when value="tabular">
+        <expand macro="samples_tabular" multiple1="true" multiple2="false"/>
+    </when>
+    <when value="sparse">
+        <expand macro="sparse_target"/>
+    </when>
+    <yield/>
+  </xml>
+
   <xml name="input_tabular_target">
     <param name="infile2" type="data" format="tabular" label="Dataset containing class labels or target values:"/>
     <param name="header2" type="boolean" optional="true" truevalue="booltrue" falsevalue="boolfalse" checked="false" label="Does the dataset contain header:" />