X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=analysematrix.py;h=cae6ff8198a38aea45e1ebfaa0c85956a6881eb3;hb=1b9c7a72bead57d99e96f1f15795ff045c8e376e;hp=a89b10e0a23e86c7cc53b3351b1e6ef398502970;hpb=9a12a3e7eee7e594312047115cc130f769a3adc3;p=iramuteq

diff --git a/analysematrix.py b/analysematrix.py
index a89b10e..cae6ff8 100644
--- a/analysematrix.py
+++ b/analysematrix.py
@@ -1,17 +1,26 @@
-#!/bin/env python
 # -*- coding: utf-8 -*-
 #Author: Pierre Ratinaud
-#Copyright (c) 2013 Pierre Ratinaud
-#License: GNU GPL
-
-
+#Copyright (c) 2008-2020 Pierre Ratinaud
+#modification pour python 3 : Laurent Mérat, 6x7 - mai 2020
+#License: GNU/GPL
 
+#------------------------------------
+# import des modules python
+#------------------------------------
 import logging
 import os
 from uuid import uuid4
+from time import time, sleep
+
+#------------------------------------
+# import des modules wx
+#------------------------------------
+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
 from chemins import PathOut
 from functions import exec_rcode, check_Rresult, DoConf, progressbar
-from time import time, sleep
 from openanalyse import OpenAnalyse
 
 
@@ -25,12 +34,9 @@ class AnalyseMatrix :
         self.dlg = dlg
         self.parametres = parametres
         self.val = False
-        print self.parametres
         if not 'pathout' in self.parametres :
             self.parametres['pathout'] = PathOut(tableau.parametres['originalpath'], analyse_type = self.parametres['type'], dirout = tableau.parametres['pathout']).mkdirout()
-            print self.parametres
             self.pathout = PathOut(analyse_type = self.parametres['type'], dirout = self.parametres['pathout'])
-            print self.pathout.dirout
         else :
             self.pathout = PathOut(filename = tableau.parametres['originalpath'], dirout = self.parametres['pathout'], analyse_type = self.parametres['type'])
 
@@ -68,14 +74,17 @@ class AnalyseMatrix :
         else :
             self.val = False
             if self.dlg is not None :
-                self.dlg.Destroy()
+                try :
+                    self.dlg.Destroy()
+                except :
+                    pass
  
     def doanalyse(self) :
         pass
-    
+
     def doparametres(self, dlg = None):
         pass
-    
+
     def doR(self, Rscript, wait = False, dlg = None, message = '') :
         #log.info('R code...')
         pid = exec_rcode(self.ira.RPath, Rscript, wait = wait)
@@ -85,5 +94,4 @@ class AnalyseMatrix :
                 sleep(0.2)
             else :
                 sleep(0.2)
-        return check_Rresult(self.ira, pid)
-    
+        return check_Rresult(self.ira, pid)
\ No newline at end of file