X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=ef99d2010dd211cec239cefe2b4b5c8555fe8b14;hp=1981df74de9754f54136100493df2aa1fb4f2db6;hb=11658a48940defe4f9b849e9e32606a646751388;hpb=9d4d25f0b1393ea8fc4e6c25874d082015b141d5 diff --git a/iramuteq.py b/iramuteq.py index 1981df7..ef99d20 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -56,7 +56,9 @@ from corpus import Builder, SubBuilder 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 parse_dmi import ImportDMI from tools import Extract +from analyse_merge import AnalyseMerge from tree import LeftTree ########################################################## @@ -97,6 +99,8 @@ ID_Fact_xml = wx.NewId() ID_Fact_mail = wx.NewId() ID_Fact_copy = wx.NewId() ID_exportmeta = wx.NewId() +ID_importdmi = wx.NewId() +ID_merge = wx.NewId() ########################################################## #elements de configuration ########################################################## @@ -118,10 +122,10 @@ 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') +user_home = os.getenv('HOME') +if user_home is None : + user_home = os.path.expanduser('~') + UserConfigPath = os.path.abspath(os.path.join(user_home, '.iramuteq')) #Si pas de fichiers de config utilisateur, on cree le repertoire CreateIraDirectory(UserConfigPath, AppliPath) @@ -195,6 +199,7 @@ images_analyses = { 'subcorpusthema' : 'subcorpusthema.png', 'preferences' : 'preferences.png', 'exportmetatable' : 'exportmetatable.png', + 'importdmi' : 'twitter.png' } ##################################################################### @@ -203,7 +208,8 @@ class IraFrame(wx.Frame): size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE | wx.SUNKEN_BORDER | wx.CLIP_CHILDREN): - log.info('Starting...') + log.info('Starting... ' ) + log.info('version : %s' % ConfigGlob.get('DEFAULT', 'version')) wx.Frame.__init__(self, parent, id, title, pos, size, style) #configuration self.AppliPath = AppliPath @@ -264,6 +270,13 @@ class IraFrame(wx.Frame): item.SetBitmap(self.images_analyses['europress']) file_menu.AppendItem(item) + item = wx.MenuItem(file_menu, ID_importdmi, _(u"Import from DMI-TCAT (exp.)").decode('utf8'), _(u"Import from DMI-TCAT (exp.)").decode('utf8')) + item.SetBitmap(self.images_analyses['importdmi']) + file_menu.AppendItem(item) + + item = wx.MenuItem(file_menu, ID_merge, _(u'Merge graphs').decode('utf8'), _(u'Merge graphs').decode('utf8')) + file_menu.AppendItem(item) + menuFactiva = wx.Menu() fact_from_xml = wx.MenuItem(menuFactiva, ID_Fact_xml, _(u"from xml").decode('utf8')) fact_from_xml.SetBitmap(self.images_analyses['factiva_xml']) @@ -441,6 +454,8 @@ class IraFrame(wx.Frame): tb1.AddSeparator() tb1.AddLabelTool(ID_ImportEuro, "ImportEuro", self.images_analyses['europress'], shortHelp= _(u"Import from Europress").decode('utf8'), longHelp=_(u"Import from Europress").decode('utf8')) tb1.AddSeparator() + tb1.AddLabelTool(ID_importdmi, "ImportDMI", self.images_analyses['importdmi'], shortHelp= _(u"Import from DMI-TCAT (exp.)").decode('utf8'), longHelp=_(u"Import from DMI-TCAT (exp.)").decode('utf8')) + tb1.AddSeparator() tb1.AddLabelTool(ID_Fact_xml, "ImportFactxml", self.images_analyses['factiva_xml'], shortHelp= _(u"Factiva from xml").decode('utf8'), longHelp=_(u"Factiva from xml").decode('utf8')) tb1.AddLabelTool(ID_Fact_mail, "ImportFactmail", self.images_analyses['factiva_mail'], shortHelp= _(u"Factiva from mail").decode('utf8'), longHelp=_(u"Factiva from mail").decode('utf8')) tb1.AddLabelTool(ID_Fact_copy, "ImportFactcopy", self.images_analyses['factiva_copy'], shortHelp= _(u"Factiva from copy/paste").decode('utf8'), longHelp=_(u"Factiva from copy/paste").decode('utf8')) @@ -593,7 +608,9 @@ class IraFrame(wx.Frame): 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_MENU, self.OnImportEuropress, id=ID_ImportEuro) + self.Bind(wx.EVT_MENU, self.OnImportDMI, id=ID_importdmi) self.Bind(wx.EVT_MENU, self.OnExportMeta, id=ID_exportmeta) + self.Bind(wx.EVT_MENU, self.OnMergeGraph, id = ID_merge) self.Bind(wx.EVT_CLOSE, self.OnClose) ################################################################## flags = self._mgr.GetAGWFlags() @@ -791,9 +808,7 @@ class IraFrame(wx.Frame): del busy def OpenText(self): - dlg = progressbar(self, 5) - - builder = Builder(self, dlg) + builder = Builder(self, 5) if builder.res == wx.ID_OK : try : corpus = builder.doanalyse() @@ -801,11 +816,11 @@ class IraFrame(wx.Frame): self.tree.OnItemAppend(corpus.parametres) OpenAnalyse(self, corpus.parametres) except : - dlg.Destroy() + builder.dlg.Destroy() BugReport(self) else : count = 1 - keepGoing = dlg.Update(count, u"Lecture du fichier") + keepGoing = builder.dlg.Update(count, u"Lecture du fichier") self.ShowMenu('view') self.ShowMenu('text') self.ShowMenu('matrix', False) @@ -813,8 +828,8 @@ class IraFrame(wx.Frame): self.DataTxt = False self.Text = '' count += 1 - keepGoing = dlg.Update(count, u"Chargement du dictionnaire") - dlg.Destroy() + keepGoing = builder.dlg.Update(count, u"Chargement du dictionnaire") + builder.dlg.Destroy() def OnExit(self, event): self.Close() @@ -992,6 +1007,9 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" # PlaySound(self) # except: # BugReport(self) + def OnMergeGraph(self, evt): + #FIXME + AnalyseMerge(self, {'type': 'merge', 'fileout' : '/tmp/test.txt'}, dlg = 5) def OnProto(self, evt, matrix = None) : self.analyse_matrix(Prototypical, matrix = matrix, analyse_type = 'proto', dlgnb = 3) @@ -1097,6 +1115,9 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" except : BugReport(self) + def OnImportDMI(self, evt): + ImportDMI(self, {}) + def OnExportMeta(self, evt, corpus = None): if corpus is None : corpus = self.tree.getcorpus() @@ -1181,7 +1202,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" else: truepath = False else: - pass + return if truepath : if os.path.splitext(self.filename)[1] in ['.csv', '.xls', '.ods']: self.tableau = Tableau(self, self.filename) @@ -1201,7 +1222,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" #self.Text = OpenAnalyse(self, self.filename) OpenAnalyse(self, self.filename) if not truepath: - print 'ce fichier n\'existe pas' + print 'This file does not exist' @@ -1332,7 +1353,7 @@ 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, - 2000, None, -1) + 1000, None, -1) self.Bind(wx.EVT_CLOSE, self.OnClose) self.fc = wx.FutureCall(1, self.ShowMain)