projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repair keyframe
[iramuteq]
/
tabchddist.py
diff --git
a/tabchddist.py
b/tabchddist.py
index
6010eaa
..
39c50ac
100644
(file)
--- a/
tabchddist.py
+++ b/
tabchddist.py
@@
-1,17
+1,13
@@
# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
#Copyright (c) 2008 Pierre Ratinaud
# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
#Copyright (c) 2008 Pierre Ratinaud
-#Li
s
ense: GNU/GPL
+#Li
c
ense: GNU/GPL
import wx
import os
import wx
import os
-#from rchdng import RchdFunct
from chemins import ffr, ConstructPathOut,ChdTxtPathOut
from chemins import ffr, ConstructPathOut,ChdTxtPathOut
-#from layout import PrintRapport
-from openanalyse import OpenAnalyse
-from ConfigParser import ConfigParser
from functions import CreateIraFile, print_liste, exec_rcode, check_Rresult
from functions import CreateIraFile, print_liste, exec_rcode, check_Rresult
-from dialog import
CHDDialog,
PrefQuestAlc, ClusterNbDialog
+from dialog import PrefQuestAlc, ClusterNbDialog
import tempfile
import time
import tempfile
import time
@@
-51,9
+47,9
@@
def RchdFunct(self,parent, rep_out, CLASSIF, encode, RscriptsPath):
time.sleep(0.2)
check_Rresult(parent, pid)
time.sleep(0.2)
check_Rresult(parent, pid)
- f
ile
=open(fileout,'rU')
- lcl=f
ile
.readlines()
- f
ile
.close()
+ f=open(fileout,'rU')
+ lcl=f.readlines()
+ f.close()
ListClasseOk=[line.replace('\n','').replace('"','') for line in lcl]
ListClasseOk.pop(0)
ListClasseOk=[line.replace('\n','').replace('"','') for line in lcl]
ListClasseOk.pop(0)
@@
-171,9
+167,9
@@
def RchdFunct(self,parent, rep_out, CLASSIF, encode, RscriptsPath):
txt += """
PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", col = TRUE, what='crl')
""" % (rep_out['AFC2DCoulCl'])
txt += """
PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", col = TRUE, what='crl')
""" % (rep_out['AFC2DCoulCl'])
- f
ile
=open(Rtmp,'w')
- f
ile
.write(txt)
- f
ile
.close()
+ f=open(Rtmp,'w')
+ f.write(txt)
+ f.close()
pid = exec_rcode(parent.RPath, Rtmp, wait = False)
while pid.poll() == None :
time.sleep(0.2)
pid = exec_rcode(parent.RPath, Rtmp, wait = False)
while pid.poll() == None :
time.sleep(0.2)