X-Git-Url: http://www.iramuteq.org/git?a=blobdiff_plain;f=analyse_merge.py;h=b30976a7df2de61cc48e2157635e47aebc805dc6;hb=refs%2Fheads%2F3.0;hp=549ac793871bc1461057a3763cd29a643c8d5bcd;hpb=11658a48940defe4f9b849e9e32606a646751388;p=iramuteq

diff --git a/analyse_merge.py b/analyse_merge.py
index 549ac79..b30976a 100644
--- a/analyse_merge.py
+++ b/analyse_merge.py
@@ -1,14 +1,26 @@
 # -*- coding: utf-8 -*-
 #Author: Pierre Ratinaud
-#Copyright (c) 2015 Pierre Ratinaud
+#Copyright (c) 2008-2020 Pierre Ratinaud
+#modification pour python 3 : Laurent Mérat, 6x7 - mai 2020
 #License: GNU/GPL
 
+#------------------------------------
+# import des modules python
+#------------------------------------
 import os
+from time import sleep
+
+#------------------------------------
+# import des modules wx
+#------------------------------------
+import wx
+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
 from chemins import PathOut
 from functions import exec_rcode, check_Rresult
 from dialog import MergeDialog
-import wx
-from time import sleep
 from PrintRScript import MergeGraphes
 
 def merge_graphes(lgraphes):
@@ -30,8 +42,7 @@ class AnalyseMerge :
         if self.doparametres(dlg=dlg) is not None :
             script = merge_graphes(self.parametres['graphs'])
             self.doR(script.scriptout, dlg=False)
-            print 'fini'
-            
+            print('fini')
 
     def doparametres(self, dlg=None):
         if dlg is not None :
@@ -40,6 +51,7 @@ class AnalyseMerge :
             if res == wx.ID_OK :
                 self.parametres['graphs'] = [graph.GetPath() for graph in dial.graphs if graph.GetPath() != '']
                 return True
+            # pas besoin d'un dial.Destroy() ???
         return True
             
     def doR(self, Rscript, wait = False, dlg = None, message = '') :