projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
json for Matrix + fix for windows
[iramuteq]
/
analysematrix.py
diff --git
a/analysematrix.py
b/analysematrix.py
index
5daf6ae
..
40bd5b9
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
@@
-51,7
+60,7
@@
class AnalyseMatrix :
if self.parametres.get('tohistory', True) :
self.time = time() - self.t1
minutes, seconds = divmod(self.time, 60)
if self.parametres.get('tohistory', True) :
self.time = time() - self.t1
minutes, seconds = divmod(self.time, 60)
- hours, minutes = divmod(minutes, 60)
+ hours, minutes = divmod(minutes, 60)
self.parametres['time'] = '%.0fh %.0fm %.0fs' % (hours, minutes, seconds)
self.parametres['ira'] = self.pathout['Analyse.ira']
DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira'])
self.parametres['time'] = '%.0fh %.0fm %.0fs' % (hours, minutes, seconds)
self.parametres['ira'] = self.pathout['Analyse.ira']
DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira'])
@@
-72,10
+81,10
@@
class AnalyseMatrix :
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)
@@
-86,4
+95,3
@@
class AnalyseMatrix :
else :
sleep(0.2)
return check_Rresult(self.ira, pid)
else :
sleep(0.2)
return check_Rresult(self.ira, pid)
-