X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=guifunct.py;h=4f6fa05162b8571891f91a14111eb162e8b82e7b;hp=c20ee7051f24f8e879855b8bedbbde7b3d50f982;hb=2560c66bef5e023dbce18c556363ec956bd15e47;hpb=773ca4248f17f17098e34b3c21004713e09e3109 diff --git a/guifunct.py b/guifunct.py index c20ee70..4f6fa05 100644 --- a/guifunct.py +++ b/guifunct.py @@ -7,10 +7,11 @@ import wx import os import sys from copy import copy -import dialog +from dialog import FileOptionDialog, SelectColDial, OptLexi, PrefSimpleFile from listlex import * from vitemspicker import VItemsPicker, EVT_IP_SELECTION_CHANGED, IP_SORT_CHOICES, IP_SORT_SELECTED, IP_REMOVE_FROM_CHOICES from functions import treat_var_mod +#from wx import GetTopLevelWindows def OnOpen(self, type): @@ -41,14 +42,14 @@ def OnOpen(self, type): elif type == "Texte": return False, [False] elif type == "Analyse": - return [False] + return False def getfileextension(file) : return os.path.splitext(file)[1] def get_table_param(self, filename) : if getfileextension(filename) == '.csv': - dlg = dialog.FileOptionDialog(self, -1, _(u"File format").decode('utf8'), sep=True, size=(350, 200), + dlg = FileOptionDialog(self, -1, _(u"File format").decode('utf8'), sep=True, size=(350, 200), style=wx.DEFAULT_DIALOG_STYLE) dlg.CenterOnParent() val = dlg.ShowModal() @@ -60,7 +61,7 @@ def get_table_param(self, filename) : self.tableau.parametres['filetype'] = 'csv' self.tableau.parametres['encodage'] = dlg.le[dlg.list_encodages.GetSelection()] elif getfileextension(filename) == '.xls' : - dlg = dialog.FileOptionDialog(self, -1, _(u"File format").decode('utf8'), sep=False, sheet = True, size=(350, 200), + dlg = FileOptionDialog(self, -1, _(u"File format").decode('utf8'), sep=False, sheet = True, size=(350, 200), style=wx.DEFAULT_DIALOG_STYLE) dlg.CenterOnParent() val = dlg.ShowModal() @@ -71,7 +72,7 @@ def get_table_param(self, filename) : self.tableau.parametres['sheetnb'] = dlg.spin1.GetValue() self.tableau.parametres['filetype'] = 'xls' elif getfileextension(filename) == '.ods': - dlg = dialog.FileOptionDialog(self, -1, _(u"File format").decode('utf8'), sep=False, size=(350, 200), + dlg = FileOptionDialog(self, -1, _(u"File format").decode('utf8'), sep=False, size=(350, 200), style=wx.DEFAULT_DIALOG_STYLE) dlg.CenterOnParent() val = dlg.ShowModal() @@ -115,7 +116,7 @@ class SelectColumn : def __init__(self, parent, dictcol, actives, pathout, selected = None, dlg = False) : self.ira = parent if dlg : - dial = dialog.SelectColDial(self.ira) + dial = SelectColDial(self.ira) listcol = ListForSpec(dial, self, dictcol, ['eff']) dial.bSizer2.Add( listcol, 2, wx.ALL|wx.EXPAND, 5 ) dial.m_sdbSizer2.AddButton( dial.m_sdbSizer2OK ) @@ -149,6 +150,7 @@ class SelectColumn : else : self.ok = False else : + self.ok = True if selected is None : selected = [i for i in range(0, len(actives))] with open(pathout, 'w') as f : @@ -172,7 +174,7 @@ class PrefSimi ( wx.Dialog ): self.listcol.SetMinSize( wx.Size( 270,-1 ) ) listsizer = wx.BoxSizer( wx.VERTICAL ) countsizer = wx.BoxSizer( wx.HORIZONTAL ) - self.butcount = wx.Button(self, -1, "count") + self.butcount = wx.Button(self, -1, _(u"count").decode('utf8')) self.textcount = wx.TextCtrl(self, -1, "", wx.DefaultPosition, wx.Size( 100,-1 ), wx.TE_READONLY ) countsizer.Add(self.butcount, 0, wx.ALL, 5) countsizer.Add(self.textcount, 0, wx.ALL, 5 ) @@ -329,7 +331,7 @@ class PrefSimi ( wx.Dialog ): self.m_staticline40 = wx.StaticLine( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) fgSizer3.Add( self.m_staticline40, 0, wx.EXPAND |wx.ALL, 5 ) - self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved"), wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText321.Wrap( -1 ) fgSizer3.Add( self.m_staticText321, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) @@ -622,7 +624,7 @@ class PrefSimi ( wx.Dialog ): self.m_staticText21.Wrap( -1 ) bSizer5.Add( self.m_staticText21, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - self.cols = wx.ColourPickerCtrl( self.m_panel3, wx.ID_ANY, wx.Colour( 255, 0, 0 ), wx.DefaultPosition, wx.Size( 10,10 ), wx.CLRP_DEFAULT_STYLE ) + self.cols = wx.ColourPickerCtrl( self.m_panel3, wx.ID_ANY, wx.Colour( 255, 0, 0 ), wx.DefaultPosition, wx.DefaultSize, wx.CLRP_DEFAULT_STYLE ) bSizer5.Add( self.cols, 0, wx.ALL, 5 ) @@ -895,7 +897,7 @@ class PrepSimi : if 'bystar' in self.parametres : if self.dial.check_bystar.GetValue() : variables = treat_var_mod(self.parametres['stars']) - vardial = dialog.OptLexi(parent, force_chi = True) + vardial = OptLexi(parent, force_chi = True) vardial.listet = self.parametres['stars'] vardial.variables = [v for v in variables] for et in vardial.variables : @@ -986,11 +988,13 @@ class PrepSimi : class CreateTgenDialog ( wx.Frame ): def __init__( self, parent, lemlist, tgen = None, tgens = None ): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u'Tgen Creator', pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP ) - + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u'Tgen Creator').decode('utf8'), pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP ) + self.ira = wx.GetApp().GetTopWindow() + self.SetIcon(self.ira._icon) self.tgens = tgens self.edit = False self.parent = parent + self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) bSizer2 = wx.BoxSizer( wx.VERTICAL ) @@ -999,7 +1003,7 @@ class CreateTgenDialog ( wx.Frame ): fgSizer3.SetFlexibleDirection( wx.BOTH ) fgSizer3.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Name", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, _(u"Name").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText3.Wrap( -1 ) fgSizer3.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) @@ -1012,8 +1016,8 @@ class CreateTgenDialog ( wx.Frame ): bSizer2.Add( fgSizer3, 1, wx.ALIGN_CENTER_HORIZONTAL, 5 ) - self.ip = VItemsPicker(self,-1, lemlist,'Forms', 'Selected') - self.ip._source.SetMinSize( wx.Size( 250, 400 ) ) + self.ip = VItemsPicker(self,-1, lemlist, _(u'Forms').decode('utf8'), _('Selection').decode('utf8')) + self.ip._source.SetMinSize( wx.Size( 350, 400 ) ) bSizer2.Add( self.ip, 0, wx.ALL, 5 ) @@ -1079,14 +1083,18 @@ class CreateTgenDialog ( wx.Frame ): class TGenFrame ( wx.Frame ): def __init__( self, parent, corpus, Tgen ): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Tgen", pos = wx.DefaultPosition, size = wx.Size( 600,434 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP ) - + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Tgen", pos = wx.DefaultPosition, size = wx.Size( -1, -1 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.STAY_ON_TOP ) + self.ira = wx.GetApp().GetTopWindow() + self.SetIcon(self.ira._icon) self.Tgen = Tgen self.parent = parent self.corpus = corpus self.activetgen = None + self.panel = wx.Panel(self, wx.ID_ANY) - self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + #self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + + panelsizer = wx.BoxSizer( wx.VERTICAL ) bSizer1 = wx.BoxSizer( wx.VERTICAL ) @@ -1094,54 +1102,54 @@ class TGenFrame ( wx.Frame ): fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Tgen", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText1 = wx.StaticText( self.panel, wx.ID_ANY, u"Tgen", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText1.Wrap( -1 ) fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Content", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText2 = wx.StaticText( self.panel, wx.ID_ANY, _(u"Content").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText2.Wrap( -1 ) fgSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) tgensChoices = Tgen.tgen.keys() - self.tgens = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgensChoices, 0 ) - self.tgens.SetMinSize( wx.Size( 200,250 ) ) + self.tgens = wx.ListBox( self.panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgensChoices, 0 ) + self.tgens.SetMinSize( wx.Size( 250,350 ) ) - fgSizer1.Add( self.tgens, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( self.tgens, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) tgencontentChoices = [] - self.tgencontent = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgencontentChoices, 0|wx.VSCROLL ) - self.tgencontent.SetMinSize( wx.Size( 200,250 ) ) + self.tgencontent = wx.ListBox( self.panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgencontentChoices, 0|wx.VSCROLL ) + self.tgencontent.SetMinSize( wx.Size( 250,350 ) ) - fgSizer1.Add( self.tgencontent, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( self.tgencontent, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) fgSizer2 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer2.SetFlexibleDirection( wx.BOTH ) fgSizer2.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.but_new = wx.Button( self, wx.ID_ANY, u"New...", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.but_new = wx.Button( self.panel, wx.ID_ANY, _(u"New...").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) fgSizer2.Add( self.but_new, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.but_del = wx.Button( self, wx.ID_ANY, u"Delete", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.but_del = wx.Button( self.panel, wx.ID_ANY, _(u"Delete").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) fgSizer2.Add( self.but_del, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 5 ) + fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 0 ) fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer3.SetFlexibleDirection( wx.BOTH ) fgSizer3.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.but_edit = wx.Button( self, wx.ID_ANY, u"Edit", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.but_edit = wx.Button( self.panel, wx.ID_ANY, _(u"Edit").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) fgSizer3.Add( self.but_edit, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.but_compute = wx.Button( self, wx.ID_ANY, u"Compute", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.but_compute = wx.Button( self.panel, wx.ID_ANY, _(u"Compute").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) fgSizer3.Add( self.but_compute, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 5 ) + fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 0 ) - bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) m_sdbSizer2 = wx.StdDialogButtonSizer() - self.m_sdbSizer2OK = wx.Button( self, wx.ID_OK ) + self.m_sdbSizer2OK = wx.Button( self.panel, wx.ID_OK ) m_sdbSizer2.AddButton( self.m_sdbSizer2OK ) #self.m_sdbSizer2Cancel = wx.Button( self, wx.ID_CANCEL ) #m_sdbSizer2.AddButton( self.m_sdbSizer2Cancel ) @@ -1149,9 +1157,12 @@ class TGenFrame ( wx.Frame ): bSizer1.Add( m_sdbSizer2, 0, wx.EXPAND, 5 ) + #panelsizer.Add(bSizer1, 0, wx.EXPAND, 5 ) - self.SetSizer( bSizer1 ) - self.Layout() + #panel.SetSizer( panelsizer ) + self.panel.SetSizer( bSizer1 ) + self.panel.Layout() + bSizer1.Fit( self ) self.Centre( wx.BOTH ) @@ -1175,9 +1186,9 @@ class TGenFrame ( wx.Frame ): def OnNewTgen( self, event, tgen = None ): if tgen is None : - self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq]] for i, lem in enumerate(self.corpus.lems.keys())]), tgens = self.Tgen.tgen) + self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq, self.corpus.lems[lem].gram]] for i, lem in enumerate(self.corpus.lems.keys())]), tgens = self.Tgen.tgen) else : - self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq]] for i, lem in enumerate(self.corpus.lems.keys())]), tgen = tgen, tgens = self.Tgen.tgen) + self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq, self.corpus.lems[lem].gram]] for i, lem in enumerate(self.corpus.lems.keys())]), tgen = tgen, tgens = self.Tgen.tgen) self.dial.ip._source.selected = dict(zip(self.Tgen.tgen[tgen], self.Tgen.tgen[tgen])) self.activetgen = tgen self.dial.Show() @@ -1199,7 +1210,7 @@ class TGenFrame ( wx.Frame ): tgens = self.tgens.GetItems() tgen = tgens[self.tgens.GetSelection()] self.activetgen = tgen - self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq]] for i, lem in enumerate(self.corpus.lems.keys())]), tgen = tgen, tgens = self.Tgen.tgen) + self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq, self.corpus.lems[lem].gram]] for i, lem in enumerate(self.corpus.lems.keys())]), tgen = tgen, tgens = self.Tgen.tgen) self.dial.Bind(wx.EVT_CLOSE, self.OnDialClose) self.dial.m_textCtrl1.Enable(False) self.dial.ip._source.selected = dict(zip(self.Tgen.tgen[tgen], self.Tgen.tgen[tgen])) @@ -1225,3 +1236,21 @@ class TGenFrame ( wx.Frame ): self.tgens.Append(self.dial.m_textCtrl1.GetValue()) self.dial.Destroy() evt.Skip() + +class ExportMetaTable : + def __init__(self, parent, corpus): + self.ira = parent + dial = PrefSimpleFile(self, self.ira, **{'mask' : '*.csv', 'title': _(u"metadata table").decode('utf8')}) + dial.fbb.SetValue(corpus.pathout['metadata.csv']) + dial.CenterOnParent() + res = dial.ShowModal() + if res == wx.ID_OK : + fileout = dial.fbb.GetValue() + dial.Destroy() + corpus.export_meta_table(fileout) + dlg = wx.MessageDialog(self.ira, _("Done !").decode('utf8'), _(u"Export metadata").decode('utf8'), wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION) + dlg.CenterOnParent() + dlg.ShowModal() + dlg.Destroy() + else : + dial.Destroy()