from wx.lib.agw.fmresources import *
from chemins import ConstructPathOut, ChdTxtPathOut, FFF, ffr, PathOut, StatTxtPathOut, simipath
from ConfigParser import ConfigParser
-from functions import ReadProfileAsDico, GetTxtProfile, read_list_file, ReadList, exec_rcode, print_liste, BugReport, DoConf, indices_simi, check_Rresult, progressbar
+from functions import ReadProfileAsDico, GetTxtProfile, read_list_file, ReadList, exec_rcode, print_liste, BugReport, DoConf, indices_simi, check_Rresult, progressbar, normpath_win32, TGen
from ProfList import ProfListctrlPanel
from guiparam3d import param3d, simi3d
from PrintRScript import write_afc_graph, print_simi3d, PrintSimiScript
else :
svg = 1
typegraph = dial.choicetype.GetSelection()
- typefile = '.png'
+ if svg :
+ typefile = '.svg'
+ else :
+ typefile = '.png'
if self.clnb <= 3 and typegraph == 1 :
typegraph = 2
if typegraph == 2:
self.RscriptsPath = self.ira.RscriptsPath
txt = """
load("%s")
- """ % self.DictPathOut['RData']
+ """ % ffr(self.DictPathOut['RData'])
if self.itempath == 'liste_graph_afcf' :
txt += """
afc <- afcf
self.page = page
parametres = self.page.parametres
ira = wx.GetApp().GetTopWindow()
+ tgenpath = os.path.join(parametres['pathout'], 'tgen.csv')
self.page.tgens, etoiles = ReadList(parametres['tgenspec'], ira.syscoding, sep="\t")
+ tgen = TGen(path = tgenpath, encoding = parametres['encoding'])
+ tgen.read()
tgentab = False
+ gparent = None
for i in range(page.GetPageCount()) :
tab = page.GetPage(i)
+ if 'gparent' in dir(tab) :
+ if tab.gparent is not None :
+ gparent = tab.gparent
if 'tgen' in dir(tab) :
if tab.tgen :
tgentab = tab
break
if tgentab :
self.page.tgentab.RefreshData(self.page.tgens)
+ self.page.tgentab.tgens = tgen.tgen
self.page.SetSelection(i)
else :
- self.page.tgentab = ListForSpec(ira, None, self.page.tgens, etoiles[1:])
+ self.page.tgentab = ListForSpec(ira, gparent, self.page.tgens, etoiles[1:])
self.page.tgentab.tgen = True
+ self.page.tgentab.tgens = tgen.tgen
self.page.AddPage(self.page.tgentab, u'Tgens Specificities')
self.page.SetSelection(self.page.GetPageCount() - 1)
self.TabStat.parametres = parametres
self.ListPan = ListForSpec(ira, self, self.DictSpec, self.etoiles)
if os.path.exists(self.pathout['banalites.csv']) :
- self.listban = ListForSpec(ira, self, self.dictban, ['eff'] + self.etoiles)
+ self.listban = ListForSpec(ira, self, self.dictban, ['eff'] + self.etoiles, usefirst = True)
#self.ListPan2 = ListForSpec(sash.rightwin1, self, self.DictSpec, first)
self.ListPant = ListForSpec(ira, self, self.DictType, self.etoiles)
self.ListPanEff = ListForSpec(ira, self, self.DictEff, self.etoiles)
self.ListPanEffType = ListForSpec(ira, self, self.DictEffType, self.etoiles)
self.ListPanEffRelForme = ListForSpec(ira, self, self.DictEffRelForme, self.etoiles)
- self.ListPanEffRelType = ListForSpec(ira, self.parent, self.DictEffRelType, self.etoiles)
+ self.ListPanEffRelType = ListForSpec(ira, self, self.DictEffRelType, self.etoiles)
self.TabStat.AddPage(self.ListPan, u'formes')
if os.path.exists(self.pathout['banalites.csv']) :
self.TabAFC.AddPage(self.tabAFCTGraph, 'AFC type')
self.TabStat.AddPage(self.TabAFC, 'AFC')
-
-
-
-
ira.nb.AddPage(self.TabStat, u'Spécificités')
self.ira = ira
self.panel_1.SetBackgroundColour('white')
self.deb = wx.StaticText(self.panel_1, -1, txt)
dendro_img = wx.Image(os.path.join(self.ira.images_path,'but_dendro.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap()
+ dendro_liste_img = wx.Image(os.path.join(self.ira.images_path,'but_dendro_liste.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap()
+ dendro_cloud_img= wx.Image(os.path.join(self.ira.images_path,'but_dendro_cloud.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap()
self.butdendro = wx.BitmapButton(self, -1, dendro_img)
- self.butdendrotexte = wx.BitmapButton(self, -1, dendro_img)
- self.butdendrocloud = wx.BitmapButton(self, -1, dendro_img)
+ self.butdendrotexte = wx.BitmapButton(self, -1, dendro_liste_img)
+ self.butdendrocloud = wx.BitmapButton(self, -1, dendro_cloud_img)
for i in range(0,len(list_graph)):
if os.path.exists(os.path.join(self.dirout,list_graph[i][0])) :
- self.listimg.append(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(os.path.join(self.dirout,list_graph[i][0]), wx.BITMAP_TYPE_ANY)))
+ filename, ext = os.path.splitext(list_graph[i][0])
+ if ext == '.svg' :
+ self.listimg.append(hl.HyperLinkCtrl(self.panel_1, -1, os.path.join(self.dirout,list_graph[i][0]), URL=os.path.join(self.dirout,list_graph[i][0])))
+ else :
+ self.listimg.append(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(os.path.join(self.dirout,list_graph[i][0]), wx.BITMAP_TYPE_ANY)))
self.labels.append(wx.StaticText(self.panel_1, -1, list_graph[i][1]))
self.__set_properties()
'type_dendro': 0,
'color_nb': 0,
'taille_classe' : True,
- 'type_tclasse' : 0
+ 'type_tclasse' : 0,
+ 'svg' : 0
}
self.type_dendro = [ u"phylogram", u"cladogram", u"fan", u"unrooted", u"radial" ]
self.param['color_nb'] = dial.m_radioBox1.GetSelection()
self.param['taille_classe'] = dial.m_checkBox1.GetValue()
self.param['type_tclasse'] = dial.m_radioBox2.GetSelection()
+ self.param['svg'] = dial.choice_format.GetSelection()
def make_dendro(self, dendro = 'simple') :
- while os.path.exists(os.path.join(self.dirout, 'dendrogramme_' + str(self.graphnb)+'.png')) :
+ if self.param['svg'] :
+ typefile = '.svg'
+ else :
+ typefile = '.png'
+ while os.path.exists(os.path.join(self.dirout, 'dendrogramme_' + str(self.graphnb)+typefile)) :
self.graphnb += 1
- fileout = ffr(os.path.join(self.dirout,'dendrogramme_' + str(self.graphnb)+'.png'))
+ fileout = ffr(os.path.join(self.dirout,'dendrogramme_' + str(self.graphnb)+typefile))
width = self.param['width']
height = self.param['height']
type_dendro = self.type_dendro[self.param['type_dendro']]
histo='FALSE'
else :
histo = 'TRUE'
+ if self.param['svg'] :
+ svg = 'TRUE'
+ else :
+ svg = 'FALSE'
dendro_path = self.dictpathout['Rdendro']
classe_path = self.dictpathout['uce']
txt = """
txt += """
load("%s")
source("%s")
+ if (is.null(debsup)) {
+ debsup <- debet
+ }
chistable <- chistabletot[1:(debsup-1),]
- open_file_graph("%s", width=%i, height=%i)
+ open_file_graph("%s", width=%i, height=%i, svg = %s)
plot.dendro.prof(tree.cut1$tree.cl, classes, chistable, nbbycl = 60, type.dendro="%s", bw=%s, lab=NULL)
- """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, type_dendro, bw)
+ """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, svg, type_dendro, bw)
elif dendro == 'cloud' :
txt += """
load("%s")
source("%s")
+ if (is.null(debsup)) {
+ debsup <- debet
+ }
chistable <- chistabletot[1:(debsup-1),]
- open_file_graph("%s", width=%i, height=%i)
+ open_file_graph("%s", width=%i, height=%i, svg=%s)
plot.dendro.cloud(tree.cut1$tree.cl, classes, chistable, nbbycl = 300, type.dendro="%s", bw=%s, lab=NULL)
- """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, type_dendro, bw)
+ """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, svg, type_dendro, bw)
tmpfile = tempfile.mktemp()
with open(tmpfile, 'w') as f :
f.write(txt)
+ busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self.parent)
+ wx.SafeYield()
error = exec_rcode(self.ira.RPath, tmpfile, wait=True)
+ del busy
check_Rresult(self.ira, error)
self.list_graph.append([fileout, 'Dendrogramme CHD1 - %s' % type_dendro])
print_liste(self.dictpathout['liste_graph_chd'], self.list_graph)
- self.sizer_3.Add(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+ if self.param['svg'] :
+ self.sizer_3.Add(hl.HyperLinkCtrl(self.panel_1, -1, fileout, URL=fileout), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+ else :
+ self.sizer_3.Add(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
self.sizer_3.Add(wx.StaticText(self.panel_1,-1, 'Dendrogramme CHD1 - %s' % type_dendro), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
self.sizer_3.Fit(self.panel_1)
self.Layout()
ira.nb.AddPage(self.sheet, matrix.parametres['matrix_name'])
self.sheet.Populate(matrix.csvtable)
self.sheet.parametres = matrix.parametres
- #self.ira.ShowMenu(_(u"View").decode('utf8'))
- #self.ira.ShowMenu(_(u"Matrix analysis").decode('utf8'))
- #self.ira.ShowMenu(_(u"Text analysis").decode('utf8'), False)
- #self.parent.type = "Data"
- #self.parent.DataPop = False
ira.nb.SetSelection(ira.nb.GetPageCount() - 1)
ira.ShowAPane("Tab_content")
- #self.ira.OnViewData('')
-
-
-
class CopusPanel(wx.Panel) :
def __init__(self, parent, parametres) :
class FreqLayout(DefaultMatLayout) :
def dolayout(self) :
self.tab = wx.html.HtmlWindow(self.ira.nb, -1)
- if "gtk2" in wx.PlatformInfo:
- self.tab.SetStandardFonts()
- self.tab.LoadPage(self.pathout['resultats.html'].replace('\\\\','/'))
+ res = normpath_win32(self.pathout['resultats.html']).replace('\\','/')
+ self.tab.LoadPage(res)
self.tab.parametres = self.parametres
self.ira.nb.AddPage(self.tab, u"Fréquences")
self.tab = wx.html.HtmlWindow(self.ira.nb, -1)
if "gtk2" in wx.PlatformInfo:
self.tab.SetStandardFonts()
- self.tab.LoadPage(self.pathout['resultats-chi2.html'])
+ res = normpath_win32(self.pathout['resultats-chi2.html']).replace('\\','/')
+ self.tab.LoadPage(res)
self.tab.parametres = self.parametres
self.ira.nb.AddPage(self.tab, ' - '.join([u"Chi2", "%s" % self.parametres['name']]))
#self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)
fileout = filename + '.svg'
else :
fileout = self.script.filename
+ fileout = normpath_win32(fileout)
if os.path.exists(self.pathout['liste_graph']):
graph_simi = read_list_file(self.pathout['liste_graph'])
graph_simi.append([os.path.basename(fileout), self.script.txtgraph])
if self.parametres['svg'] :
self.graphpan.sizer_3.Add(hl.HyperLinkCtrl(self.graphpan.panel_1, -1, fileout, URL = fileout), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
else :
- self.graphpan.sizer_3.Add(wx.StaticBitmap(self.graphpan.panel_1, -1, wx.Bitmap(self.script.filename, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+ self.graphpan.sizer_3.Add(wx.StaticBitmap(self.graphpan.panel_1, -1, wx.Bitmap(fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
self.graphpan.sizer_3.Add(wx.StaticText(self.graphpan.panel_1,-1, self.script.txtgraph), 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
self.graphpan.sizer_3.Fit(self.graphpan.panel_1)
self.graphpan.Layout()