X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=45022f3ee201457f43fe91c7272455bc24724e03;hp=d21ad22f5aa7a8079deaa1fc4dedeff430450b1c;hb=3f66309538f8393e15449aa1380430457ed864b7;hpb=a5fa23767c01368804b2fbb1e2915bc332c6f932

diff --git a/PrintRScript.py b/PrintRScript.py
index d21ad22..45022f3 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -912,18 +912,24 @@ class PrintSimiScript(PrintRScript) :
 
 class WordCloudRScript(PrintRScript) :
     def make_script(self) :
-        self.Source([self.analyse.parent.RscriptsPath['Rgraph']])
+        self.sources([self.analyse.parent.RscriptsPath['Rgraph']])
         self.packages(['wordcloud'])
         bg_col = Rcolor(self.parametres['col_bg'])
         txt_col = Rcolor(self.parametres['col_text'])
         txt = """
         act <- read.csv2("%s", header = FALSE, row.names=1, sep='\t')
         selected.col <- read.table("%s")
-        toprint <- act[selected.col + 1,]
+        toprint <- as.matrix(act[selected.col[,1] + 1,])
+        rownames(toprint) <- rownames(act)[selected.col[,1] + 1]
+        maxword <- %i
+        if (nrow(toprint) > maxword) {
+            toprint <- as.matrix(toprint[order(toprint[,1], decreasing=TRUE),])
+            toprint <- as.matrix(toprint[1:maxword,])
+        }
         open_file_graph("%s", width = %i, height = %i)
         par(bg=rgb%s)
         wordcloud(row.names(toprint), toprint[,1], scale=c(%f,%f), random.order=FALSE, colors=rgb%s)
         dev.off()
-        """ % (self.parametres['actives_eff.csv'], self.parametres['selected.csv'], self.parametres['graphout'], self.parametres['width'], self.parametres['height'], bg_col, self.parametres['maxcex'], self.parametres['mincex'], txt_col)
+        """ % (ffr(self.analyse.pathout['actives_eff.csv']), ffr(self.analyse.pathout['selected.csv']), self.parametres['maxword'], ffr(self.parametres['graphout']), self.parametres['width'], self.parametres['height'], bg_col, self.parametres['maxcex'], self.parametres['mincex'], txt_col)
         self.add(txt)
         self.write()