Révision 3973

TXM/trunk/bundles/org.txm.analec.rcp/src/org/txm/macro/urs/exploit/UnitsIndexMacro.groovy (revision 3973)
67 67
		
68 68
@Field @Option(name="sep_output", usage="Output options", widget="Separator", required=false, def="Output options")
69 69
		sep_output
70
@Field @Option(name="output_sort", usage="Sort: name, frequence", widget="StringArray", metaVar="name	frequence", required=false, def="frequence")
70
@Field @Option(name="output_sort", usage="Sort: name, frequence", widget="StringArray", metaVar="name	frequence	canonical", required=false, def="frequence")
71 71
		output_sort
72
@Field @Option(name="output_canonical_sort", usage="If sort must be canonical, put here the keys order", widget="String", required=false, def="")
72
@Field @Option(name="output_canonical_sort", usage="If sort must be canonical, put here the keys order", widget="Text", required=false, def="")
73 73
		output_canonical_sort
74 74
//@Field @Option(name="output_2D", usage="output barplot or 3D plot", widget="Boolean", required=true, def="true")
75 75
		output_2D = true
......
181 181
}
182 182

  
183 183
println allresults.keySet()
184
if (output_canonical_sort.length() > 0) {
185
	output_canonical_sort = output_canonical_sort.split(",") as List
184
if (output_sort == "canonical" && output_canonical_sort.length() > 0) {
185
	if (output_canonical_sort.contains("\t")) {
186
		output_canonical_sort = output_canonical_sort.split("\n", 2) as List
187
		def tmp = []
188
		for (int i = 0 ; i < output_canonical_sort[0].length() ; i++) {
189
			for (int j = 0 ; j < output_canonical_sort[1].length() ; j++) {
190
				tmp << output_canonical_sort[i]+"_"+output_canonical_sort[j]
191
			}
192
		}
193
		output_canonical_sort = tmp
194
	} else {
195
		output_canonical_sort = output_canonical_sort.split(",") as List
196
	}
197
	
186 198
	output_canonical_sort.retainAll(keys)
187 199
	keys = output_canonical_sort
188 200
} else {

Formats disponibles : Unified diff