X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=Rscripts%2Fafc_graph.R;h=bda5ce77ee0dea428626311029df38d8a3b5b9de;hp=918211e641c31e21c906106c7c9ae22731b3d26d;hb=4c959afafbe1f1ec29b01fa8db3ae1af1b8cd4cf;hpb=2bd16d105beb32d6706f03e4ea717e4c7af43d03 diff --git a/Rscripts/afc_graph.R b/Rscripts/afc_graph.R index 918211e..bda5ce7 100644 --- a/Rscripts/afc_graph.R +++ b/Rscripts/afc_graph.R @@ -1,6 +1,6 @@ #Author: Pierre Ratinaud #Copyright (c) 20010-2013 Pierre Ratinaud -#Lisense: GNU/GPL +#License: GNU/GPL #fichier genere par IRaMuTeq @@ -130,7 +130,7 @@ if ( qui == 3 ) { table.in <- table.in[row.keep,] tablechi <- tablechi[row.keep,] } else if (do.select.chi.classe) { - row.keep <- select.chi.classe(tablechi, ptbycluster) + row.keep <- select.chi.classe(tablechi, ptbycluster, active=FALSE) table.in <- table.in[row.keep,] tablechi <- tablechi[row.keep,] } else { @@ -195,9 +195,7 @@ if (typegraph == 0 || typegraph == 2) { if (qui != 3) { tokeep <- rownames(chistabletot) %%in%% rownames(table.in) chis <- chistabletot[tokeep,] - if (over) { - chis<-chis[rownames(table.in),] - } + chis<-chis[rownames(table.in),] nodes.attr$chiclasse <- chis } else { chis <- NULL @@ -249,7 +247,7 @@ if (typegraph == 0 || typegraph == 2) { ReturnVal <- tkmessageBox(title="RGL 3 D",message="Fini !",icon="info",type="ok") } - if (typegraph == 2) { + if (typegraph == 1) { require(tcltk) ReturnVal <- tkmessageBox(title="RGL 3 D",message="Cliquez pour fermer",icon="info",type="ok") } else {