changeset 25:6ee180bcae9d draft

Uploaded

--- a/CorrTable/Corr.xml	Tue Jul 30 11:49:47 2019 -0400
+++ b/CorrTable/Corr.xml	Tue Jul 30 12:07:26 2019 -0400
@@ -165,6 +165,33 @@
 				</when>
 				
 				<when value ="forced">	
+					<conditional name="heatmap_cond">
+					<param name="color_heatmap" label="Colored correlation table strategy" type="select" display="radio" help="Standard corresponds to a scale with a smooth gradient between three colors: red, white and green (continuous case). Customized creates classes for the correlation coefficients - the scale has discrete values.">
+						<option value="no">Standard</option>
+						<option value="yes">Customized</option>
+					</param>		
+			
+					<when value="yes">
+						<conditional name="typeclass_cond">
+							<param name="type_classes" label="Choose the type of classes" type="select" display="radio" help="Regular means the classes have the same size. Irregular means it is possible to choose any intervals." >
+								<option value="regular">Regular classes</option>
+								<option value="irregular">Irregular classes</option>
+							</param>
+								
+							<when value="regular">
+								<param name="reg_class_value" label="Class size" type="float" value="" help="Must be between 0 and 1" />
+							</when>
+							
+							<when value="irregular">
+								<param name="irreg_class_vect" label="Vector with values for classes" type="text" value="" help="The vector must be of the following form: (value1,value2,value3,..). The values must be between -1 and 1 not included. For example: (-0.8,-0.5,-0.4,0,0.4,0.5,0.8)." />
+							</when>
+						</conditional>	
+					</when>
+					
+					<when value ="no">	
+					</when>
+					
+					</conditional>
 				</when>
 				
 				<when value ="none">	
@@ -180,7 +207,9 @@
 	
 	<outputs>
 		<data name="tabcorr_out" label="CorrTable" format="tabular" />
-		<data name="heatmap_out" label="CT_plot" format="pdf" />
+		<data name="heatmap_out" label="CT_plot" format="pdf" >
+			<filter>options['plot_choice'] == 'auto' or options['plot_choice'] == 'forced'</filter>
+		</data>
 	</outputs>
 	
 	<help>

--- a/CorrTable/Corr_wrap.r	Tue Jul 30 11:49:47 2019 -0400
+++ b/CorrTable/Corr_wrap.r	Tue Jul 30 12:07:26 2019 -0400
@@ -30,7 +30,7 @@
 source_local("Corr_Script_samples_row.R")
 
 
-if(length(args) < 11){ stop("NOT enough argument !!!") }
+if(length(args) < 10){ stop("NOT enough argument !!!") }
 
 
 cat('\n--------------------------------------------------------------------', 
@@ -58,7 +58,7 @@
 type_classes <- NULL
 reg_class_value <- NULL
 irreg_class_vect <- NULL
-if(args$plot_choice == "none"){args$color_heatmap <- "no"}
+if(args$plot_choice == "none"){args$color_heatmap <- "no"; args$heatmap_out <- NULL}
 if(args$color_heatmap == "yes"){
 	type_classes <- args$type_classes
 	if(type_classes == "regular"){