X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=8629d6c523a331a3dcab941c2c5cb7f0b8964192;hp=1aee2726228d25009d2406c94a6ef6f41590a31b;hb=55844beeefa19c328eae726d6a9137c2ac6be53c;hpb=54d801be487adf479497f03b1ad4557863093f88 diff --git a/iramuteq.py b/iramuteq.py index 1aee272..8629d6c 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -149,7 +149,17 @@ sys.stdout = printer() ConfigPath = ConstructConfigPath(UserConfigPath) langues = {'french' : wx.LANGUAGE_FRENCH, - 'english' : wx.LANGUAGE_ENGLISH,} + 'english' : wx.LANGUAGE_ENGLISH, + 'portuguese' : wx.LANGUAGE_PORTUGUESE, + 'italian' : wx.LANGUAGE_ITALIAN, + 'spanish' : wx.LANGUAGE_SPANISH} + +code_langues = {'french' : 'fr_FR', + 'english' : 'en', + 'portuguese' : 'pt_PT', + 'italian' : 'it_IT', + 'spanish' : 'es_ES' + } ##################################################################### class IraFrame(wx.Frame): @@ -178,8 +188,12 @@ class IraFrame(wx.Frame): #langues = ['fr_FR', 'en', 'pt_PT'] #for l in langues : # pass - self.presLan_fr = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['fr_FR']) - self.presLan_en = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['en']) + self.preslangue = {} + for langue in code_langues : + self.preslangue[langue] = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=[code_langues[langue]]) + + #self.presLan_fr = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['fr_FR']) + #self.presLan_en = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['en']) self.setlangue() # tell FrameManager to manage this frame #self._mgr = wx.aui.AuiManager() @@ -445,9 +459,9 @@ class IraFrame(wx.Frame): ##############################################################@ self.DisEnSaveTabAs(False) - self.ShowMenu(_("View").decode('utf8'), False) - self.ShowMenu(_("Matrix analysis").decode('utf8'), False) - self.ShowMenu(_("Text analysis").decode('utf8'), False) + self.ShowMenu('view', False) + self.ShowMenu('matrix', False) + self.ShowMenu('text', False) self._mgr.Update() @@ -509,26 +523,10 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" pass dlg.Destroy() - def setlangue(self) : - try : - self.pref.read(self.ConfigPath['preferences']) - guilangue = self.pref.get('iramuteq', 'guilanguage') - if guilangue == 'french' : - self.presLan_fr.install() - elif guilangue == 'portuguese' : - self.presLan_pt.install() - else : - self.presLan_en.install() - mylocale = wx.Locale(langues[guilangue]) - mylocale.AddCatalogLookupPathPrefix(os.path.join(AppliPath,'locale')) - mylocale.AddCatalog('iramuteq') - except : - self.presLan_fr.install() - mylocale = wx.Locale(langues['french']) - mylocale.AddCatalogLookupPathPrefix(os.path.join(AppliPath,'locale')) - mylocale.AddCatalog('iramuteq') - + self.pref.read(self.ConfigPath['preferences']) + guilangue = self.pref.get('iramuteq', 'guilanguage') + self.preslangue.get(guilangue, 'english').install() def OnVerif(self, evt) : pack = CheckRPackages(self) @@ -547,9 +545,19 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" item.Enable(DISEN) def ShowMenu(self, menu, Show=True): - menu_pos = self.mb.FindMenu(menu) - self.mb.EnableTop(menu_pos, Show) - self.mb.UpdateMenus() + if menu == 'text' : + menu_pos = 4 + elif menu == 'matrix' : + menu_pos = 3 + elif menu == 'view' : + menu_pos = 2 + else : + menu_pos = None + + #menu_pos = self.mb.FindMenu(menu) + if not menu_pos is None : + self.mb.EnableTop(menu_pos, Show) + self.mb.UpdateMenus() #-------------------------------------------------------------------- @@ -576,7 +584,7 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" def OnOpenAnalyse(self, event): self.AnalysePath = OnOpen(self, "Analyse") OpenAnalyse(self, self.AnalysePath[1][0], True) - self.ShowMenu(_("View")) + self.ShowMenu('view') def OnOpenText(self, event): inputname, self.input_path = OnOpen(self, "Texte") @@ -636,9 +644,9 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" else : count = 1 keepGoing = dlg.Update(count, u"Lecture du fichier") - self.ShowMenu(_(u"View").decode('utf8')) - self.ShowMenu(_(u"Text analysis").decode('utf8')) - self.ShowMenu(_(u"Matrix analysis").decode('utf8'), False) + self.ShowMenu('view') + self.ShowMenu('text') + self.ShowMenu('matrix', False) self.type = "Texte" self.DataTxt = False self.Text = '' @@ -699,11 +707,11 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" if 'parametres' in dir(npage) : self.tree.GiveFocus(uuid=npage.parametres['uuid']) if npage.parametres.get('matrix', False) : - self.ShowMenu(_(u"Text analysis").decode('utf8'), False) - self.ShowMenu(_(u"Matrix analysis").decode('utf8'), True) + self.ShowMenu('text', False) + self.ShowMenu('matrix', True) elif npage.parametres.get('corpus', False) : - self.ShowMenu(_(u"Text analysis").decode('utf8')) - self.ShowMenu(_(u"Matrix analysis").decode('utf8'), False) + self.ShowMenu('text') + self.ShowMenu('matrix', False) def OnCloseTab(self, evt): #log.info('Closing tab %s' % str(evt.GetEventObject())) @@ -824,41 +832,33 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" ################################################################ #debut des analyses ################################################################ - def analyse_matrix(self, analyse, analyse_type = '', matrix = None, dlgnb = 1): + def analyse_matrix(self, analyse, analyse_type = '', matrix = None, parametres = None, dlgnb = 1): if matrix is None : matrix = self.tree.getmatrix() + if parametres is not None : + parametres['type'] = analyse_type + else : + parametres = {'type' : analyse_type} #try : - analyse(self, matrix, parametres = {'type' : analyse_type}, dlg = progressbar(self, dlgnb)) + print 'plus de bug@@@@@@@@@@@@@@@@@@@@@@' + analyse(self, matrix, parametres = parametres, dlg = dlgnb) #except: # BugReport(self) def OnFreq(self, event, matrix = None): self.analyse_matrix(Frequences, analyse_type = 'freq', matrix = matrix, dlgnb = 3) - #if matrix is None : - # matrix = self.tree.getmatrix() - #try: - # Frequences(self, matrix, parametres = {'type' : 'freq'}, dlg = progressbar(self, 3)) - #except: - # BugReport(self) def OnChi2(self, event, matrix = None): - #try: self.analyse_matrix(ChiSquare, matrix = matrix, analyse_type = 'chi2', dlgnb = 3) - #except: - # BugReport(self) def OnSimiTab(self, event, matrix = None): - if matrix is None : - matrix = self.tree.getmatrix() - try: - DoSimi(self, matrix, parametres = {'type' : 'simimatrix'}, dlg = progressbar(self, 3)) - except: - BugReport(self) + self.analyse_matrix(DoSimi, matrix = matrix, analyse_type = 'simimatrix', dlgnb = 5) def OnCHDReinert(self, event, matrix = None): - if matrix is None : - matrix = self.tree.getmatrix() - AnalyseQuest(self, matrix, parametres = {'type' : 'reinertmatrix'}, dlg = progressbar(self, 3)) + #if matrix is None : + # matrix = self.tree.getmatrix() + #AnalyseQuest(self, matrix, parametres = {'type' : 'reinertmatrix'}, dlg = 3) + self.analyse_matrix(AnalyseQuest, matrix = matrix, analyse_type = 'reinertmatrix', dlgnb = 5) def OnStudent(self, event): try: @@ -895,7 +895,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" #Prototypical(self, {'type' : 'proto'}) def OnSplitVar(self, evt, matrix = None): - self.analyse_matrix(SplitMatrixFromVar, matrix = matrix, analyse_type = 'splitvar', dlgnb = 3) + self.analyse_matrix(SplitMatrixFromVar, matrix = matrix, analyse_type = 'splitvar', parametres = {'pathout': matrix.pathout.dirout}, dlgnb = 3) matrix = self.tree.getmatrix()