X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=1ce343d59d381e3f3a2d781593ae370c6bfc6cdb;hp=0abc480145b5a5518dba9bc3b92dcb1968faf470;hb=e1096f8c3931cb999117c3a7eab4cee9f9224a1b;hpb=e6c5f5e94867e9af48a3acd780e61f87ec5f55c8 diff --git a/iramuteq.py b/iramuteq.py index 0abc480..1ce343d 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- #Author: Pierre Ratinaud #Copyright (c) 2008-2012, Pierre Ratinaud -#Lisense: GNU GPL +#License: GNU GPL from optparse import OptionParser @@ -13,7 +13,6 @@ parser.add_option("-f", "--file", dest="filename", #print args #print options - import sys reload(sys) import locale @@ -29,18 +28,16 @@ import logging #------------------------------------ import wx #import wx.aui -#import wx.lib.agw.aui as aui -import agw.aui as aui +import wx.lib.agw.aui as aui import wx.html import wx.grid import wx.lib.hyperlink as hl -#from wx.lib.wordwrap import wordwrap #------------------------------------ from functions import BugReport, PlaySound, ReadLexique, History, DoConf, ReadDicoAsDico, progressbar from checkversion import NewVersion from guifunct import * from tableau import Tableau -from dialog import PrefDialog, EncodeDialog, CorpusPref +from dialog import PrefDialog, CorpusPref from tabfrequence import Frequences from tabchi2 import ChiSquare #from tabstudent import MakeStudent @@ -49,23 +46,25 @@ from tabafcm import DoAFCM from tabchdalc import AnalyseQuest from tabsimi import DoSimi from tabrsimple import InputText -from tabverges import Verges +from tabverges import Prototypical +from tabsplitvar import SplitMatrixFromVar #from textafcuci import AfcUci -#from textchdalc import AnalyseAlceste -from analysetxt import Alceste -from textdist import PamTxt +from textdist import AnalysePam from textstat import Stat from textaslexico import Lexico -from textsimi import SimiTxt -from textwordcloud import WordCloud -from profile_segment import ProfileSegment -from textcheckcorpus import checkcorpus +from textsimi import SimiTxt, SimiFromCluster +from textwordcloud import WordCloud, ClusterCloud +from textreinert import Reinert +#from profile_segment import ProfileSegment +#from textcheckcorpus import checkcorpus from openanalyse import OpenAnalyse -from corpusNG import BuildFromAlceste, Builder -from sheet import MySheet -from checkinstall import CreateIraDirectory, CheckRPath, FindRPAthWin32, FindRPathNix, CheckRapp, CheckRPackages, IsNew, UpgradeConf, CopyConf, RLibsAreInstalled -from chemins import ConstructRscriptsPath, ConstructConfigPath, ConstructDicoPath, ConstructGlobalPath, PathOut +from corpus import Builder, SubBuilder +#from sheet import MySheet +from checkinstall import CreateIraDirectory, CheckRPath, FindRPAthWin32, FindRPathNix, CheckRPackages, IsNew, UpgradeConf, CopyConf, RLibsAreInstalled +from chemins import RscriptsPath, ConstructConfigPath, ConstructDicoPath, ConstructGlobalPath, PathOut from parse_factiva_xml import ImportFactiva +from tools import Extract + from tree import LeftTree ########################################################## ID_OpenData = wx.NewId() @@ -76,11 +75,11 @@ ID_Freq = wx.NewId() ID_Chi2 = wx.NewId() ID_Student = wx.NewId() ID_CHDSIM = wx.NewId() -ID_CHDAlceste = wx.NewId() +ID_CHDReinert = wx.NewId() ID_TEXTAFCM = wx.NewId() ID_TEXTSTAT = wx.NewId() ID_ASLEX = wx.NewId() -ID_TEXTALCESTE = wx.NewId() +ID_TEXTREINERT = wx.NewId() ID_TEXTPAM = wx.NewId() ID_CHECKCORPUS = wx.NewId() ID_Tabcontent = wx.NewId() @@ -94,17 +93,19 @@ ID_RESULT = wx.NewId() ID_VIEWDATA = wx.NewId() ID_HTMLcontent = wx.NewId() ID_SimiTxt = wx.NewId() +ID_proto = wx.NewId() +ID_ImportTXM = wx.NewId() ########################################################## #elements de configuration ########################################################## #encodage if sys.platform == 'darwin' : - sys.setdefaultencoding('utf-8') - wx.SetDefaultPyEncoding('utf-8') + sys.setdefaultencoding('UTF-8') + wx.SetDefaultPyEncoding('UTF-8') else : sys.setdefaultencoding(locale.getpreferredencoding()) -#chemin de l'application +#chemin de l'application AppliPath = os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0]))) #chemin des images ImagePath = os.path.join(AppliPath, 'images') @@ -112,34 +113,55 @@ ImagePath = os.path.join(AppliPath, 'images') DictConfigPath = ConstructGlobalPath(AppliPath) ConfigGlob = ConfigParser() ConfigGlob.read(DictConfigPath['global']) +DefaultConf = ConfigParser() +DefaultConf.read(DictConfigPath['preferences']) #repertoire de l'utilisateur if os.getenv('HOME') != None: user_home = os.getenv('HOME') else: user_home = os.getenv('HOMEPATH') UserConfigPath = os.path.abspath(os.path.join(user_home, '.iramuteq')) -#Si pas de fichiers de config utilisateur, on crée le repertoire +#Si pas de fichiers de config utilisateur, on cree le repertoire CreateIraDirectory(UserConfigPath, AppliPath) #fichiers log pour windows (py2exe) -print 'PLUS DE LOG !!!!!!!!!!' -print 'LOGGING TEST' log = logging.getLogger('iramuteq') fh = logging.FileHandler(os.path.join(UserConfigPath,'stdout.log')) -ch = logging.StreamHandler() -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') -ch.setFormatter(formatter) +formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -log.addHandler(ch) log.addHandler(fh) +if sys.platform != 'win32' and sys.platform != 'darwin': + ch = logging.StreamHandler() + ch.setFormatter(formatter) + log.addHandler(ch) log.setLevel(logging.INFO) -#debug = False -#if not debug : -# if sys.platform == 'win32' or sys.platform == 'darwin': -# sys.stdout = open(os.path.join(UserConfigPath,'stdout.log'), 'w') -# sys.stderr = open(os.path.join(UserConfigPath,'stderr.log'), 'w') -#chemin des fichiers de configuration utilisateur -#print sys.argv[0] + +class writer(object): + def write(self, data): + if data.strip() != '' : + log.info('ERROR : %s' % data) + +class printer(object) : + def write(self, data) : + if data.strip() != '' : + log.info('Print : %s' % data) + +sys.stderr = writer() +sys.stdout = printer() + ConfigPath = ConstructConfigPath(UserConfigPath) + +langues = {'french' : wx.LANGUAGE_FRENCH, + '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): @@ -153,20 +175,27 @@ class IraFrame(wx.Frame): self.AppliPath = AppliPath self.images_path = os.path.join(AppliPath,'images') self.UserConfigPath = UserConfigPath - self.RscriptsPath = ConstructRscriptsPath(AppliPath) - self.DictPath = ConstructDicoPath(AppliPath) + #self.RscriptsPath = ConstructRscriptsPath(AppliPath) + self.RscriptsPath = PathOut(dirout=os.path.join(AppliPath, 'Rscripts')) + self.RscriptsPath.basefiles(RscriptsPath) + #self.DictPath = ConstructDicoPath(AppliPath) + self.DictPath = ConstructDicoPath(UserConfigPath) self.ConfigGlob = ConfigGlob self.ConfigPath = ConstructConfigPath(UserConfigPath) self.pref = RawConfigParser() + #workaround for import problem + self.SimiFromCluster = SimiFromCluster #langues - mylocale = wx.Locale(wx.LANGUAGE_FRENCH) - mylocale.AddCatalogLookupPathPrefix(os.path.join(AppliPath,'locale')) - mylocale.AddCatalog('iramuteq') - presLan_en = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['en']) - presLan_fr = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['fr_FR']) - presLan_fr.install() - - + gettext.install('iramuteq', os.path.join(AppliPath,'locale'), unicode=True) + #langues = ['fr_FR', 'en', 'pt_PT'] + #for l in langues : + # pass + self.preslangue = {} + for langue in code_langues : + self.preslangue[langue] = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=[code_langues[langue]]) + self.setlangue() + #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']) # tell FrameManager to manage this frame #self._mgr = wx.aui.AuiManager() self._mgr = aui.AuiManager() @@ -177,75 +206,103 @@ class IraFrame(wx.Frame): self.mb = wx.MenuBar() file_menu = wx.Menu() - item = wx.MenuItem(file_menu, ID_OpenData, _(u"Open a questionnaire"), _(u"Open a questionnaire")) + item = wx.MenuItem(file_menu, ID_OpenData, _(u"Open a matrix").decode('utf8'), _(u"Open a matrix").decode('utf8')) item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN)) file_menu.AppendItem(item) - item = wx.MenuItem(file_menu, ID_OpenText, u"Ouvrir texte", u"Ouvrir un corpus texte") + item = wx.MenuItem(file_menu, ID_OpenText, _(u"Open a text corpus").decode('utf8'), _(u"Open a text corpus").decode('utf8')) item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN)) file_menu.AppendItem(item) - item = wx.MenuItem(file_menu, ID_OnOpenAnalyse, u"Ouvrir une Analyse", "Ouvrir une Analyse") + item = wx.MenuItem(file_menu, ID_OnOpenAnalyse, _(u"Open an analysis").decode('utf8'), _(u"Open an analysis").decode('utf8')) item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN)) file_menu.AppendItem(item) - item1 = wx.MenuItem(file_menu, ID_Import, u"Importer un corpus factiva...", "Importer un corpus factiva...") - item1.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_TIP)) - file_menu.AppendItem(item1) - #item1.Enable(True) - - item = wx.MenuItem(file_menu, ID_SaveTab, u"Enregistrer l\'onglet sous...", u"Enregistrer l\'onglet sous ...") - item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_SAVE_AS)) - #item.Enable(False) + + menuFactiva = wx.Menu() + fact_from_xml = wx.MenuItem(menuFactiva, wx.ID_ANY, _(u"from xml").decode('utf8')) + fact_from_mail = wx.MenuItem(menuFactiva, wx.ID_ANY, _(u"from mail").decode('utf8')) + fact_from_txt = wx.MenuItem(menuFactiva, wx.ID_ANY, _(u"from copy/paste").decode('utf8')) + menuFactiva.AppendItem(fact_from_xml) + menuFactiva.AppendItem(fact_from_mail) + menuFactiva.AppendItem(fact_from_txt) + file_menu.AppendMenu(-1, _(u"Import from factiva").decode('utf8'), menuFactiva) + + item = wx.MenuItem(file_menu, ID_ImportTXM, _(u"Import from TXM").decode('utf8'), _(u"Import from TXM").decode('utf8')) + item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN)) file_menu.AppendItem(item) + + menuTools = wx.Menu() + splitvar = wx.MenuItem(menuTools, wx.ID_ANY, _(u"Split from variable").decode('utf8')) + extractmod = wx.MenuItem(menuTools, wx.ID_ANY, _(u"Extract mods").decode('utf8')) + extractthem = wx.MenuItem(menuTools, wx.ID_ANY, _(u"Extract thematics").decode('utf8')) + menuTools.AppendItem(splitvar) + menuTools.AppendItem(extractmod) + menuTools.AppendItem(extractthem) + self.ID_splitvar = splitvar.GetId() + self.ID_extractmod = extractmod.GetId() + self.ID_extractthem = extractthem.GetId() + file_menu.AppendMenu(-1, _(u"Tools").decode('utf8'), menuTools) + + + #item = wx.MenuItem(file_menu, ID_SaveTab, _(u"Save tab as...").decode('utf8'), _(u"Save tab as...").decode('utf8')) + #item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_SAVE_AS)) + #file_menu.AppendItem(item) - file_menu.Append(wx.ID_EXIT, u"Exit") + file_menu.Append(wx.ID_EXIT, _(u"Exit").decode('utf8')) edit_menu = wx.Menu() - edit_menu.Append(wx.ID_PREFERENCES, '', u'Préférences') + edit_menu.Append(wx.ID_PREFERENCES, '', _(u'Preferences').decode('utf8')) view_menu = wx.Menu() - view_menu.Append(ID_ACCEUIL, u"Page d'accueil") - view_menu.Append(ID_VIEWDATA, u"Afficher les données") - view_menu.Append(ID_RESULT, u'Afficher les résultats') + view_menu.Append(ID_ACCEUIL, _(u"Home page").decode('utf8')) + view_menu.Append(ID_VIEWDATA, _(u"Show data").decode('utf8')) + view_menu.Append(ID_RESULT, _(u'Show results').decode('utf8')) #view_menu.AppendSeparator() - - analyse_menu = wx.Menu() - analyse_menu.Append(ID_Freq, u"Fréquences") - analyse_menu.Append(ID_Chi2, u"Chi2") - #analyse_menu.Append(ID_Student, u"t de Student") + matrix_menu = wx.Menu() + matrix_menu.Append(ID_Freq, _(u"Frequencies").decode('utf8')) + matrix_menu.Append(ID_Chi2, _(u"Chi2").decode('utf8')) + #matrix_menu.Append(ID_Student, u"t de Student") menu_classif = wx.Menu() - menu_classif.Append(ID_CHDAlceste, u"Méthode Alceste") - menu_classif.Append(ID_CHDSIM, u"Par matrice des distances") - analyse_menu.AppendMenu(-1, u"Classification", menu_classif) - analyse_menu.Append(ID_AFCM, u"AFCM") - analyse_menu.Append(ID_SIMI, u"Analyse de similitudes") + menu_classif.Append(ID_CHDReinert, _(u"Reinert's Method").decode('utf8')) + #menu_classif.Append(ID_CHDSIM, u"Par matrice des distances") + matrix_menu.AppendMenu(-1, _(u"Clustering").decode('utf8'), menu_classif) + #matrix_menu.Append(ID_AFCM, u"AFCM") + matrix_menu.Append(ID_SIMI, _(u"Similarities Analysis").decode('utf8')) + matrix_menu.Append(ID_proto, _(u"Prototypical Analysis").decode('utf8')) ID_RCODE = wx.NewId() - analyse_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')) + #menu_splittab.AppendItem(splitvar) + #matrix_menu.AppendMenu(-1, _(u"Split matrix").decode('utf8'), menu_splittab) + self.matrix_menu = matrix_menu + text_menu = wx.Menu() - text_menu.Append(ID_CHECKCORPUS, u"Vérifier le corpus") - text_menu.Append(ID_TEXTSTAT, u"Statistiques textuelles") - text_menu.Append(ID_ASLEX, u"Spécificités et AFC") + #text_menu.Append(ID_CHECKCORPUS, u"Vérifier le corpus") + text_menu.Append(ID_TEXTSTAT, _(u"Statistics").decode('utf8')) + text_menu.Append(ID_ASLEX, _(u"Specificities and CA").decode('utf8')) #text_menu.Append(ID_TEXTAFCM, u"AFC sur UCI / Vocabulaire") menu_classiftxt = wx.Menu() - menu_classiftxt.Append(ID_TEXTALCESTE, u"Méthode Alceste") - menu_classiftxt.Append(ID_TEXTPAM, u"Par matrice des distances") - text_menu.AppendMenu(-1, u"Classification", menu_classiftxt) - text_menu.Append(ID_SimiTxt, u'Analyse de similitude') + menu_classiftxt.Append(ID_TEXTREINERT, _(u"Reinert's Method").decode('utf8')) + #menu_classiftxt.Append(ID_TEXTPAM, u"Par matrice des distances") + text_menu.AppendMenu(-1, _(u"Clustering").decode('utf8'), menu_classiftxt) + text_menu.Append(ID_SimiTxt, _(u"Similarities Analysis").decode('utf8')) ID_WC = wx.NewId() - text_menu.Append(ID_WC, u'Nuage de mots') + text_menu.Append(ID_WC, _(u"WordCloud").decode('utf8')) + self.text_menu = text_menu help_menu = wx.Menu() - help_menu.Append(wx.ID_ABOUT, u'À propos...') - help_menu.Append(wx.ID_HELP, u'Aide en ligne') + help_menu.Append(wx.ID_ABOUT, _(u"About...").decode('utf8')) + help_menu.Append(wx.ID_HELP, _(u"Online help...").decode('utf8')) - self.mb.Append(file_menu, _(u"File")) - self.mb.Append(edit_menu, _(u"Edition")) - self.mb.Append(view_menu, _(u"View")) - self.mb.Append(analyse_menu, _("Spreadsheet analysis")) - self.mb.Append(text_menu, _(u"Text analysis")) - self.mb.Append(help_menu, _(u"Help")) + self.mb.Append(file_menu, _(u"File").decode('utf8')) + self.mb.Append(edit_menu, _(u"Edition").decode('utf8')) + self.mb.Append(view_menu, _(u"View").decode('utf8')) + self.mb.Append(matrix_menu, _(u"Matrix analysis").decode('utf8')) + self.mb.Append(text_menu, _(u"Text analysis").decode('utf8')) + self.mb.Append(help_menu, _(u"Help").decode('utf8')) self.SetMenuBar(self.mb) #-------------------------------------------------------------------- @@ -281,12 +338,12 @@ class IraFrame(wx.Frame): # CenterPane()) self._mgr.AddPane(IntroPanel(self), aui.AuiPaneInfo().Name("Intro_Text"). CenterPane()) - if not os.path.exists(os.path.join(UserConfigPath, 'history.db')) : - with open(os.path.join(UserConfigPath, 'history.db'), 'w') as f : - f.write('') + #if not os.path.exists(os.path.join(UserConfigPath, 'history.db')) : + # with open(os.path.join(UserConfigPath, 'history.db'), 'w') as f : + # f.write('') self.history = History(os.path.join(UserConfigPath, 'history.db')) self.tree = LeftTree(self) - self._mgr.AddPane(self.tree, aui.AuiPaneInfo().Name("lefttree").Caption("Navigateur"). + self._mgr.AddPane(self.tree, aui.AuiPaneInfo().Name("lefttree").Caption(_(u"Navigator").decode('utf8')). Left().MinSize(wx.Size(200,500)).Layer(1).Position(1).CloseButton(False).MaximizeButton(True). MinimizeButton(True)) @@ -304,10 +361,9 @@ class IraFrame(wx.Frame): self._mgr.AddPane(self.nb, aui.AuiPaneInfo(). Name("Tab_content"). CenterPane()) - self.Sheet = MySheet(self) + #self._mgr.AddPane(self.Sheet, wx.aui.AuiPaneInfo().Name("Data").CenterPane()) - self._mgr.AddPane(self.Sheet, aui.AuiPaneInfo().Name("Data").CenterPane()) - #self.nb.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnCloseTab) + #self._mgr.AddPane(self.Sheet, aui.AuiPaneInfo().Name("Data").CenterPane()) self.nb.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnCloseTab) self.nb.Bind(aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.OnPageChanged) # add the toolbars to the manager @@ -335,28 +391,36 @@ class IraFrame(wx.Frame): self.Bind(wx.EVT_MENU, self.OnOpenData, id=ID_OpenData) self.Bind(wx.EVT_MENU, self.OnOpenText, id=ID_OpenText) self.Bind(wx.EVT_MENU, self.OnOpenAnalyse, id=ID_OnOpenAnalyse) - self.Bind(wx.EVT_MENU, self.import_factiva, id= ID_Import) + self.Bind(wx.EVT_MENU, self.import_factiva_xml, fact_from_xml) + self.Bind(wx.EVT_MENU, self.import_factiva_mail, fact_from_mail) + self.Bind(wx.EVT_MENU, self.import_factiva_txt, fact_from_txt) + self.Bind(wx.EVT_MENU, self.ExtractTools, splitvar) + self.Bind(wx.EVT_MENU, self.ExtractTools, extractmod) + self.Bind(wx.EVT_MENU, self.ExtractTools, extractthem) self.Bind(wx.EVT_MENU, self.OnFreq, id=ID_Freq) self.Bind(wx.EVT_MENU, self.OnChi2, id=ID_Chi2) self.Bind(wx.EVT_MENU, self.OnStudent, id=ID_Student) self.Bind(wx.EVT_MENU, self.OnCHDSIM, id=ID_CHDSIM) - self.Bind(wx.EVT_MENU, self.OnCHDAlceste, id=ID_CHDAlceste) + 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.OnCheckcorpus, id = ID_CHECKCORPUS) + #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) self.Bind(wx.EVT_MENU, self.OnTextSpec, id=ID_ASLEX) self.Bind(wx.EVT_MENU, self.OnTextAfcm, id=ID_TEXTAFCM) - self.Bind(wx.EVT_MENU, self.OnTextAlceste, id=ID_TEXTALCESTE) + self.Bind(wx.EVT_MENU, self.OnTextReinert, id=ID_TEXTREINERT) self.Bind(wx.EVT_MENU, self.OnPamSimple, id=ID_TEXTPAM) self.Bind(wx.EVT_MENU, self.OnSimiTxt, id=ID_SimiTxt) self.Bind(wx.EVT_MENU, self.OnWordCloud, id=ID_WC) - self.Bind(wx.EVT_MENU, self.OnSimi, id=ID_SIMI) + self.Bind(wx.EVT_MENU, self.OnSimiTab, id=ID_SIMI) self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT) - self.Bind(wx.EVT_MENU, self.OnSaveTabAs, id=ID_SaveTab) + #self.Bind(wx.EVT_MENU, self.OnSaveTabAs, id=ID_SaveTab) self.Bind(wx.EVT_MENU, self.OnAbout, id=wx.ID_ABOUT) self.Bind(wx.EVT_MENU, self.OnHelp, id=wx.ID_HELP) self.Bind(wx.EVT_MENU, self.OnPref, id=wx.ID_PREFERENCES) + self.Bind(wx.EVT_MENU, self.OnImportTXM, id=ID_ImportTXM) self.Bind(wx.EVT_CLOSE, self.OnClose) ################################################################## flags = self._mgr.GetAGWFlags() @@ -394,10 +458,27 @@ class IraFrame(wx.Frame): if self.SysEncoding == 'mac-roman' : self.SysEncoding = 'MacRoman' self.type = '' +##############################################################@ + self.DisEnSaveTabAs(False) + self.ShowMenu('view', False) + self.ShowMenu('matrix', False) + self.ShowMenu('text', False) + + self._mgr.Update() + + self.DataPop = False + self.DataTxt = False + self.Text = '' + + self.lexique = None + self.corpus = None + + def finish_init(self) : try : self.pref.read(self.ConfigPath['preferences']) if IsNew(self) : UpgradeConf(self) + self.pref.read(self.ConfigPath['preferences']) New = True else : CopyConf(self) @@ -406,6 +487,9 @@ class IraFrame(wx.Frame): UpgradeConf(self) self.pref.read(self.ConfigPath['preferences']) New = True + self.sound = self.pref.getboolean('iramuteq', 'sound') + self.check_update = self.pref.getboolean('iramuteq', 'checkupdate') + self.version = ConfigGlob.get('DEFAULT', 'version') #configuration des chemins de R self.PathPath = ConfigParser() self.PathPath.read(ConfigPath['path']) @@ -432,52 +516,52 @@ class IraFrame(wx.Frame): Le chemin de l'executable de R n'a pas été trouvé. Si R n'est pas installé, vous devez l'installer (http://www.r-project.org/). Si R n'est pas installé dans le répertoire par défaut -(C:\Program Files\R\R-2.x.x\R.exe sous windows ou /usr/bin/R sous linux ou Mac Os X) +(souvent C:\Program Files\R\R-2.x.x\R.exe sous windows ou /usr/bin/R sous linux ou Mac Os X) vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" dlg = wx.MessageDialog(self, msg, u"Problème de configuration", wx.OK | wx.NO_DEFAULT | wx.ICON_WARNING) dlg.CenterOnParent() if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]: - evt.Veto() - else : - print 'ok' - if sys.platform == 'darwin': - self.Rapp = self.PathPath.get('PATHS', 'rapp') - RappOk = CheckRapp(self.Rapp) - self.DataPop = False - self.DataTxt = False - self.Text = '' - self.sound = self.pref.getboolean('iramuteq', 'sound') - self.check_update = self.pref.getboolean('iramuteq', 'checkupdate') - self.version = ConfigGlob.get('DEFAULT', 'version') - self.lexique = None - self.corpus = None -##############################################################@ - self.DisEnSaveTabAs(False) - self.ShowMenu(_("View"), False) - self.ShowMenu(_("Spreadsheet analysis"), False) - self.ShowMenu(_("Text analysis"), False) - - self._mgr.Update() + pass + dlg.Destroy() + + def setlangue(self) : + self.pref.read(self.ConfigPath['preferences']) + try : + guilangue = self.pref.get('iramuteq', 'guilanguage') + except : + guilangue = DefaultConf.get('iramuteq', 'guilanguage') + self.preslangue.get(guilangue, 'english').install() def OnVerif(self, evt) : pack = CheckRPackages(self) if pack : - dlg = wx.MessageDialog(self, u"Installation OK", u"Installation", wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION) + dlg = wx.MessageDialog(self, u"Installation OK", u"Installation", wx.OK | wx.ICON_INFORMATION) dlg.CenterOnParent() if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]: - evt.Veto() + evt.Veto() - #FIXME marche pas sous mac ? def DisEnSaveTabAs(self, DISEN): #Disable SaveTabAs file_menu = self.mb.GetMenu(0) items = file_menu.GetMenuItems() - items[4].Enable(DISEN) + for item in items : + if item.GetId() == ID_SaveTab : + 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() #-------------------------------------------------------------------- @@ -485,64 +569,34 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" print 'onclose' with open(self.ConfigPath['path'], 'w') as f : self.PathPath.write(f) - if self.DictTab != {} : - savestates = [self.DictTab[item][0] for item in self.DictTab] - if False in savestates : - notsave = [item for item in self.DictTab if self.DictTab[item][0] == False] - msg = u""" - Certains résultats ne sont pas enregistrés. - Voulez-vous fermer quand même ?""" - dlg = wx.MessageDialog(self, msg, "Sauvegarde", - wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION) - dlg.CenterOnParent() - if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]: - event.Veto() - dlg.Destroy() - else: - dlg.Destroy() - for item in notsave : - for tmpfile in self.DictTab[item][1:] : - os.remove(tmpfile) - print 'remove : ' + tmpfile - self._mgr.UnInit() - del self._mgr - self.Destroy() - else : - self._mgr.UnInit() - del self._mgr - self.Destroy() - else : - self._mgr.UnInit() - del self._mgr - self.Destroy() - ##FIXME - #if sys.platform == 'win32' : - # os.system("taskkill /im iramuteq.exe /f") - # print 'meurtre de process' + self._mgr.UnInit() + del self._mgr + self.Destroy() def OnOpenData(self, event): inputname, self.input_path = OnOpen(self, "Data") if inputname: - self.filename = self.input_path[0] + #filename = self.input_path[0] self.tableau = Tableau(self,os.path.abspath(self.input_path[0])) - get_table_param(self, self.input_path[0]) - self.tableau.make_content() - self.tableau.show_tab() + val = get_table_param(self, self.input_path[0]) + if val == wx.ID_OK : + self.tableau.make_content() + OpenAnalyse(self, self.tableau.parametres) + self.tree.OnItemAppend(self.tableau.parametres) + #self.tableau.show_tab() 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") self.filename = self.input_path[0] if inputname: - self.OpenText() + self.OpenText() def OnViewData(self, event): - print self.type - print self.DataTxt if self.type == "Data": if not self.DataPop : self.Sheet.Populate(self.content) @@ -558,9 +612,21 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" self.DataPop = False self.ShowAPane(u"Text") self._mgr.Update() - + + def OnSubText(self, corpus, parametres = None): + if corpus is None : + corpus = self.tree.getcorpus() + builder = SubBuilder(self, corpus, parametres) + if builder.res == wx.ID_OK : + busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self) + wx.SafeYield() + corpus = builder.doanalyse() + self.history.add(corpus.parametres) + self.tree.OnItemAppend(corpus.parametres) + OpenAnalyse(self, corpus.parametres) + del busy + def OpenText(self): - #dial = EncodeDialog(self) dlg = wx.ProgressDialog("Ouverture...", "Veuillez patienter...", maximum=2, @@ -570,48 +636,26 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" builder = Builder(self, dlg) if builder.res == wx.ID_OK : - corpus = builder.doanalyse() - self.history.add(corpus.parametres) - self.tree.OnItemAppend(corpus.parametres) - OpenAnalyse(self, corpus.parametres) - #self.content = DoConf().totext(corpus.parametres) -# parametres = DoConf(os.path.join(UserConfigPath,'corpus.cfg')).getoptions('corpus') -# parametres['originalpath'] = self.filename -# -# parametres['pathout'] = PathOut(self.filename, 'corpus').dirout -# dial = CorpusPref(self, parametres) -# dial.CenterOnParent() -# dial.txtpath.SetLabel(self.filename) -# res = dial.ShowModal() -# parametres = dial.doparametres() -# print parametres -# ReadLexique(self, lang = parametres['lang']) -# self.expressions = ReadDicoAsDico(self.DictPath.get(parametres['lang'], 'french_exp')) -# corpus = BuildFromAlceste(self.filename, parametres, self.lexique, self.expressions).corpus - #self.corpus_encodage = dial.encodages[dial.list_encodages.GetSelection()][0] - #self.corpus_lang = dial.langues[dial.choice_dict.GetSelection()] - count = 1 - keepGoing = dlg.Update(count, u"Lecture du fichier") -# try : -# with codecs.open(self.filename, 'rU', self.corpus_encodage) as f: -# self.content = f.read() -# #self.content = self.content.replace('\r','\n') -# except UnicodeDecodeError : -# msg = u"Ce fichier ne semble pas être encodé en %s" % self.corpus_encodage -# dial = wx.MessageDialog(self, msg, u"Problème d'encodage", wx.OK | wx.NO_DEFAULT | wx.ICON_WARNING) -# dial.CenterOnParent() -# res = dial.ShowModal() -# dial.Destroy() -# self.OpenText() - self.ShowMenu(_("View")) - self.ShowMenu(_("Text analysis")) - self.ShowMenu(_(u"Spreadsheet analysis"), False) - self.type = "Texte" - self.DataTxt = False - self.Text = '' - count += 1 - keepGoing = dlg.Update(count, u"Chargement du dictionnaire") - dlg.Destroy() + try : + corpus = builder.doanalyse() + self.history.add(corpus.parametres) + self.tree.OnItemAppend(corpus.parametres) + OpenAnalyse(self, corpus.parametres) + except : + dlg.Destroy() + BugReport(self) + else : + count = 1 + keepGoing = dlg.Update(count, u"Lecture du fichier") + self.ShowMenu('view') + self.ShowMenu('text') + self.ShowMenu('matrix', False) + self.type = "Texte" + self.DataTxt = False + self.Text = '' + count += 1 + keepGoing = dlg.Update(count, u"Chargement du dictionnaire") + dlg.Destroy() #self.OnViewData(wx.EVT_BUTTON) def OnExit(self, event): @@ -634,7 +678,7 @@ Laboratoire LERASS REPERE """ info.WebSite = ("http://www.iramuteq.org", u"Site web IRaMuTeQ") - dev = ConfigGlob.get('DEFAULT', 'dev').split(';') + dev = ConfigGlob.get('DEFAULT', 'dev').decode('utf8').split(';') info.Developers = dev info.License = u"""Iramuteq est un logiciel libre ; vous pouvez le diffuser et/ou le modifier suivant les termes de la Licence Publique Générale GNU telle que publiée @@ -663,55 +707,34 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" parent = nobject.GetParent() if isinstance(parent, IraFrame) : npage = self.nb.GetPage(new) - self.tree.GiveFocus(uuid=npage.parametres['uuid']) + if 'parametres' in dir(npage) : + self.tree.GiveFocus(uuid=npage.parametres['uuid']) + if npage.parametres.get('matrix', False) : + self.ShowMenu('text', False) + self.ShowMenu('matrix', True) + elif npage.parametres.get('corpus', False) : + self.ShowMenu('text') + self.ShowMenu('matrix', False) def OnCloseTab(self, evt): - log.info('Closing tab %s' % str(evt.GetEventObject())) + #log.info('Closing tab %s' % str(evt.GetEventObject())) ctrl = evt.GetEventObject() if isinstance(ctrl.GetParent(), aui.AuiNotebook) or isinstance(ctrl.GetParent(), wx.Panel): notebook = True else : notebook = False page = self.nb.GetPage(self.nb.GetSelection()) - if 'parametres' in dir(page) : + if 'parametres' in dir(page) and isinstance(ctrl.GetParent(), IraFrame) : self.history.rmtab(page.parametres) self.tree.CloseItem(uuid = page.parametres['uuid']) TabTitle = self.nb.GetPageText(self.nb.GetSelection()) - if self.DictTab != {} : - if TabTitle in self.DictTab : - ListFile=self.DictTab[TabTitle] - if False in ListFile: - msg = u""" -Certains résultats ne sont pas enregistrer. -Voulez-vous fermer quand même ?""" - dlg = wx.MessageDialog(self, msg, "Sauvegarde",wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION) - - dlg.CenterOnParent() - if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]: - remove = False - evt.Veto() - dlg.Destroy() - else : - for f in ListFile[1:] : - print 'remove', f - os.remove(f) - remove = True - dlg.Destroy() - elif True in ListFile : - remove = True - if remove: - del self.DictTab[TabTitle] - else : - self.LastTabClose() - else : - remove = True - if self.nb.GetPageCount() == 1 and remove and not notebook : - self.LastTabClose() + if self.nb.GetPageCount() == 1 and not notebook : + self.LastTabClose() def LastTabClose(self) : if self.nb.GetPageCount() == 1 : - self.DisEnSaveTabAs(False) + #self.DisEnSaveTabAs(False) if self.DataTxt : self.ShowAPane("Text") elif self.DataPop : @@ -719,40 +742,6 @@ Voulez-vous fermer quand même ?""" else : self.ShowAPane("Intro_Text") - def OnSaveTabAs(self, event): - SelectTab = self.nb.GetSelection() - TabTitle = self.nb.GetPageText(SelectTab) - FileToSave = self.DictTab[TabTitle] - NewListFile = [] - dlg = wx.FileDialog( - self, message="Enregistrer sous...", defaultDir=os.getcwd(), - defaultFile="resultat.html", wildcard="Tous les fichiers|*", style=wx.SAVE | wx.OVERWRITE_PROMPT - ) - dlg.SetFilterIndex(2) - dlg.CenterOnParent() - - if dlg.ShowModal() == wx.ID_OK: - Path = dlg.GetPath() - Dirname = os.path.dirname(Path) - Filename = dlg.GetFilename() - else : - Path = False - dlg.Destroy() - if Path: - shutil.copyfile(FileToSave[-1], Path) - os.remove(FileToSave[len(FileToSave) - 1]) - NewListFile.append(True) - NewListFile.append(Path) - for f in FileToSave[1:-1] : - Fileout = os.path.join(Dirname, os.path.basename(f)) - shutil.copyfile(f, Fileout) - NewListFile.append(Fileout) - os.remove(f) - TabText = Filename - self.DictTab[TabText] = NewListFile - del self.DictTab[TabTitle] - self.nb.SetPageText(SelectTab, TabText) - def GetStartPosition(self): self.x = self.x + 20 @@ -771,21 +760,6 @@ Voulez-vous fermer quand même ?""" def OnAcceuil(self, event): self.ShowAPane(u"Intro_Text") event.Skip() - #??? -# def OnCreateTab(self, event): -# if not self._mgr.GetPane("Tab_content").name == "Tab_content": -# self._mgr.AddPane(self.CreateTabCtrl(), aui.AuiPaneInfo(). -# Name("Tab_content"). -# CenterPane()) -# self._mgr.GetPane("Intro_Text").Hide() -# self._mgr.GetPane("Tab_content").Show() -# self.ctrl.Bind(aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.OnCloseTab) -# else : -# page = wx.TextCtrl(self, -1, str(text), style=wx.TE_MULTILINE) -# self.ctrl.AddPage(page, "qsdqsd") -# self.ctrl.SetSelection(self.ctrl.GetPageCount() - 1) -# self._mgr.Update() - def CreateHTMLCtrl(self): ctrl = wx.html.HtmlWindow(self, -1, wx.DefaultPosition, wx.Size(400, 300)) @@ -800,20 +774,34 @@ Voulez-vous fermer quand même ?""" ################################################################ #debut des analyses ################################################################ - - def OnFreq(self, event): - try: - Frequences(self) + 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 : + #print 'plus de bug@@@@@@@@@@@@@@@@@@@@@@' + analyse(self, matrix, parametres = parametres, dlg = dlgnb) except: - BugReport(self) + BugReport(self) + + def OnFreq(self, event, matrix = None): + self.analyse_matrix(Frequences, analyse_type = 'freq', matrix = matrix, dlgnb = 3) + + def OnChi2(self, event, matrix = None): + self.analyse_matrix(ChiSquare, matrix = matrix, analyse_type = 'chi2', dlgnb = 3) + + def OnSimiTab(self, event, matrix = None): + 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 = 3) + self.analyse_matrix(AnalyseQuest, matrix = matrix, analyse_type = 'reinertmatrix', dlgnb = 5) - def OnChi2(self, event): - try: - # print('PAS DE DEBUG SUR CHI2') - chi = ChiSquare(self) - except: - BugReport(self) - def OnStudent(self, event): try: MakeStudent(self) @@ -835,33 +823,49 @@ Voulez-vous fermer quand même ?""" except: BugReport(self) - def OnCHDAlceste(self, event): - try: - # print('PLUS DE BUG SUR ALCESTE QUESTIONNAIRE') - self.quest = AnalyseQuest(self) - if self.quest.val == wx.ID_OK: - PlaySound(self) - except: - BugReport(self) +# def OnCHDReinert(self, event): +# try: +# # print('PLUS DE BUG SUR ALCESTE QUESTIONNAIRE') +# self.quest = AnalyseQuest(self) +# if self.quest.val == wx.ID_OK: +# PlaySound(self) +# except: +# BugReport(self) + + def OnProto(self, evt, matrix = None) : + self.analyse_matrix(Prototypical, matrix = matrix, analyse_type = 'proto', dlgnb = 3) + #Prototypical(self, {'type' : 'proto'}) + + def OnSplitVar(self, evt, matrix = None): + self.analyse_matrix(SplitMatrixFromVar, matrix = matrix, analyse_type = 'splitvar', parametres = {'pathout': matrix.pathout.dirout}, dlgnb = 3) + matrix = self.tree.getmatrix() + - def OnSimiTxt(self, evt) : + def OnSimiTxt(self, evt, corpus = None) : # print 'PLUS DE BUG SUR SIMITXT' try : - self.Text = SimiTxt(self) + #self.Text = SimiTxt(self) + if corpus is None : + corpus = self.tree.getcorpus() + self.Text = SimiTxt(self, corpus, parametres = {'type': 'simitxt'}, dlg = 3) if self.Text.val == wx.ID_OK : PlaySound(self) except : BugReport(self) - def OnWordCloud(self, evt) : + def OnWordCloud(self, evt, corpus = None) : # print 'PLUS DE BUG SUR WORDCLOUD' try : - self.Text = WordCloud(self) + if corpus is None : + corpus = self.tree.getcorpus() + self.Text = WordCloud(self, corpus, parametres = {'type' : 'wordcloud'}, dlg = 3) if self.Text.val == wx.ID_OK : PlaySound(self) except : BugReport(self) + def OnClusterCloud(self, corpus, parametres = None) : + self.Text = ClusterCloud(self, corpus, parametres = parametres, dlg = 3) def OnAFCM(self, event): try: @@ -869,31 +873,29 @@ Voulez-vous fermer quand même ?""" except: BugReport(self) - def OnCheckcorpus(self, evt): - try : - checkcorpus(self) - except : - BugReport(self) - def OnTextStat(self, event, corpus = None): - print 'PAS DE BUG SUR TEXT STAT' - #try: - self.Text = Stat(self, corpus, parametres = {'type': 'stat'}, dlg = progressbar(self, 7)) + #print 'PAS DE BUG SUR TEXT STAT' + try: + if corpus is None : + corpus = self.tree.getcorpus() + self.Text = Stat(self, corpus, parametres = {'type': 'stat'}, dlg = 7) if self.Text.val == wx.ID_OK : PlaySound(self) - #except: - # BugReport(self) + except: + BugReport(self) def OnTextSpec(self, event, corpus = None): - #try: + try: #self.Text = AsLexico(self) - print('ATTENTION : PLUS DE BUG SUR LEXICO') - self.Text = Lexico(self, corpus, parametres = {'type' : 'spec'}, dlg = progressbar(self, 3)) + #print('ATTENTION : PLUS DE BUG SUR LEXICO') + if corpus is None : + corpus = self.tree.getcorpus() + self.Text = Lexico(self, corpus, parametres = {'type' : 'spec'}, dlg = 3) if self.Text.val == wx.ID_OK : PlaySound(self) - #except: - # BugReport(self) + except: + BugReport(self) def OnTextAfcm(self, event): try: @@ -902,41 +904,74 @@ Voulez-vous fermer quand même ?""" except: BugReport(self) - def import_factiva(self,event): + def import_factiva_xml(self,event): + try : + ImportFactiva(self, 'xml') + except : + BugReport(self) + + def import_factiva_mail(self, evt) : + try : + ImportFactiva(self, 'mail') + except : + BugReport(self) + + def import_factiva_txt(self, evt) : + try : + ImportFactiva(self, 'txt') + except : + BugReport(self) + + def OnImportTXM(self, evt) : try : - ImportFactiva(self) + ImportFactiva(self, 'txm') except : BugReport(self) - def OnTextAlceste(self, event, corpus = None): - #try: - print('ATTENTION : PLUS DE BUG SUR ALCESTE') + def ExtractTools(self, evt) : + ID = evt.GetId() + if ID == self.ID_splitvar : + Extract(self, 'splitvar') + elif ID == self.ID_extractmod : + Extract(self, 'mods') + elif ID == self.ID_extractthem : + Extract(self, 'them') + + def OnTextReinert(self, event, corpus = None): + try: + #print('ATTENTION : PLUS DE BUG SUR ALCESTE') #RunAnalyse(self, corpus, Alceste, OptAlceste) - self.Text = Alceste(self, corpus, parametres = {'type': 'alceste'}, dlg = progressbar(self,6)) - #self.history.addtab(self.Text.parametres) - #OpenAnalyse(self, self.Text.parametres['ira']) + if corpus is None : + corpus = self.tree.getcorpus() + self.Text = Reinert(self, corpus, parametres = {'type': 'alceste'}, dlg = 6) if self.Text.val == wx.ID_OK: PlaySound(self) - #except: - # BugReport(self) + except: + BugReport(self) - def OnPamSimple(self, event): + def OnPamSimple(self, event, corpus = None): try: - self.Text = PamTxt(self) + if corpus is None : + corpus = self.tree.getcorpus() + self.Text = AnalysePam(self, corpus, parametres = {'type' : 'pamtxt'}, dlg = 6) if self.Text.val == wx.ID_OK: PlaySound(self) except: BugReport(self) + + def SimiCluster(self, parametres = {}, fromprof = False, pathout = '', listactives = [], actives = [], tableau = None) : + DoSimi(self, param = parametres, fromprof = fromprof, listactives = listactives, actives = actives, tableau = tableau) - def OnSimi(self,evt): - try : +# def OnSimi(self,evt): +# try : #print 'ATTENTION !!!! VERGES' - self.res = DoSimi(self, param = None) + #print 'PLUS DE BUG SUR SIMI' +# self.res = DoSimi(self, param = None) #self.res = Verges(self) - if self.res.val == wx.ID_OK : - PlaySound(self) - except : - BugReport(self) +# if self.res.val == wx.ID_OK : +# PlaySound(self) +# except : +# BugReport(self) ################################################################# def OnHelp(self, event): @@ -972,9 +1007,14 @@ Voulez-vous fermer quand même ?""" if truepath : if os.path.splitext(self.filename)[1] in ['.csv', '.xls', '.ods']: self.tableau = Tableau(self, self.filename) - get_table_param(self, self.filename) - self.tableau.make_content() - self.tableau.show_tab() + val = get_table_param(self, self.filename) + if val == wx.ID_OK : + self.tableau.make_content() + OpenAnalyse(self, self.tableau.parametres) + self.tree.OnItemAppend(self.tableau.parametres) + #get_table_param(self, self.filename) + #self.tableau.make_content() + #self.tableau.show_tab() #open_data(self, self.filename) elif os.path.splitext(self.filename)[1] == '.txt': self.OpenText() @@ -990,9 +1030,11 @@ Voulez-vous fermer quand même ?""" class IntroPanel(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) - #col = randint(0, 100) - col = 0 - bckgrdcolor = wx.Colour(col, col, col) + col = randint(0, 255) + col1 = randint(0,255) + col2 = randint(0,255) + col = 57 + bckgrdcolor = wx.Colour(col, col1, col2) self.SetBackgroundColour(bckgrdcolor) txtcolour = wx.Colour(250, 250, 250) linkcolor = wx.Colour(255, 0, 0) @@ -1034,7 +1076,7 @@ class IntroPanel(wx.Panel): self.hyper_lerass.UpdateLink() blank = wx.StaticText(PanelPres, -1, u'\n') blank1 = wx.StaticText(PanelPres, -1, u'\n') - labellicence = wx.StaticText(PanelPres, -1, u'Licence GNU GPL') + labellicence = wx.StaticText(PanelPres, -1, _(u"License GNU GPL").decode('utf8')) labellicence.SetForegroundColour(txtcolour) labellicence.SetBackgroundColour(bckgrdcolor) labelcopy = wx.StaticText(PanelPres, -1, ConfigGlob.get('DEFAULT', 'copyright')) @@ -1095,9 +1137,9 @@ class MySplashScreen(wx.SplashScreen): bmp = wx.Image(os.path.join(ImagePath, 'splash.png')).ConvertToBitmap() wx.SplashScreen.__init__(self, bmp, wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT, - 3000, None, -1) + 2000, None, -1) self.Bind(wx.EVT_CLOSE, self.OnClose) - self.fc = wx.FutureCall(1500, self.ShowMain) + self.fc = wx.FutureCall(1, self.ShowMain) def OnClose(self, evt): evt.Skip() @@ -1108,8 +1150,12 @@ class MySplashScreen(wx.SplashScreen): self.ShowMain() def ShowMain(self): - frame = IraFrame(None, -1, "IRaMuTeQ " + ConfigGlob.get('DEFAULT', 'version'), size=(950, 650)) + displaySize = wx.DisplaySize() + w = displaySize[0]/1.2 + h = displaySize[1]/1.2 + frame = IraFrame(None, -1, "IRaMuTeQ " + ConfigGlob.get('DEFAULT', 'version'), size=(w, h)) frame.Show() + frame.finish_init() frame.Upgrade() frame.OnOpenFromCmdl() # if self.fc.IsRunning(): @@ -1122,7 +1168,6 @@ class MyApp(wx.App): Create and show the splash screen. It will then create and show the main frame when it is time to do so. """ - wx.SystemOptions.SetOptionInt("mac.window-plain-transition", 1) self.SetAppName("Iramuteq") splash = MySplashScreen()