X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=Rscripts%2FRgraph.R;h=6abd55e4d49b8c07ad2a1e13ddc414564905b911;hp=c38f0b44bc334fecc29ff2c25456451a5f223832;hb=9bde3d55d2131f1a33234a43c0de8b200ddb8f9a;hpb=1f82fb8e9ed83b8524b00039f1a8c51c2b12a8be

diff --git a/Rscripts/Rgraph.R b/Rscripts/Rgraph.R
index c38f0b4..6abd55e 100644
--- a/Rscripts/Rgraph.R
+++ b/Rscripts/Rgraph.R
@@ -43,7 +43,7 @@ PlotDendroCut <- function(chd,filename,reso,clusternb) {
 #	dev.off()
 #}
 
-PlotAfc2dCoul<- function(afc,chisqrtable,filename, what='coord',col=FALSE, axetoplot=c(1,2), deb=0,fin=0, width=900, height=900, quality=100, reso=200, parcex=PARCEX, xlab = NULL, ylab = NULL, xmin=NULL, xmax=NULL, ymin=NULL, ymax=NUL) {
+PlotAfc2dCoul<- function(afc,chisqrtable,filename, what='coord',col=FALSE, axetoplot=c(1,2), deb=0,fin=0, width=900, height=900, quality=100, reso=200, parcex=PARCEX, xlab = NULL, ylab = NULL, xmin=NULL, xmax=NULL, ymin=NULL, ymax=NULL) {
 	if (col) {
 		if (what == 'coord') {
 			rowcoord <- as.matrix(afc$colcoord)
@@ -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
 				}
@@ -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], 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)))
+        xminmax <- c(min(toplot[,1], na.rm = TRUE) + ((max(cex.txt)/10) * min(toplot[,1], na.rm = TRUE)), max(toplot[,1], na.rm = TRUE) + ((max(cex.txt)/10) * max(toplot[,1], na.rm = TRUE)))
     }
     if (is.null(yminmax)) {
-        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)))
+        yminmax <- c(min(toplot[,2], na.rm = TRUE) + ((max(cex.txt)/10) * min(toplot[,2], na.rm = TRUE)), max(toplot[,2], na.rm = TRUE) + ((max(cex.txt)/10) * max(toplot[,2], na.rm = TRUE)))
     }
 	rain <- rainbow(clnb)
     compt <- 1