X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=579bcae43cd507fa2219c499cd32961919459bb7;hp=f0a2390f6e3a5bce10cd42cf60e60e7dca2a19c8;hb=421d727de5be048774ffdefcb3401d56be34e94b;hpb=31635370ef617e9e2bde53ab67139c52ae9d1352 diff --git a/PrintRScript.py b/PrintRScript.py index f0a2390..579bcae 100644 --- a/PrintRScript.py +++ b/PrintRScript.py @@ -18,7 +18,7 @@ class PrintRScript : self.pathout = analyse.pathout self.analyse = analyse self.parametres = analyse.parametres - self.scriptout = self.pathout['temp'] + self.scriptout = self.pathout['lastRscript.R'] self.script = u"#Script genere par IRaMuTeQ - %s\n" % datetime.now().ctime() def add(self, txt) : @@ -1230,7 +1230,7 @@ class MergeGraphes(PrintRScript) : RData = os.path.join(path,'RData.RData') txt += load % (ffr(RData), gname) self.add(txt) - self.sources(['/home/pierre/workspace/iramuteq/Rscripts/simi.R']) + self.sources([self.analyse.parent.RscriptsPath['simi']]) txt = """ ng <- merge.graph(graphs) ngraph <- list(graph=ng, layout=layout.fruchterman.reingold(ng, dim=3), labex.cex=V(ng)$weight) @@ -1304,4 +1304,4 @@ class FreqMultiScript(PrintRScript): dev.off() """ % ffr(self.pathout['barplotrow.png']) self.add(txt) - self.write() \ No newline at end of file + self.write()