X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=analysematrix.py;h=cae6ff8198a38aea45e1ebfaa0c85956a6881eb3;hb=aef10428135f1d0b68d572c1c319bb03ed37b4a1;hp=5daf6ae80b5261498868ec46e40791b3a445a85b;hpb=346f3426ba279047ab30450bb2fd6c9ebc403c3d;p=iramuteq

diff --git a/analysematrix.py b/analysematrix.py
index 5daf6ae..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
 
 
@@ -72,10 +81,10 @@ class AnalyseMatrix :
  
     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