From: Pierre <ratinaud@univ-tlse2.fr>
Date: Mon, 7 Jan 2013 21:31:32 +0000 (+0100)
Subject: ...
X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=0c8c6509adbec7ffb2ee844aea5e92b0e021a82d

...
---

diff --git a/Rscripts/Rgraph.R b/Rscripts/Rgraph.R
index c38f0b4..2ea1c38 100644
--- 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
 				}
diff --git a/analysetxt.py b/analysetxt.py
index d3f8591..e3e1244 100644
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -10,7 +10,7 @@ import os
 #ALCESTE
 from PrintRScript import RchdTxt, AlcesteTxtProf
 from OptionAlceste import OptionAlc 
-#from layout import PrintRapport
+from layout import PrintRapport
 from openanalyse import OpenAnalyse
 from time import time
 ######################################