windows

diff --git a/PrintRScript.py b/PrintRScript.py
index 3311a12..16cf7de 100644 (file)
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -165,14 +165,14 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv
     txt += """
     log1 <- "%s"
     chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method =
-    svd.method, libsvdc.path = libsvdc.path, log.file = log1)
+    svd.method, libsvdc.path = libsvdc.path)#, log.file = log1)
     """ % ffr(DicoPath['log-chd1.txt'])
 
     if classif_mode == 0:
         txt += """
     log2 <- "%s"
     chd2<-CHD(data2, x = nbt, mode.patate = mode.patate, svd.method =
-    svd.method, libsvdc.path = libsvdc.path) log.file = log2)
+    svd.method, libsvdc.path = libsvdc.path)#, log.file = log2)
     """ % ffr(DicoPath['log-chd2.txt'])
 
     txt += """
@@ -1331,6 +1331,7 @@ class LabbeScript(PrintRScript) :
         """ % (ffr(self.pathout['distmat.csv']), ffr(self.pathout['labbe-tree.png']))
         txt +="""
         open_file_graph("%s", width=1000, height=1000, svg=F)
+        par(mar=c(10,1,1,10))
         heatmap(as.matrix(dist.mat), symm = T, distfun=function(x) as.dist(x))
         dev.off()
         """ % ffr(self.pathout['labbe-heatmap.png'])

diff --git a/layout.py b/layout.py
index 749cc07..54ea926 100644 (file)
--- a/layout.py
+++ b/layout.py
@@ -1148,10 +1148,10 @@ class LabbeLayout(DefaultTextLayout):
                      ['labbe-heatmap.png', _(u'Heatmap').decode('utf8')],
                      ['labbe-matrix.png', _(u'Matrix').decode('utf8')]]
         self.TabStatTot = GraphPanel(self.ira.nb, self.pathout, list_graph)
-        self.Tab.AddPage(self.TabStatTot, _(u"Labbé's distance").decode('utf8'))
+        self.Tab.AddPage(self.TabStatTot, _(u"Labbe's distance").decode('utf8'))
         self.Tab.corpus = self.corpus
         self.Tab.parametres = self.parametres
-        self.ira.nb.AddPage(self.Tab, '%s' % self.parametres['name'])
+        self.ira.nb.AddPage(self.Tab, u'%s' % self.parametres['name'])
         self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)
         self.ira.ShowAPane("Tab_content")