X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=6c102a07c4d3a68301965de72d0c30f3f723ff11;hp=b29f813314ab8247f6a758e9ca4c72a08a973ab8;hb=e033f9e84abb3c12d92f1580425877aa58e9af30;hpb=fc14fc86c13eb0ed0f420771b08cc42a5db90c01

diff --git a/PrintRScript.py b/PrintRScript.py
index b29f813..6c102a0 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -253,7 +253,6 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv
 def RPamTxt(corpus, RscriptPath):
     DicoPath = corpus.pathout
     param = corpus.parametres
-    print param
     txt = """
     source("%s")
     """ % (RscriptPath['pamtxt'])
@@ -394,7 +393,9 @@ write.csv2(gbcluster,file="%s")
     PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", what='coord', deb=debsup, fin=(debet-1), xlab = xlab, ylab = ylab, xmin = xyminmax$xminmax[1], xmax = xyminmax$xminmax[2], ymin = xyminmax$yminmax[1], ymax = xyminmax$yminmax[2])
     """ % (DictChdTxtOut['AFC2DSL_OUT'])
         txt += """
+        if ((fin - debet) > 2) {
     PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", what='coord', deb=debet, fin=fin, xlab = xlab, ylab = ylab, xmin = xyminmax$xminmax[1], xmax = xyminmax$xminmax[2], ymin = xyminmax$yminmax[1], ymax = xyminmax$yminmax[2])
+        }
     """ % (DictChdTxtOut['AFC2DEL_OUT'])
         txt += """
     PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", col=TRUE, what='coord', xlab = xlab, ylab = ylab, xmin = xyminmax$xminmax[1], xmax = xyminmax$xminmax[2], ymin = xyminmax$yminmax[1], ymax = xyminmax$yminmax[2])
@@ -544,6 +545,7 @@ def barplot(table, rownames, colnames, rgraph, tmpgraph, intxt = False) :
     #    height = 400
     rownames = 'c("' + '","'.join(rownames) + '")'
     colnames = 'c("' + '","'.join(colnames) + '")'
+
     if not intxt :
         #FIXME
         txt = """
@@ -1091,7 +1093,14 @@ class WordCloudRScript(PrintRScript) :
         self.packages(['wordcloud'])
         bg_col = Rcolor(self.parametres['col_bg'])
         txt_col = Rcolor(self.parametres['col_text'])
+        if self.parametres['svg'] :
+            svg = 'TRUE'
+        else :
+            svg = 'FALSE'
         txt = """
+        svg <- %s
+        """ % svg
+        txt += """
         act <- read.csv2("%s", header = FALSE, row.names=1, sep='\t')
         selected.col <- read.table("%s")
         toprint <- as.matrix(act[selected.col[,1] + 1,])
@@ -1101,7 +1110,7 @@ class WordCloudRScript(PrintRScript) :
             toprint <- as.matrix(toprint[order(toprint[,1], decreasing=TRUE),])
             toprint <- as.matrix(toprint[1:maxword,])
         }
-        open_file_graph("%s", width = %i, height = %i)
+        open_file_graph("%s", width = %i, height = %i , svg = svg)
         par(bg=rgb%s)
         wordcloud(row.names(toprint), toprint[,1], scale=c(%f,%f), random.order=FALSE, colors=rgb%s)
         dev.off()