From d1b223a99ac6d9a3240c2129c798793818db6cfc Mon Sep 17 00:00:00 2001 From: Pierre Ratinaud Date: Thu, 4 Dec 2014 22:52:08 +0100 Subject: [PATCH] ... --- analysematrix.py | 5 ++++- iramuteq.py | 4 ++-- tabchdalc.py | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/analysematrix.py b/analysematrix.py index 7e3c93f..5daf6ae 100644 --- a/analysematrix.py +++ b/analysematrix.py @@ -65,7 +65,10 @@ class AnalyseMatrix : else : self.val = False if self.dlg is not None : - self.dlg.Destroy() + try : + self.dlg.Destroy() + except : + pass def doanalyse(self) : pass diff --git a/iramuteq.py b/iramuteq.py index 8896308..9618316 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -268,7 +268,7 @@ class IraFrame(wx.Frame): 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')) @@ -402,7 +402,7 @@ class IraFrame(wx.Frame): 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) diff --git a/tabchdalc.py b/tabchdalc.py index ce05833..b1cff3c 100644 --- a/tabchdalc.py +++ b/tabchdalc.py @@ -101,7 +101,10 @@ class AnalyseQuest(AnalyseMatrix): 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") -- 2.7.4