else :
self.val = False
if self.dlg is not None :
- self.dlg.Destroy()
+ try :
+ self.dlg.Destroy()
+ except :
+ pass
def doanalyse(self) :
pass
author = Pierre Ratinaud
gpl-fr = gpl-2.0-fr.txt
dev = Pierre Ratinaud (Université de Toulouse - Laboratoire LERASS - ratinaud@univ-tlse2.fr);Sébastien Déjean (Université de Toulouse);David Skalinder (Mash Strategy - davids@mash.uk.com);
-version = 0.6 alpha 14
+version = 0.7 alpha 1
licence = GNU GPL (v2)
-version_nb = 0.6.a14
\ No newline at end of file
+version_nb = 0.7.a1
\ No newline at end of file
guilanguage=french
R_mem = false
R_max_mem = 1535
-version_nb = 0.6.a14
+version_nb = 0.7.a1
rlibs = false
libsvdc = false
libsvdc_path = /usr/bin/svd
def progressbar(self, maxi) :
- if 'parent' in dir(self) :
- parent = self.parent
- else :
- parent = self
+ ira = wx.GetApp().GetTopWindow()
+ parent = ira
try :
maxi = int(maxi)
except :
maxi = 1
- return wx.ProgressDialog("Traitements",
+ prog = wx.ProgressDialog("Traitements",
"Veuillez patienter...",
maximum=maxi,
parent=parent,
style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT
)
+ prog.SetIcon(ira._icon)
+ prog.SetSize((400,150))
+ return prog
def treat_var_mod(variables) :
self.m_staticline40 = wx.StaticLine( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
fgSizer3.Add( self.m_staticline40, 0, wx.EXPAND |wx.ALL, 5 )
- self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved"), wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText321.Wrap( -1 )
fgSizer3.Add( self.m_staticText321, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="2837"
- inkscape:window-height="1776"
- inkscape:window-x="43"
- inkscape:window-y="24"
+ inkscape:window-width="2878"
+ inkscape:window-height="1778"
+ inkscape:window-x="0"
+ inkscape:window-y="20"
inkscape:window-maximized="1"
showguides="true"
inkscape:guide-bbox="true">
x="110.10663"
y="146.45171"
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#1c1010;fill-opacity:1;font-family:gargi;-inkscape-font-specification:gargi Medium" /></flowRegion><flowPara
- id="flowPara3866">Version 0.6 alpha 14</flowPara></flowRoot> <flowRoot
+ id="flowPara3866">Version 0.7 alpha 1</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot3868"
style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:40px;line-height:125%;letter-spacing:0px;word-spacing:0px"
matrix_menu.Append(ID_SIMI, _(u"Similarities Analysis").decode('utf8'))
matrix_menu.Append(ID_proto, _(u"Prototypical Analysis").decode('utf8'))
ID_RCODE = wx.NewId()
- matrix_menu.Append(ID_RCODE, u"Code R...")
+ #matrix_menu.Append(ID_RCODE, u"Code R...")
#menu_splittab = wx.Menu()
#ID_SPLITVAR = wx.NewId()
#splitvar = wx.MenuItem(menu_splittab, ID_SPLITVAR, _(u"Split from variable").decode('utf8'))
self.Bind(wx.EVT_MENU, self.OnCHDReinert, id=ID_CHDReinert)
self.Bind(wx.EVT_MENU, self.OnAFCM, id=ID_AFCM)
self.Bind(wx.EVT_MENU, self.OnProto, id=ID_proto)
- self.Bind(wx.EVT_MENU, self.OnRCode, id=ID_RCODE)
+ #self.Bind(wx.EVT_MENU, self.OnRCode, id=ID_RCODE)
#self.Bind(wx.EVT_MENU, self.OnSplitVar, id=ID_SPLITVAR)
#self.Bind(wx.EVT_MENU, self.OnCheckcorpus, id = ID_CHECKCORPUS)
self.Bind(wx.EVT_MENU, self.OnTextStat, id=ID_TEXTSTAT)
while pid.poll() == None :
self.dlg.Pulse(u"Analyse (patientez...)")
time.sleep(0.2)
- check_Rresult(self.parent, pid)
+ if not check_Rresult(self.parent, pid) :
+ if self.dlg :
+ self.dlg.Destroy()
+ return 'NOK'
#------------------------------------------------------------
count += 1
self.dlg.Update(count, u"Ecriture des résultats")