Révision 3974

TXM/trunk/bundles/org.txm.analec.rcp/src/org/txm/macro/urs/exploit/UnitsIndexMacro.groovy (revision 3974)
69 69
		sep_output
70 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="Text", required=false, def="")
73
		output_canonical_sort
72
@Field @Option(name="output_canonical_order", usage="If sort must be canonical, put here the keys order", widget="Text", required=false, def="")
73
		output_canonical_order
74 74
//@Field @Option(name="output_2D", usage="output barplot or 3D plot", widget="Boolean", required=true, def="true")
75 75
		output_2D = true
76 76
@Field @Option(name="output_showlegend", usage="output barplot or 3D plot", widget="Boolean", required=false, def="true")
......
181 181
}
182 182

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

Formats disponibles : Unified diff