...

[iramuteq] / Rscripts / Rgraph.R

diff --git a/Rscripts/Rgraph.R b/Rscripts/Rgraph.R
index ffbee4c..2ea1c38 100644 (file)
--- a/Rscripts/Rgraph.R
+++ b/Rscripts/Rgraph.R
@@ -202,8 +202,8 @@ stopoverlap <- function(x, cex.par = NULL) {
                y1<- x[i,2]
                wid <- strwidth(words[i],cex=size[i])
                ht <- strheight(words[i],cex=size[i])
-           ht <- (ht + ht*.2) + .01
-        wid <- (wid + wid*.1) + .01
+           ht <- (ht + ht*.08)
+        wid <- (wid + wid*.15)
                isOverlaped <- TRUE
                while(isOverlaped){
                        if(!overlap(x1-.5*wid,y1-.5*ht,wid,ht, boxes)) { #&&
@@ -213,7 +213,7 @@ stopoverlap <- function(x, cex.par = NULL) {
                                boxes[[length(boxes)+1]] <- c(x1-.5*wid,y1-.5*ht,wid,ht)
                                isOverlaped <- FALSE
                        } else {
-                               if(r>sqrt(.5)){
+                               if(r>sqrt(.1)){
                                        print(paste(words[i], "could not be fit on page. It will not be plotted."))
                                        isOverlaped <- FALSE
                                }
@@ -265,12 +265,12 @@ make_dendro_cut_tuple <- function(dendro_in, coordok, classeuce, x, nbt = 9) {
        dendro <- gsub('a','',dendro)
        dendro_tot_cl <- read.tree(text = dendro)
        #FIXME
-       for (i in 1:10) {
+       for (i in 1:100) {
                for (cl in 1:clnb) {
                        dendro <- gsub(paste('\\(',cl,',',cl,'\\)',sep=''),cl,dendro)
                }
        }
-       for (i in 1:10) {
+       for (i in 1:100) {
                dendro <- gsub(paste('\\(',0,',',0,'\\)',sep=''),0,dendro)
                for (cl in 1:clnb) {
                        dendro <- gsub(paste('\\(',0,',',cl,'\\)',sep=''),cl,dendro)
@@ -429,10 +429,10 @@ create_afc_table <- function(x) {
 
 make_afc_graph <- function(toplot, classes, clnb, xlab, ylab, cex.txt = NULL, leg = FALSE, cmd = FALSE, black = FALSE, xminmax=NULL, yminmax=NULL) {
     if (is.null(xminmax)) {
-        xminmax <- c(min(toplot[,1]) + (0.1 * min(toplot[,1])), max(toplot[,1]) + (0.1 * max(toplot[,1])))
+        xminmax <- c(min(toplot[,1], na.rm = TRUE) + (0.1 * min(toplot[,1], na.rm = TRUE)), max(toplot[,1], na.rm = TRUE) + (0.1 * max(toplot[,1], na.rm = TRUE)))
     }
     if (is.null(yminmax)) {
-        yminmax <- c(min(toplot[,2]) + (0.1 * min(toplot[,2])), max(toplot[,2]) + (0.1 * max(toplot[,2])))
+        yminmax <- c(min(toplot[,2], na.rm = TRUE) + (0.1 * min(toplot[,2], na.rm = TRUE)), max(toplot[,2], na.rm = TRUE) + (0.1 * max(toplot[,2], na.rm = TRUE)))
     }
        rain <- rainbow(clnb)
     compt <- 1