...

[iramuteq] / textsimi.py

diff --git a/textsimi.py b/textsimi.py
index dc75f6e..8650be1 100644 (file)
--- a/textsimi.py
+++ b/textsimi.py
@@ -20,7 +20,7 @@ from copy import copy
 
 import logging
 
-logger = logging.getLogger('iramuteq.textsimi')
+log = logging.getLogger('iramuteq.textsimi')
 
 class SimiTxt(AnalyseText): 
     def doanalyse(self) :
@@ -48,7 +48,8 @@ class SimiTxt(AnalyseText):
             self.makefiles()
             script = PrintSimiScript(self)
             script.make_script()
-            if not self.doR(script.scriptout) :
+            if not self.doR(script.scriptout, dlg = self.dlg, message = 'R...') :
+                log.info('Problem')
                 return False
             if self.parametres['type_graph'] == 1:
                 if os.path.exists(self.pathout['liste_graph']):
@@ -60,21 +61,21 @@ class SimiTxt(AnalyseText):
         else : 
             return False
 
-    def preferences(self) :
-        dial = StatDialog(self, self.parent)
-        dial.CenterOnParent()
-        val = dial.ShowModal()
-        if val == 5100 :
-            if dial.radio_lem.GetSelection() == 0 :
-                lem = 1
-            else :
-                lem = 0            
-            self.parametres['lem'] = lem
-            dial.Destroy()
-            return self.parametres
-        else :
-            dial.Destroy()
-            return None
+#    def preferences(self) :
+#        dial = StatDialog(self, self.parent)
+#        dial.CenterOnParent()
+#        val = dial.ShowModal()
+#        if val == 5100 :
+#            if dial.radio_lem.GetSelection() == 0 :
+#                lem = 1
+#            else :
+#                lem = 0            
+#            self.parametres['lem'] = lem
+#            dial.Destroy()
+#            return self.parametres
+#        else :
+#            dial.Destroy()
+#            return None
 
     def makesimiparam(self) :
         self.paramsimi = {'coeff' : 0,
@@ -157,7 +158,7 @@ class SimiFromCluster(SimiTxt) :
             self.makefiles()
             script = PrintSimiScript(self)
             script.make_script()
-            if self.doR(script.scriptout) :
+            if not self.doR(script.scriptout, dlg = self.dlg, message = 'R ...') :
                 return False
             if self.parametres['type_graph'] == 1:
                 if os.path.exists(self.pathout['liste_graph']):