X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=fc7795239233b9a47b85fd93b783faab2eb42539;hp=492e4ea1e396567a9073ae0818f71931087ebda1;hb=54d82dcc766acdc38be4b6c16831d5856ceb9d1f;hpb=8c01b170b8553aaa8f84d3ac0c3d520f10f353eb diff --git a/iramuteq.py b/iramuteq.py index 492e4ea..fc77952 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -29,7 +29,7 @@ import wx.html import wx.grid import wx.lib.hyperlink as hl #------------------------------------ -from functions import BugReport, PlaySound, History +from functions import BugReport, PlaySound, History, progressbar from checkversion import NewVersion from guifunct import * from tableau import Tableau @@ -56,6 +56,7 @@ 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 tree import LeftTree @@ -97,6 +98,7 @@ ID_Fact_xml = wx.NewId() ID_Fact_mail = wx.NewId() ID_Fact_copy = wx.NewId() ID_exportmeta = wx.NewId() +ID_importdmi = wx.NewId() ########################################################## #elements de configuration ########################################################## @@ -195,6 +197,7 @@ images_analyses = { 'subcorpusthema' : 'subcorpusthema.png', 'preferences' : 'preferences.png', 'exportmetatable' : 'exportmetatable.png', + 'importdmi' : 'twitter.png' } ##################################################################### @@ -264,6 +267,10 @@ 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) + 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']) @@ -313,7 +320,7 @@ class IraFrame(wx.Frame): #view_menu.AppendSeparator() matrix_menu = wx.Menu() matanalyses = [[ID_Freq, _(u"Frequencies").decode('utf8'), 'freq'], - [ID_Freq, _(u"Multiple Frequencies").decode('utf8'), 'freqmulti'], + [ID_FreqMulti, _(u"Multiple Frequencies").decode('utf8'), 'freqmulti'], [ID_Chi2, _(u"Chi2").decode('utf8'), 'chi2'], {'name' : _(u"Clustering").decode('utf8'), 'content' : [[ID_CHDReinert, _(u"Reinert's Method").decode('utf8'), 'reinertmatrix']]}, @@ -441,6 +448,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,6 +602,7 @@ 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_CLOSE, self.OnClose) ################################################################## @@ -786,17 +796,12 @@ class IraFrame(wx.Frame): wx.SafeYield() corpus = builder.doanalyse() self.history.add(corpus.parametres) - self.tree.OnItemAppend(corpus.parametres) OpenAnalyse(self, corpus.parametres) + self.tree.OnItemAppend(corpus.parametres) del busy def OpenText(self): - dlg = wx.ProgressDialog("Ouverture...", - "Veuillez patienter...", - maximum=2, - parent=self, - style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT - ) + dlg = progressbar(self, 5) builder = Builder(self, dlg) if builder.res == wx.ID_OK : @@ -1102,6 +1107,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() @@ -1206,17 +1214,20 @@ 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' class IntroPanel(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) - col = randint(0, 255) - col1 = randint(0,255) - col2 = randint(0,255) + #col = randint(0, 255) + #col1 = randint(0,255) + #col2 = randint(0,255) #col = 57 + col = 161 + col1 = 198 + col2 = 224 bckgrdcolor = wx.Colour(col, col1, col2) self.SetBackgroundColour(bckgrdcolor) txtcolour = wx.Colour(250, 250, 250)