projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
R 4.3
[iramuteq]
/
analysematrix.py
diff --git
a/analysematrix.py
b/analysematrix.py
index
a89b10e
..
cae6ff8
100644
(file)
--- a/
analysematrix.py
+++ b/
analysematrix.py
@@
-1,17
+1,26
@@
-#!/bin/env python
# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
# -*- 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
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 chemins import PathOut
from functions import exec_rcode, check_Rresult, DoConf, progressbar
-from time import time, sleep
from openanalyse import OpenAnalyse
from openanalyse import OpenAnalyse
@@
-25,12
+34,9
@@
class AnalyseMatrix :
self.dlg = dlg
self.parametres = parametres
self.val = False
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()
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'])
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'])
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 :
else :
self.val = False
if self.dlg is not None :
- self.dlg.Destroy()
+ try :
+ self.dlg.Destroy()
+ except :
+ pass
def doanalyse(self) :
pass
def doanalyse(self) :
pass
-
+
def doparametres(self, dlg = None):
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)
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)
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