# HG changeset patch
# User testtool
# Date 1506946998 14400
# Node ID 53dff79c833b0c40abe9056497d1c78c2b96c88d
# Parent  37a59e6c6c022912b45521731cf889cea815b4eb
Uploaded

diff -r 37a59e6c6c02 -r 53dff79c833b survival/survival.xml
--- a/survival/survival.xml	Mon Oct 02 08:23:11 2017 -0400
+++ b/survival/survival.xml	Mon Oct 02 08:23:18 2017 -0400
@@ -4,7 +4,7 @@
         <requirement type="package" version="2.40_1">r-survival</requirement>
     </requirements>
     <command detect_errors="aggressive">
-        Rscript '$__tool_directory__/survival.R' '$input' '$type' '$error' '$conf_type' '$conf_lower' '$fit' '$png'
+        Rscript '$__tool_directory__/survival.R' '$input' '$type' '$error' '$conf.type' '$conf.lower' '$fit' '$png'
     </command>
 <inputs>
         <param format="csv" type="data" name="input"  value="" label="survival data" help="
@@ -15,36 +15,72 @@
    19 2506  FALSE  1 HOXA1
    20 1382   TRUE  1 HOXA1 ''"/>
           
-          <conditional name="type">
-      <param name="type" type="select" label="Type of survival curve:">
+          <conditional name="select_type1">
+      <param name="input_type_selector1" type="select" label="Type of survival curve:">
         <option value="kaplan-meier">kaplan-meier</option>
         <option value="fleming-harrington">fleming-harrington</option>
-        <option value="fh2">fh2</option>
+        <option value="fh2">fleming-harrington</option>
       </param>
+      <when value="kaplan-meier">
+        <param name="type" type="text" value="kaplan-meier" label="kaplan-meier" />
+      </when>
+      <when value="fleming-harrington">
+        <param name="type" type="text" value="fleming-harrington" label="fleming-harrington" />
+      </when>
+      <when value="fh2">
+        <param name="type" type="text" value="fh2" label="fh2" />
+      </when>
     </conditional>
     
-    <conditional name="error">
-      <param name="error" type="select" label="Type of error:">
+    <conditional name="select_type2">
+      <param name="input_type_selector2" type="select" label="Type of error:">
         <option value="greenwood">greenwood</option>
         <option value="tsiatis">tsiatis</option>
       </param>
+      <when value="greenwood">
+        <param name="type" type="text" value="greenwood" label="greenwood" />
+      </when>
+      <when value="tsiatis">
+        <param name="type" type="text" value="tsiatis" label="tsiatis" />
+      </when>
     </conditional>
        
-          <conditional name="conf_type">
-      <param name="conf_type" type="select" label="Type of conf_type:">
+          <conditional name="select_type3">
+      <param name="input_type_selector3" type="select" label="Type of conf.type:">
         <option value="log">log</option>
         <option value="log-log">log-log</option>
         <option value="plain">plain</option>
         <option value="none">none</option>
       </param>
+      <when value="log">
+        <param name="type" type="text" value="log" label="log" />
+      </when>
+      <when value="log-log">
+        <param name="type" type="text" value="log-log" label="log-log" />
+      </when>
+      <when value="plain">
+        <param name="type" type="text" value="plain" label="plain" />
+      </when>
+       <when value="none">
+        <param name="type" type="text" value="none" label="none" />
+      </when>
     </conditional>
     
-        <conditional name="conf_lower">
-      <param name="conf_lower" type="select" label="Type of conf_lower:">
+        <conditional name="select_type4">
+      <param name="input_type_selector4" type="select" label="Type of conf.lower:">
         <option value="usual">usual</option>
-        <option value="peto">peto</option>
-        <option value="modified">modified</option>
+        <option value="peto">fleming-harrington</option>
+        <option value="modified">fleming-harrington</option>
       </param>
+      <when value="usual">
+        <param name="type" type="text" value="usual" label="usual" />
+      </when>
+      <when value="peto">
+        <param name="type" type="text" value="peto" label="peto" />
+      </when>
+      <when value="modified">
+        <param name="type" type="text" value="modified" label="modified" />
+      </when>
     </conditional>
     
     </inputs>