X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=Rscripts%2FRgraph.R;h=4d94e3590cbafe7ad91b4102540f9a499e3ab752;hp=b0b555c5af815ffc3dee5dc917943cea6c1b6e97;hb=5d84083b41b807307732adb78e1be7fd3e3ff004;hpb=7f5e0ba6ece181a04d872a7b6eeb2f13b33aa455

diff --git a/Rscripts/Rgraph.R b/Rscripts/Rgraph.R
index b0b555c..4d94e35 100644
--- a/Rscripts/Rgraph.R
+++ b/Rscripts/Rgraph.R
@@ -75,7 +75,7 @@ PlotAfc2dCoul<- function(afc,chisqrtable,filename, what='coord',col=FALSE, axeto
 	if (!col) {
         classes <- as.matrix(apply(chitable,1,which.max))
         cex.par <- norm.vec(apply(chitable,1,max), 0.8,3)
-        row.keep <- select.chi.classe(chitable, 60)
+        row.keep <- select.chi.classe(chitable, 80)
         rowcoord <- rowcoord[row.keep,]
         classes <- classes[row.keep]
         cex.par <- cex.par[row.keep]
@@ -83,6 +83,15 @@ PlotAfc2dCoul<- function(afc,chisqrtable,filename, what='coord',col=FALSE, axeto
         classes <- 1:clnb
         cex.par <- rep(1,clnb)
     }
+    if (is.null(xmin)) {
+        table.in <- rowcoord
+        xminmax <- c(min(table.in[,1], na.rm = TRUE) + ((max(cex.par)/10) * min(table.in[,1], na.rm = TRUE)), max(table.in[,1], na.rm = TRUE) + ((max(cex.par)/10) * max(table.in[,1], na.rm = TRUE)))
+        xmin <- xminmax[1]
+        xmax <- xminmax[2]
+        yminmax <- c(min(table.in[,2], na.rm = TRUE) + ((max(cex.par)/10) * min(table.in[,2], na.rm = TRUE)), max(table.in[,2], na.rm = TRUE) + ((max(cex.par)/10) * max(table.in[,2], na.rm = TRUE)))
+        ymin <- yminmax[1]
+        ymax <- yminmax[2]
+     }
 	#ntabtot <- cbind(rowcoord, classes)
 	#if (!col) ntabtot <- ntabtot[row_keep,]
     xlab <- paste('facteur ', x, ' -')
@@ -97,11 +106,17 @@ PlotAfc2dCoul<- function(afc,chisqrtable,filename, what='coord',col=FALSE, axeto
     table.in <- rowcoord[order(cex.par, decreasing = TRUE),]
     classes <- classes[order(cex.par, decreasing = TRUE)]
     cex.par <- cex.par[order(cex.par, decreasing = TRUE)]
-    table.in <- stopoverlap(table.in, cex.par=cex.par, xlim = c(xmin,xmax), ylim = c(ymin,ymax))
+    table.out <- stopoverlap(table.in, cex.par=cex.par, xlim = c(xmin,xmax), ylim = c(ymin,ymax))
+    table.in <- table.out$toplot
+    notplot <- table.out$notplot
+    if (! is.null(notplot)) {
+        write.csv2(notplot, file = paste(filename, '_notplotted.csv', sep = ''))
+    }
     classes <- classes[table.in[,4]]
     cex.par <- cex.par[table.in[,4]]
     make_afc_graph(table.in, classes, clnb, xlab, ylab, cex.txt = cex.par, xminmax=c(xmin,xmax), yminmax=c(ymin,ymax))
-    
+    xyminmax <- list(yminmax = c(ymin,ymax), xminmax = c(xmin,xmax))
+    xyminmax 
 	#plot(rowcoord[,x],rowcoord[,y], pch='', xlab = xlab, ylab = ylab)
 	#abline(h=0,v=0)
 	#for (i in 1:clnb) {
@@ -181,6 +196,7 @@ stopoverlap <- function(x, cex.par = NULL, xlim = NULL, ylim = NULL) {
     thetaStep <- .1
     rStep <- .5
     toplot <- NULL
+    notplot <- NULL
 
 #    plot.new()
     plot(x[,1],x[,2], pch='', xlim = xlim, ylim = ylim)
@@ -212,6 +228,7 @@ stopoverlap <- function(x, cex.par = NULL, xlim = NULL, ylim = NULL) {
 			} else {
 				if(r>sqrt(.5)){
 					print(paste(words[i], "could not be fit on page. It will not be plotted."))
+                    notplot <- rbind(notplot,c(words[i], x[i,1], x[i,2]))
 					isOverlaped <- FALSE
 				}
 				theta <- theta+thetaStep
@@ -222,7 +239,7 @@ stopoverlap <- function(x, cex.par = NULL, xlim = NULL, ylim = NULL) {
 		}
     }
     row.names(toplot) <- words[toplot[,4]]
-    return(toplot)
+    return(list(toplot = toplot, notplot = notplot))
 }
 ###############################################################################