X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=dialog.py;h=2e4759824606767647f49feaea3c4ba7caba18e0;hp=8ff0e0fcb96df21da13f76c160170c0fb945db47;hb=e033f9e84abb3c12d92f1580425877aa58e9af30;hpb=22cd27b2bbe9ab1ffa7ef06fa764b5147ae17dad diff --git a/dialog.py b/dialog.py index 8ff0e0f..2e47598 100755 --- a/dialog.py +++ b/dialog.py @@ -8,6 +8,7 @@ import wx.lib.colourselect as csel import wx.lib.sized_controls as sc import wx.lib.filebrowsebutton as filebrowse import locale +from functions import DoConf import os import sys from KeyFrame import AlcOptFrame @@ -18,7 +19,7 @@ wx.HelpProvider_Set(provider) #--------------------------------------------------------------------------- -encodages = [[u'cp1252',u'Windows'], [u'utf-8',u'Linux'], [u'MacRoman',u'MacOs X'], [u'ascii', u'English'], [u'big5', u'Traditional Chinese'], [u'big5hkscs', u'Traditional Chinese'], [u'cp037', u'English'], [u'cp424', u'Hebrew'], [u'cp437', u'English'], [u'cp500', u'Western Europe'], [u'cp737', u'Greek'], [u'cp775', u'Baltic languages'], [u'cp850', u'Western Europe'], [u'cp852', u'Central and Eastern Europe'], [u'cp855', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'cp856', u'Hebrew'], [u'cp857', u'Turkish'], [u'cp860', u'Portuguese'], [u'cp861', u'Icelandic'], [u'cp862', u'Hebrew'], [u'cp863', u'Canadian'], [u'cp864', u'Arabic'], [u'cp865', u'Danish, Norwegian'], [u'cp866', u'Russian'], [u'cp869', u'Greek'], [u'cp874', u'Thai'], [u'cp875', u'Greek'], [u'cp932', u'Japanese'], [u'cp949', u'Korean'], [u'cp950', u'Traditional Chinese'], [u'cp1006', u'Urdu'], [u'cp1026', u'Turkish'], [u'cp1140', u'Western Europe'], [u'cp1250', u'Central and Eastern Europe'], [u'cp1251', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'cp1253', u'Greek'], [u'cp1254', u'Turkish'], [u'cp1255', u'Hebrew'], [u'cp1256', u'Arabic'], [u'cp1257', u'Baltic languages'], [u'cp1258', u'Vietnamese'], [u'euc_jp', u'Japanese'], [u'euc_jis_2004', u'Japanese'], [u'euc_jisx0213', u'Japanese'], [u'euc_kr', u'Korean'], [u'gb2312', u'Simplified Chinese'], [u'gbk', u'Unified Chinese'], [u'gb18030', u'Unified Chinese'], [u'hz', u'Simplified Chinese'], [u'iso2022_jp', u'Japanese'], [u'iso2022_jp_1', u'Japanese'], [u'iso2022_jp_2', u'Jp, K, S C, WE, G'], [u'iso2022_jp_2004', u'Japanese'], [u'iso2022_jp_3', u'Japanese'], [u'iso2022_jp_ext', u'Japanese'], [u'iso2022_kr', u'Korean'], [u'latin_1', u'West Europe'], [u'iso8859_2', u'Central and Eastern Europe'], [u'iso8859_3', u'Esperanto, Maltese'], [u'iso8859_4', u'Baltic languages'], [u'iso8859_5', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'iso8859_6', u'Arabic'], [u'iso8859_7', u'Greek'], [u'iso8859_8', u'Hebrew'], [u'iso8859_9', u'Turkish'], [u'iso8859_10', u'Nordic languages'], [u'iso8859_13', u'Baltic languages'], [u'iso8859_14', u'Celtic languages'], [u'iso8859_15', u'Western Europe'], [u'iso8859_16', u'South-Eastern Europe'], [u'johab', u'Korean'], [u'koi8_r', u'Russian'], [u'koi8_u', u'Ukrainian'], [u'mac_cyrillic', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'mac_greek', u'Greek'], [u'mac_iceland', u'Icelandic'], [u'mac_latin2', u'Central and Eastern Europe'], [u'mac_turkish', u'Turkish'], [u'ptcp154', u'Kazakh'], [u'shift_jis', u'Japanese'], [u'shift_jis_2004', u'Japanese'], [u'shift_jisx0213', u'Japanese'], [u'utf_32', u'all languages'], [u'utf_32_be', u'all languages'], [u'utf_32_le', u'all languages'], [u'utf_16', u'all languages'], [u'utf_16_be', u'all languages (BMP only)'], [u'utf_16_le', u'all languages (BMP only)'], [u'utf_7', u'all languages'], [u'utf_8_sig', u'all languages']] +encodages = [[u'cp1252',u'Western Europe'], [u'utf-8',u'all languages'], [u'MacRoman',u'Western Europe'], [u'ascii', u'English'], [u'big5', u'Traditional Chinese'], [u'big5hkscs', u'Traditional Chinese'], [u'cp037', u'English'], [u'cp424', u'Hebrew'], [u'cp437', u'English'], [u'cp500', u'Western Europe'], [u'cp737', u'Greek'], [u'cp775', u'Baltic languages'], [u'cp850', u'Western Europe'], [u'cp852', u'Central and Eastern Europe'], [u'cp855', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'cp856', u'Hebrew'], [u'cp857', u'Turkish'], [u'cp860', u'Portuguese'], [u'cp861', u'Icelandic'], [u'cp862', u'Hebrew'], [u'cp863', u'Canadian'], [u'cp864', u'Arabic'], [u'cp865', u'Danish, Norwegian'], [u'cp866', u'Russian'], [u'cp869', u'Greek'], [u'cp874', u'Thai'], [u'cp875', u'Greek'], [u'cp932', u'Japanese'], [u'cp949', u'Korean'], [u'cp950', u'Traditional Chinese'], [u'cp1006', u'Urdu'], [u'cp1026', u'Turkish'], [u'cp1140', u'Western Europe'], [u'cp1250', u'Central and Eastern Europe'], [u'cp1251', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'cp1253', u'Greek'], [u'cp1254', u'Turkish'], [u'cp1255', u'Hebrew'], [u'cp1256', u'Arabic'], [u'cp1257', u'Baltic languages'], [u'cp1258', u'Vietnamese'], [u'euc_jp', u'Japanese'], [u'euc_jis_2004', u'Japanese'], [u'euc_jisx0213', u'Japanese'], [u'euc_kr', u'Korean'], [u'gb2312', u'Simplified Chinese'], [u'gbk', u'Unified Chinese'], [u'gb18030', u'Unified Chinese'], [u'hz', u'Simplified Chinese'], [u'iso2022_jp', u'Japanese'], [u'iso2022_jp_1', u'Japanese'], [u'iso2022_jp_2', u'Jp, K, S C, WE, G'], [u'iso2022_jp_2004', u'Japanese'], [u'iso2022_jp_3', u'Japanese'], [u'iso2022_jp_ext', u'Japanese'], [u'iso2022_kr', u'Korean'], [u'latin_1', u'West Europe'], [u'iso8859_2', u'Central and Eastern Europe'], [u'iso8859_3', u'Esperanto, Maltese'], [u'iso8859_4', u'Baltic languages'], [u'iso8859_5', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'iso8859_6', u'Arabic'], [u'iso8859_7', u'Greek'], [u'iso8859_8', u'Hebrew'], [u'iso8859_9', u'Turkish'], [u'iso8859_10', u'Nordic languages'], [u'iso8859_13', u'Baltic languages'], [u'iso8859_14', u'Celtic languages'], [u'iso8859_15', u'Western Europe'], [u'iso8859_16', u'South-Eastern Europe'], [u'johab', u'Korean'], [u'koi8_r', u'Russian'], [u'koi8_u', u'Ukrainian'], [u'mac_cyrillic', u'Bulg, Byelorus, Mace, Rus, Serb'], [u'mac_greek', u'Greek'], [u'mac_iceland', u'Icelandic'], [u'mac_latin2', u'Central and Eastern Europe'], [u'mac_turkish', u'Turkish'], [u'ptcp154', u'Kazakh'], [u'shift_jis', u'Japanese'], [u'shift_jis_2004', u'Japanese'], [u'shift_jisx0213', u'Japanese'], [u'utf_32', u'all languages'], [u'utf_32_be', u'all languages'], [u'utf_32_le', u'all languages'], [u'utf_16', u'all languages'], [u'utf_16_be', u'all languages (BMP only)'], [u'utf_16_le', u'all languages (BMP only)'], [u'utf_7', u'all languages'], [u'utf_8_sig', u'all languages']] class FileOptionDialog(wx.Dialog): def __init__( @@ -33,7 +34,7 @@ class FileOptionDialog(wx.Dialog): self.PostCreate(pre) sizer = wx.BoxSizer(wx.VERTICAL) - grid_sizer = wx.FlexGridSizer(5, 2, 2, 2) + grid_sizer = wx.FlexGridSizer(0, 2, 2, 2) ############################## label = wx.StaticText(self, -1, u"La première ligne contient les noms de colonne") @@ -82,7 +83,10 @@ class FileOptionDialog(wx.Dialog): if locale.getpreferredencoding().lower() == 'mac-roman' : enc = self.le.index('macroman') else : - enc = self.le.index(locale.getpreferredencoding().lower()) + try : + enc = self.le.index(sys.getdefaultencoding().lower()) + except ValueError: + enc = self.le.index('utf-8') self.list_encodages.SetSelection(enc) grid_sizer.Add(self.list_encodages, 1, wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) elif sheet : @@ -150,7 +154,6 @@ class ClusterNbDialog(wx.Dialog): LIST_CLASSE_OK.append(str(i)) else : LIST_CLASSE_OK.append(str(LIST_CLASSE)) - print str(LIST_CLASSE_OK) self.list_box_1 = wx.ListBox(self, -1, choices=LIST_CLASSE_OK, style=wx.LB_SINGLE | wx.LB_HSCROLL) self.list_box_1.SetHelpText("Here's some help text for field #1") box.Add(self.list_box_1, 1, wx.ALIGN_CENTRE | wx.ALL, 5) @@ -191,8 +194,8 @@ class EncodeDialog(wx.Dialog): kwds["title"] = u'Encodage' wx.Dialog.__init__(self, *args, **kwds) self.label_dict = wx.StaticText(self, -1, u"Langue") - langues_n = [u'français', u'english', u'german (expérimentale)', u'italian (expérimentale)'] - self.langues = [u'french', u'english', u'german', 'italian'] + langues_n = [u'français', u'english', u'german (expérimentale)', u'italian (expérimentale)', u'swedish (exp.)', u'portuguese (exp.)'] + self.langues = [u'french', u'english', u'german', 'italian', 'swedish', 'portuguese'] self.choice_dict = wx.Choice(self, -1, choices = langues_n) self.encodages = encodages self.text = wx.StaticText(self, -1, u"Encodage du corpus : ") @@ -377,7 +380,7 @@ class PrefDialog ( wx.Dialog ): bSizer1 = wx.BoxSizer( wx.VERTICAL ) - fgSizer1 = wx.FlexGridSizer( 4, 3, 0, 0 ) + fgSizer1 = wx.FlexGridSizer( 0, 3, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -408,6 +411,20 @@ nouvelle version est disponible""" self.m_radioBox2 = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_radioBox2Choices, 1, wx.RA_SPECIFY_COLS ) self.m_radioBox2.SetSelection( 0 ) fgSizer1.Add( self.m_radioBox2, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + + msg = u"""Langue de l'interface""" + self.m_staticText45 = wx.StaticText( self, wx.ID_ANY, msg, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText45.Wrap( -1 ) + fgSizer1.Add( self.m_staticText45, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + self.m_staticText46 = wx.StaticText( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText46.Wrap( -1 ) + fgSizer1.Add( self.m_staticText46, 0, wx.ALL, 5 ) + + self.listlangues = [ u"french", u"english" ] + self.langues = wx.Choice( self, wx.ID_ANY, (200, -1), choices = self.listlangues) + #self.langues.SetSelection( 0 ) + fgSizer1.Add( self.langues, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) msg = u"""Vérifier l'installation des bibliothèques de R""" @@ -479,7 +496,7 @@ bibliothèques de R""" m_sdbSizer1.AddButton( self.m_sdbSizer1OK ) self.m_sdbSizer1Cancel = wx.Button( self, wx.ID_CANCEL ) m_sdbSizer1.AddButton( self.m_sdbSizer1Cancel ) - m_sdbSizer1.Realize(); + m_sdbSizer1.Realize() bSizer1.Add( m_sdbSizer1, 0, wx.EXPAND, 5 ) self.SetSizer( bSizer1 ) @@ -502,6 +519,7 @@ bibliothèques de R""" if self.parent.pref.getboolean('iramuteq', 'checkupdate') : val2 = 0 else : val2 = 1 self.m_radioBox2.SetSelection(val2) + self.langues.SetSelection(self.listlangues.index(self.parent.pref.get('iramuteq', 'guilanguage'))) if sys.platform == 'win32' : if self.parent.pref.getboolean('iramuteq', 'R_mem') : self.m_checkBox1.SetValue(True) @@ -540,6 +558,7 @@ bibliothèques de R""" if self.m_radioBox2.GetSelection() == 0 : valcheck = 'true' else : valcheck = 'false' parent.pref.set('iramuteq', 'checkupdate', valcheck) + parent.pref.set('iramuteq', 'guilanguage', self.listlangues[self.langues.GetSelection()]) if sys.platform == 'win32' : if self.m_checkBox1.GetValue() : parent.pref.set('iramuteq', 'R_mem', 'true') @@ -574,6 +593,8 @@ class PrefGraph(wx.Dialog): else : choix=[u'2D' ,u'3D'] self.choicetype = wx.Choice(self, -1, (100,50), choices=choix) + self.label_format = wx.StaticText(self, -1, u"Format de l'image") + self.choix_format = wx.Choice(self, -1, (100,50), choices = ['png', 'svg']) self.label_1 = wx.StaticText(self, -1, u'Largeur') self.spin1 = wx.SpinCtrl(self, -1, '',size = (100,30), min=100, max=5000) self.label_2 = wx.StaticText(self, -1, u'Hauteur') @@ -588,6 +609,10 @@ class PrefGraph(wx.Dialog): self.label_4 = wx.StaticText(self, -1, txt) self.check1 = wx.CheckBox(self, -1) self.spin_nb = wx.SpinCtrl(self, -1, '', size = (100,30), min=2, max=1000) + txt = u"""Prendre les x premiers points par classe""" + self.label_chic = wx.StaticText(self, -1, txt) + self.check_chic = wx.CheckBox(self, -1) + self.spin_nbchic = wx.SpinCtrl(self, -1, '', size = (100,30), min=2, max=1000) txt = u"""Limiter le nombre de points par le chi2 de liaison aux classes""" self.label_5 = wx.StaticText(self, -1, txt) @@ -596,7 +621,7 @@ par le chi2 de liaison aux classes""" self.label_6 = wx.StaticText(self, -1, u'Eliminer les recouvrements') self.check3 = wx.CheckBox(self, -1) txt = u"""Taille du texte proportionnel -à la masse de la forme""" +à l'effectif de la forme""" self.label_7 = wx.StaticText(self, -1, txt) self.check4 = wx.CheckBox(self, -1) self.label_min = wx.StaticText(self, -1, 'min') @@ -642,6 +667,7 @@ au chi2 d'association de la forme""" self.Bind(wx.EVT_CHECKBOX, self.OnCheckTchi, self.check_tchi) self.Bind(wx.EVT_CHOICE, self.On3D, self.choicetype) self.Bind(wx.EVT_CHOICE, self.OnPass, self.choice2) + self.Bind(wx.EVT_CHECKBOX, self.OnCheckChic, self.check_chic) self.__set_properties() self.OnNorm(wx.EVT_CHECKBOX) self.OnCheckTchi(wx.EVT_CHECKBOX) @@ -653,6 +679,7 @@ au chi2 d'association de la forme""" self.film.Enable(False) self.spin_f3.Enable(False) self.slider_sphere.Enable(False) + self.choix_format.SetSelection(self.paramgraph['svg']) self.choice1.SetSelection(self.paramgraph['what']) self.choice2.SetSelection(self.paramgraph['qui']) self.spin_chi.SetValue(self.paramgraph['select_nb']) @@ -662,14 +689,29 @@ au chi2 d'association de la forme""" self.spin3.SetValue(self.paramgraph['taillecar']) self.spin_nb.SetValue(self.paramgraph['select_nb']) self.spin_chi.SetValue(self.paramgraph['select_chi']) + self.spin_nbchic.SetValue(self.paramgraph['nbchic']) self.check1.SetValue(self.paramgraph['do_select_nb']) self.check2.SetValue(self.paramgraph['do_select_chi']) + self.check_chic.SetValue(self.paramgraph['do_select_chi_classe']) self.check3.SetValue(self.paramgraph['over']) if self.paramgraph['do_select_nb'] : self.spin_nb.Enable(True) self.spin_chi.Enable(False) + self.spin_nbchic.Enable(False) + elif self.paramgraph['do_select_chi_classe'] : + self.spin_nb.Enable(False) + self.spin_chi.Enable(False) + self.spin_nbchic.Enable(True) + elif self.paramgraph['do_select_chi'] : + self.spin_nb.Enable(False) + self.spin_chi.Enable(True) + self.spin_nbchic.Enable(False) else : self.spin_nb.Enable(False) + self.spin_chi.Enable(False) + self.spin_nbchic.Enable(False) + + self.check4.SetValue(self.paramgraph['cex_txt']) self.spin_min.SetValue(self.paramgraph['txt_min']) self.spin_max.SetValue(self.paramgraph['txt_max']) @@ -677,11 +719,6 @@ au chi2 d'association de la forme""" self.spin_min_tchi.SetValue(self.paramgraph['tchi_min']) self.spin_max_tchi.SetValue(self.paramgraph['tchi_max']) - if self.paramgraph['do_select_chi'] : - self.spin_nb.Enable(False) - self.spin_chi.Enable(True) - else : - self.spin_chi.Enable(False) self.spin_f1.SetValue(self.paramgraph['facteur'][0]) self.spin_f2.SetValue(self.paramgraph['facteur'][1]) self.spin_f3.SetValue(self.paramgraph['facteur'][2]) @@ -689,13 +726,13 @@ au chi2 d'association de la forme""" def __do_layout(self): sizer_2 = wx.BoxSizer(wx.VERTICAL) - fsizer = wx.FlexGridSizer(12,2,0,5) - grid_min = wx.FlexGridSizer(1, 2, 0, 0) - grid_max = wx.FlexGridSizer(1, 2, 0, 0) - grid_minmax = wx.FlexGridSizer(1, 2, 0, 0) - grid_min_tchi = wx.FlexGridSizer(1, 2, 0, 0) - grid_max_tchi = wx.FlexGridSizer(1, 2, 0, 0) - grid_minmax_tchi = wx.FlexGridSizer(1, 2, 0, 0) + fsizer = wx.FlexGridSizer(0,2,0,5) + grid_min = wx.FlexGridSizer(0, 2, 0, 0) + grid_max = wx.FlexGridSizer(0, 2, 0, 0) + grid_minmax = wx.FlexGridSizer(0, 2, 0, 0) + grid_min_tchi = wx.FlexGridSizer(0, 2, 0, 0) + grid_max_tchi = wx.FlexGridSizer(0, 2, 0, 0) + grid_minmax_tchi = wx.FlexGridSizer(0, 2, 0, 0) sizer_3 = wx.BoxSizer(wx.VERTICAL) @@ -704,6 +741,11 @@ au chi2 d'association de la forme""" fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) + fsizer.Add(self.label_format, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) + fsizer.Add(self.choix_format, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) + fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) + fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) + fsizer.Add(self.label_what, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(self.choice1, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) @@ -738,6 +780,14 @@ au chi2 d'association de la forme""" fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) + fsizer.Add(self.label_chic, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_nbchic = wx.BoxSizer(wx.HORIZONTAL) + sizer_nbchic.Add(self.check_chic, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_nbchic.Add(self.spin_nbchic, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) + fsizer.Add(sizer_nbchic, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) + fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) + fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) + fsizer.Add(self.label_5, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) sizer_chi = wx.BoxSizer(wx.HORIZONTAL) sizer_chi.Add(self.check2, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) @@ -753,7 +803,7 @@ au chi2 d'association de la forme""" sizer_2.Add(fsizer, 0, wx.EXPAND, 0) - bsizer_1 = wx.FlexGridSizer(3,3,0,0) + bsizer_1 = wx.FlexGridSizer(0,3,0,0) bsizer_1.Add(self.label_7, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) bsizer_1.Add(self.check4, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5) grid_min.Add(self.label_min, 0,wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) @@ -796,7 +846,7 @@ au chi2 d'association de la forme""" sizer_2.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 5) - fsizer2 = wx.FlexGridSizer(2,2,0,0) + fsizer2 = wx.FlexGridSizer(0,2,0,0) fsizer2.Add(self.label_sphere, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer2.Add(self.slider_sphere, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer2.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) @@ -810,22 +860,36 @@ au chi2 d'association de la forme""" sizer_2.Fit(self) self.Layout() - def OnCheck1(self,event): + def OnCheck1(self, event): if self.check1.GetValue() : self.check2.SetValue(False) + self.check_chic.SetValue(False) self.spin_chi.Enable(False) self.spin_nb.Enable(True) + self.spin_nbchic.Enable(False) else : self.spin_nb.Enable(False) - def OnCheck2(self,event): + def OnCheck2(self, event): if self.check2.GetValue() : - self.check1.SetValue(False) - self.spin_nb.Enable(False) - self.spin_chi.Enable(True) + self.check1.SetValue(False) + self.check_chic.SetValue(False) + self.spin_chi.Enable(True) + self.spin_nb.Enable(False) + self.spin_nbchic.Enable(False) else : self.spin_chi.Enable(False) + def OnCheckChic(self, event) : + if self.check_chic.GetValue() : + self.check1.SetValue(False) + self.check2.SetValue(False) + self.spin_chi.Enable(False) + self.spin_nb.Enable(False) + self.spin_nbchic.Enable(True) + else : + self.spin_nbchic.Enable(False) + def OnNorm(self, event): if not self.check4.GetValue() : self.spin_min.Disable() @@ -857,642 +921,18 @@ au chi2 d'association de la forme""" self.slider_sphere.Enable(False) def OnPass(self,evt) : - if evt.GetString() != u'actives' : + if evt.GetString() == u'classes' : self.check4.SetValue(False) self.check4.Enable(False) self.OnNorm(wx.EVT_CHECKBOX) else : self.check4.Enable() -class PrefSimi ( wx.Dialog ): - - def __init__( self, parent, ID, paramsimi, indices ): - wx.Dialog.__init__ ( self, None, id = wx.ID_ANY, title = u"Paramètres", pos = wx.DefaultPosition, size = wx.Size( -1,-1 ), style = wx.DEFAULT_DIALOG_STYLE ) - self.parent = parent - self.paramsimi=paramsimi - self.indices = indices - - - self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) - - fgSizer5 = wx.FlexGridSizer( 0, 3, 0, 0 ) - fgSizer5.SetFlexibleDirection( wx.BOTH ) - fgSizer5.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer3.SetFlexibleDirection( wx.BOTH ) - fgSizer3.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Sélectionner les colonnes", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText1.Wrap( -1 ) - fgSizer3.Add( self.m_staticText1, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.check_colch = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer3.Add( self.check_colch, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline29 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline29, 0, wx.EXPAND, 5 ) - - self.m_staticline291 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline291, 0, wx.EXPAND, 5 ) - if not self.paramsimi['first'] : - - self.m_staticText271 = wx.StaticText( self, wx.ID_ANY, u"Utiliser les coordonnées\nprécédentes", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText271.Wrap( -1 ) - fgSizer3.Add( self.m_staticText271, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.check_coord = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer3.Add( self.check_coord, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline36 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline36, 0, wx.EXPAND, 5 ) - - self.m_staticline37 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline37, 0, wx.EXPAND, 5 ) - - self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Indice", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText3.Wrap( -1 ) - fgSizer3.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - choice1Choices = [] - self.choice1 = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, self.indices, 0 ) - self.choice1.SetSelection( 0 ) - fgSizer3.Add( self.choice1, 0, wx.ALL, 5 ) - - self.m_staticline293 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline293, 0, wx.EXPAND, 5 ) - - self.m_staticline292 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline292, 0, wx.EXPAND, 5 ) - - self.m_staticText4 = wx.StaticText( self, wx.ID_ANY, u"Layout", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText4.Wrap( -1 ) - fgSizer3.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - choice2Choices = [u"random", u"cercle", u"fruchterman reingold", u"kamada kawai", u"graphopt"] - self.choice2 = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, choice2Choices, 0 ) - self.choice2.SetSelection( 0 ) - fgSizer3.Add( self.choice2, 0, wx.ALL, 5 ) - - self.m_staticline294 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline294, 0, wx.EXPAND, 5 ) - - self.m_staticline295 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline295, 0, wx.EXPAND, 5 ) - - self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Type de graph", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText5.Wrap( -1 ) - fgSizer3.Add( self.m_staticText5, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - choice3Choices = [u"dynamique", u"statique", u"3D"] - self.choice3 = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, choice3Choices, 0 ) - self.choice3.SetSelection( 0 ) - fgSizer3.Add( self.choice3, 0, wx.ALL, 5 ) - - self.m_staticline296 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline296, 0, wx.EXPAND, 5 ) - - self.m_staticline297 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline297, 0, wx.EXPAND, 5 ) - - self.m_staticText8 = wx.StaticText( self, wx.ID_ANY, u"Arbre maximum", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText8.Wrap( -1 ) - fgSizer3.Add( self.m_staticText8, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.check1 = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer3.Add( self.check1, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline298 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline298, 0, wx.EXPAND, 5 ) - - self.m_staticline299 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline299, 0, wx.EXPAND, 5 ) - - self.m_staticText91 = wx.StaticText( self, wx.ID_ANY, u"Graph à seuil", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText91.Wrap( -1 ) - fgSizer3.Add( self.m_staticText91, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - bSizer21 = wx.BoxSizer( wx.HORIZONTAL ) - - self.check_seuil = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer21.Add( self.check_seuil, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.spin_seuil = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 1, 10000, 1 ) - bSizer21.Add( self.spin_seuil, 0, wx.ALL, 5 ) - - fgSizer3.Add( bSizer21, 1, wx.EXPAND, 5 ) - - self.m_staticline2910 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2910, 0, wx.EXPAND, 5 ) - - self.m_staticline2911 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2911, 0, wx.EXPAND, 5 ) - - self.m_staticText19 = wx.StaticText( self, wx.ID_ANY, u"Texte sur les sommets", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText19.Wrap( -1 ) - fgSizer3.Add( self.m_staticText19, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.check_vlab = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer3.Add( self.check_vlab, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline2912 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2912, 0, wx.EXPAND, 5 ) - - self.m_staticline2913 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2913, 0, wx.EXPAND, 5 ) - - self.m_staticText20 = wx.StaticText( self, wx.ID_ANY, u"Indices sur les arêtes", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText20.Wrap( -1 ) - fgSizer3.Add( self.m_staticText20, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.check_elab = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer3.Add( self.check_elab, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline2914 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2914, 0, wx.EXPAND, 5 ) - - self.m_staticline2915 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2915, 0, wx.EXPAND, 5 ) - - self.m_staticText27 = wx.StaticText( self, wx.ID_ANY, u"Taille du texte", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText27.Wrap( -1 ) - fgSizer3.Add( self.m_staticText27, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.spin_cex = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 10 ) - fgSizer3.Add( self.spin_cex, 0, wx.ALL, 5 ) - - self.m_staticline2916 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2916, 0, wx.EXPAND, 5 ) - - self.m_staticline2917 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline2917, 0, wx.EXPAND, 5 ) - - if 'bystar' in self.paramsimi : - self.m_staticText40 = wx.StaticText( self, wx.ID_ANY, u"Sélectionner une variable", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText40.Wrap( -1 ) - fgSizer3.Add( self.m_staticText40, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.check_bystar = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer3.Add( self.check_bystar, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline3200 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline3200, 0, wx.EXPAND, 5 ) - self.m_staticline3201 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer3.Add( self.m_staticline3201, 0, wx.EXPAND, 5 ) - - fgSizer5.Add( fgSizer3, 1, wx.EXPAND, 5 ) - - self.m_staticline5 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_VERTICAL ) - self.m_staticline5.SetForegroundColour( wx.Colour( 0, 0, 0 ) ) - - fgSizer5.Add( self.m_staticline5, 0, wx.EXPAND|wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 5 ) - - fgSizer51 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer51.SetFlexibleDirection( wx.BOTH ) - fgSizer51.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"Taille du graphique", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText6.Wrap( -1 ) - fgSizer51.Add( self.m_staticText6, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - fgSizer31 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer31.SetFlexibleDirection( wx.BOTH ) - fgSizer31.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - self.m_staticText9 = wx.StaticText( self, wx.ID_ANY, u"hauteur", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText9.Wrap( -1 ) - fgSizer31.Add( self.m_staticText9, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_height = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 10, 100000, 800 ) - fgSizer31.Add( self.spin_height, 0, wx.ALL, 5 ) - - self.m_staticText10 = wx.StaticText( self, wx.ID_ANY, u"largeur", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText10.Wrap( -1 ) - fgSizer31.Add( self.m_staticText10, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_width = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 10, 100000, 800 ) - fgSizer31.Add( self.spin_width, 0, wx.ALL, 5 ) - - fgSizer51.Add( fgSizer31, 1, wx.EXPAND, 5 ) - - self.m_staticline3 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline3, 0, wx.EXPAND, 5 ) - - self.m_staticline4 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline4, 0, wx.EXPAND, 5 ) - - self.m_staticText101 = wx.StaticText( self, wx.ID_ANY, u"Taille des sommets \nproportionnelle à l'effectif\n(les scores sont normalisés)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText101.Wrap( -1 ) - fgSizer51.Add( self.m_staticText101, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - bSizer7 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer9 = wx.BoxSizer( wx.VERTICAL ) - - self.check2 = wx.CheckBox( self, wx.ID_ANY, u"eff.", wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer9.Add( self.check2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - if 'sfromchi' in self.paramsimi : - self.checki = wx.CheckBox( self, wx.ID_ANY, u"chi2", wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer9.Add( self.checki, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - bSizer7.Add( bSizer9, 0, wx.ALIGN_CENTER_VERTICAL, 5 ) - - fgSizer7 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer7.SetFlexibleDirection( wx.BOTH ) - fgSizer7.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - self.m_staticText11 = wx.StaticText( self, wx.ID_ANY, u"min", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText11.Wrap( -1 ) - fgSizer7.Add( self.m_staticText11, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_tvmin = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 0 ) - fgSizer7.Add( self.spin_tvmin, 0, wx.ALL, 5 ) - - self.m_staticText12 = wx.StaticText( self, wx.ID_ANY, u"max", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText12.Wrap( -1 ) - fgSizer7.Add( self.m_staticText12, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_tvmax = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 0 ) - fgSizer7.Add( self.spin_tvmax, 0, wx.ALL, 5 ) - - bSizer7.Add( fgSizer7, 1, wx.EXPAND, 5 ) - - fgSizer51.Add( bSizer7, 1, wx.EXPAND, 5 ) - - self.m_staticline31 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline31, 0, wx.EXPAND, 5 ) - - self.m_staticline32 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline32, 0, wx.EXPAND, 5 ) - - self.m_staticText1011 = wx.StaticText( self, wx.ID_ANY, u"Taille du texte des sommets \nproportionnelle à l'effectif\n(les scores sont normalisés)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText1011.Wrap( -1 ) - fgSizer51.Add( self.m_staticText1011, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - bSizer71 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer8 = wx.BoxSizer( wx.VERTICAL ) - - self.check_vcex = wx.CheckBox( self, wx.ID_ANY, u"eff.", wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer8.Add( self.check_vcex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - if 'cexfromchi' in self.paramsimi : - - self.checkit = wx.CheckBox( self, wx.ID_ANY, u"chi2", wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer8.Add( self.checkit, 0, wx.ALL, 5 ) - - bSizer71.Add( bSizer8, 0, wx.ALIGN_CENTER_VERTICAL, 5 ) - - fgSizer71 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer71.SetFlexibleDirection( wx.BOTH ) - fgSizer71.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - self.m_staticText111 = wx.StaticText( self, wx.ID_ANY, u"min", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText111.Wrap( -1 ) - fgSizer71.Add( self.m_staticText111, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_vcexmin = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 0 ) - fgSizer71.Add( self.spin_vcexmin, 0, wx.ALL, 5 ) - - self.m_staticText121 = wx.StaticText( self, wx.ID_ANY, u"max", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText121.Wrap( -1 ) - fgSizer71.Add( self.m_staticText121, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_vcexmax = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 0 ) - fgSizer71.Add( self.spin_vcexmax, 0, wx.ALL, 5 ) - - bSizer71.Add( fgSizer71, 1, wx.EXPAND, 5 ) - - fgSizer51.Add( bSizer71, 1, wx.EXPAND, 5 ) - - self.m_staticline321 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline321, 0, wx.EXPAND, 5 ) - - self.m_staticline322 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline322, 0, wx.EXPAND, 5 ) - - self.m_staticText10111 = wx.StaticText( self, wx.ID_ANY, u"Largeur des arêtes\nproportionnelle à l'indice", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText10111.Wrap( -1 ) - fgSizer51.Add( self.m_staticText10111, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - bSizer711 = wx.BoxSizer( wx.HORIZONTAL ) - - self.check3 = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer711.Add( self.check3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - fgSizer711 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer711.SetFlexibleDirection( wx.BOTH ) - fgSizer711.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - - self.m_staticText1111 = wx.StaticText( self, wx.ID_ANY, u"min", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText1111.Wrap( -1 ) - fgSizer711.Add( self.m_staticText1111, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_temin = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 0 ) - fgSizer711.Add( self.spin_temin, 0, wx.ALL, 5 ) - - self.m_staticText1211 = wx.StaticText( self, wx.ID_ANY, u"max", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText1211.Wrap( -1 ) - fgSizer711.Add( self.m_staticText1211, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.spin_temax = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 0 ) - fgSizer711.Add( self.spin_temax, 0, wx.ALL, 5 ) - - bSizer711.Add( fgSizer711, 1, wx.EXPAND, 5 ) - - fgSizer51.Add( bSizer711, 1, wx.EXPAND, 5 ) - - self.m_staticline33 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline33, 0, wx.EXPAND, 5 ) - - self.m_staticline34 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline34, 0, wx.EXPAND, 5 ) - - self.m_staticText28 = wx.StaticText( self, wx.ID_ANY, u"Gradiant de gris sur les textes en fonction \nde l'effectif (du chi2) (0=noir; 1=blanc)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText28.Wrap( -1 ) - fgSizer51.Add( self.m_staticText28, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - bSizer10 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_checkBox14 = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer10.Add( self.m_checkBox14, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - bSizer11 = wx.BoxSizer( wx.VERTICAL ) - - bSizer12 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText31 = wx.StaticText( self, wx.ID_ANY, u"min", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText31.Wrap( -1 ) - bSizer12.Add( self.m_staticText31, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.m_spinCtrl14 = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 10, 0 ) - bSizer12.Add( self.m_spinCtrl14, 0, wx.ALL, 5 ) - - bSizer11.Add( bSizer12, 1, wx.EXPAND, 5 ) - - bSizer13 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText32 = wx.StaticText( self, wx.ID_ANY, u"max", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText32.Wrap( -1 ) - bSizer13.Add( self.m_staticText32, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.m_spinCtrl15 = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 10, 10 ) - bSizer13.Add( self.m_spinCtrl15, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - bSizer11.Add( bSizer13, 1, wx.EXPAND, 5 ) - - bSizer10.Add( bSizer11, 1, wx.EXPAND, 5 ) - - fgSizer51.Add( bSizer10, 1, wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 ) - - self.m_staticline3311 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline3311, 0, wx.EXPAND |wx.ALL, 5 ) - - self.m_staticline33111 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline33111, 0, wx.EXPAND |wx.ALL, 5 ) - bSizer5 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText21 = wx.StaticText( self, wx.ID_ANY, u"Couleur des sommets", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText21.Wrap( -1 ) - bSizer5.Add( self.m_staticText21, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.cols = wx.ColourPickerCtrl( self, wx.ID_ANY, wx.Colour( 255, 0, 0 ), wx.DefaultPosition, wx.Size( 10,10 ), wx.CLRP_DEFAULT_STYLE ) - bSizer5.Add( self.cols, 0, wx.ALL, 5 ) - - fgSizer51.Add( bSizer5, 1, wx.EXPAND, 5 ) - - bSizer6 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText22 = wx.StaticText( self, wx.ID_ANY, u"Couleur des arêtes", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText22.Wrap( -1 ) - bSizer6.Add( self.m_staticText22, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.cola = wx.ColourPickerCtrl( self, wx.ID_ANY, wx.Colour( 208, 208, 208 ), wx.DefaultPosition, wx.DefaultSize, wx.CLRP_DEFAULT_STYLE ) - bSizer6.Add( self.cola, 0, wx.ALL, 5 ) - - fgSizer51.Add( bSizer6, 1, wx.EXPAND, 5 ) - - self.m_staticline331 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline331, 0, wx.EXPAND, 5 ) - - self.m_staticline332 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline332, 0, wx.EXPAND, 5 ) - - self.m_staticText23 = wx.StaticText( self, wx.ID_ANY, u"Taille des sommets unique", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText23.Wrap( -1 ) - fgSizer51.Add( self.m_staticText23, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - bSizer72 = wx.BoxSizer( wx.HORIZONTAL ) - - self.check_s_size = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer72.Add( self.check_s_size, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.spin_tv = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 100, 10 ) - bSizer72.Add( self.spin_tv, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - fgSizer51.Add( bSizer72, 1, wx.EXPAND, 5 ) - - self.m_staticline333 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline333, 0, wx.EXPAND, 5 ) - - self.m_staticline334 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline334, 0, wx.EXPAND, 5 ) - - self.m_staticText24 = wx.StaticText( self, wx.ID_ANY, u"Transparence des sphères", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText24.Wrap( -1 ) - fgSizer51.Add( self.m_staticText24, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.slider_sphere = wx.Slider( self, wx.ID_ANY, 10, 0, 100, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL|wx.SL_LABELS ) - fgSizer51.Add( self.slider_sphere, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline335 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline335, 0, wx.EXPAND, 5 ) - - self.m_staticline336 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline336, 0, wx.EXPAND, 5 ) - - self.m_staticText25 = wx.StaticText( self, wx.ID_ANY, u"Faire un film", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText25.Wrap( -1 ) - fgSizer51.Add( self.m_staticText25, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.film = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer51.Add( self.film, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - - self.m_staticline2918 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline2918, 0, wx.EXPAND, 5 ) - - self.m_staticline2919 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer51.Add( self.m_staticline2919, 0, wx.EXPAND, 5 ) - - - fgSizer51.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 ) - - m_sdbSizer2 = wx.StdDialogButtonSizer() - self.m_sdbSizer2OK = wx.Button( self, wx.ID_OK ) - m_sdbSizer2.AddButton( self.m_sdbSizer2OK ) - self.m_sdbSizer2Cancel = wx.Button( self, wx.ID_CANCEL ) - m_sdbSizer2.AddButton( self.m_sdbSizer2Cancel ) - m_sdbSizer2.Realize(); - fgSizer51.Add( m_sdbSizer2, 1, wx.EXPAND, 5 ) - - fgSizer5.Add( fgSizer51, 1, wx.EXPAND, 5 ) - - self.SetSizer( fgSizer5 ) - self.__set_properties() - - self.Layout() - fgSizer5.Fit( self ) - - self.Centre( wx.BOTH ) - - # Connect Events - if not self.paramsimi['first'] : - self.check_coord.Bind( wx.EVT_CHECKBOX, self.OnKeepCoords ) - self.choice3.Bind( wx.EVT_CHOICE, self.OnChangeType ) - self.check2.Bind( wx.EVT_CHECKBOX, self.OnCheck2 ) - if 'cexfromchi' in self.paramsimi : - self.checkit.Bind( wx.EVT_CHECKBOX, self.OnCheckit ) - if 'sfromchi' in self.paramsimi : - self.checki.Bind( wx.EVT_CHECKBOX, self.OnChecki ) - self.check_vcex.Bind( wx.EVT_CHECKBOX, self.OnCheck_vcex ) - self.check_s_size.Bind( wx.EVT_CHECKBOX, self.OnCheck_s_size ) - - def __set_properties(self): - self.choice1.SetSelection(self.paramsimi['coeff']) - self.choice2.SetSelection(self.paramsimi['layout']) - self.choice3.SetSelection(self.paramsimi['type']) - if self.paramsimi['type'] != 2 : - self.film.Enable(False) - self.slider_sphere.Enable(False) - else : - self.film.Enable(True) - self.slider_sphere.Enable(True) - self.check1.SetValue(self.paramsimi['arbremax']) - self.check_vlab.SetValue(self.paramsimi['label_v']) - self.check_elab.SetValue(self.paramsimi['label_e']) - self.check2.SetValue(self.paramsimi['tvprop']) - self.spin_tv.SetValue(self.paramsimi['coeff_tv_nb']) - self.check_s_size.SetValue(self.paramsimi['coeff_tv']) - self.spin_tvmin.SetValue(self.paramsimi['tvmin']) - self.spin_tvmax.SetValue(self.paramsimi['tvmax']) - self.check3.SetValue(self.paramsimi['coeff_te']) - self.spin_temin.SetValue(self.paramsimi['coeff_temin']) - self.spin_temax.SetValue(self.paramsimi['coeff_temax']) - self.check_vcex.SetValue(self.paramsimi['vcex']) - self.spin_vcexmin.SetValue(self.paramsimi['vcexmin']) - self.spin_vcexmax.SetValue(self.paramsimi['vcexmax']) - self.spin_cex.SetValue(self.paramsimi['cex']) - self.check_seuil.SetValue(self.paramsimi['seuil_ok']) - self.spin_seuil.SetValue(self.paramsimi['seuil']) - self.cols.SetColour(self.paramsimi['cols']) - self.cola.SetColour(self.paramsimi['cola']) - self.spin_width.SetValue(self.paramsimi['width']) - self.spin_height.SetValue(self.paramsimi['height']) - if 'cexfromchi' in self.paramsimi : - self.checkit.SetValue(self.paramsimi['cexfromchi']) - if 'sfromchi' in self.paramsimi : - self.checki.SetValue(self.paramsimi['sfromchi']) - if not self.paramsimi['first'] : - self.check_coord.SetValue(self.paramsimi['keep_coord']) - self.OnKeepCoords(wx.EVT_CHECKBOX) - if self.paramsimi.get('bystar', False) : - self.check_bystar.SetValue(True) - self.stars = self.paramsimi['stars'] - self.slider_sphere.SetValue(self.paramsimi['alpha']) - self.film.SetValue(self.paramsimi['film']) - - def OnCheck_s_size(self, evt): - if self.check_s_size.GetValue() : - if 'cexfromchi' in self.paramsimi : - self.checki.SetValue(False) - self.check2.SetValue(False) - self.spin_tvmin.Enable(False) - self.spin_tvmax.Enable(False) - self.spin_tv.Enable(True) - else : - self.check2.SetValue(True) - self.spin_tvmin.Enable(True) - self.spin_tvmax.Enable(True) - self.spin_tv.Enable(False) - - def OnCheck2(self, evt): - if self.check2.GetValue(): - self.check_s_size.SetValue(False) - if 'cexfromchi' in self.paramsimi : - self.checki.SetValue(False) - self.spin_tvmin.Enable(True) - self.spin_tvmax.Enable(True) - self.spin_tv.Enable(False) - else : - self.check_s_size.SetValue(True) - self.spin_tvmin.Enable(False) - self.spin_tvmax.Enable(False) - self.spin_tv.Enable(True) - - def OnChecki(self, evt): - if 'sfromchi' in self.paramsimi : - if self.checki.GetValue() : - self.check_s_size.SetValue(False) - self.check2.SetValue(False) - self.spin_tvmin.Enable(True) - self.spin_tvmax.Enable(True) - self.spin_tv.Enable(False) - else : - self.check_s_size.SetValue(True) - #self.check2.SetValue(True) - self.spin_tvmin.Enable(False) - self.spin_tvmax.Enable(False) - self.spin_tv.Enable(True) - - def OnCheckit(self,evt) : - if 'cexfromchi' in self.paramsimi : - if self.checkit.GetValue() : - if self.check_vcex.GetValue() : - self.check_vcex.SetValue(False) - - def OnCheck_vcex(self, evt): - if self.check_vcex.GetValue() : - if 'checkit' in dir(self) : - if self.checkit.GetValue() : - self.checkit.SetValue(False) - - def OnChangeType(self, event) : - if event.GetInt() != 1 : - self.spin_width.Enable(False) - self.spin_height.Enable(False) - else : - self.spin_width.Enable(True) - self.spin_height.Enable(True) - if event.GetInt() != 2 : - self.film.Enable(False) - self.slider_sphere.Enable(False) - else : - self.film.Enable(True) - self.slider_sphere.Enable(True) - - def OnKeepCoords(self, event): - if self.check_coord.GetValue() : - self.choice1.SetSelection(self.paramsimi['coeff']) - self.choice2.SetSelection(self.paramsimi['layout']) - self.check_seuil.SetValue(self.paramsimi['seuil_ok']) - self.spin_seuil.SetValue(self.paramsimi['seuil']) - self.choice1.Disable() - self.choice2.Disable() - self.check_seuil.Disable() - self.spin_seuil.Disable() - self.check_colch.SetValue(False) - self.check_colch.Disable() - else : - self.choice1.Enable(True) - self.choice2.Enable(True) - self.check_seuil.Enable(True) - self.spin_seuil.Enable(True) - self.check_colch.Enable(True) class SelectColDial ( wx.Dialog ): def __init__( self, parent ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.Size( 200,300 ), style = wx.DEFAULT_DIALOG_STYLE ) + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.Size( 400,500 ), style = wx.DEFAULT_DIALOG_STYLE ) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) @@ -1502,7 +942,8 @@ class SelectColDial ( wx.Dialog ): #bSizer2.Add( self.m_checkList2, 2, wx.ALL|wx.EXPAND, 5 ) self.m_sdbSizer2 = wx.StdDialogButtonSizer() - self.m_sdbSizer2OK = wx.Button( self, wx.ID_OK ) + self.m_sdbSizer2OK = wx.Button( self, wx.ID_CANCEL) + self.butok = wx.Button( self, wx.ID_OK) #m_sdbSizer2.AddButton( self.m_sdbSizer2OK ) #self.m_sdbSizer2Cancel = wx.Button( self, wx.ID_CANCEL ) #m_sdbSizer2.AddButton( self.m_sdbSizer2Cancel ) @@ -1652,18 +1093,8 @@ class StatDialog(wx.Dialog): wx.Dialog.__init__(self, *args, **kwds) self.fileout = "" self.parent = parent - #box = wx.BoxSizer(wx.HORIZONTAL) self.label_lem = wx.StaticText(self, -1, u"Lemmatisation") self.radio_lem = wx.RadioBox(self, -1, u"", choices=['oui', 'non'], majorDimension=0, style=wx.RA_SPECIFY_ROWS) - #sizer.Add(box, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5) - #box2 = wx.BoxSizer(wx.HORIZONTAL) - #self.txt_exp = wx.StaticText(self, -1, u"Utiliser le Dict. des expressions") - #self.exp = wx.RadioBox(self, -1, u"", choices=['oui', 'non'], majorDimension=0, style=wx.RA_SPECIFY_ROWS) - #self.label_uce = wx.StaticText(self, -1, u"Construire des UCE") - #self.check_uce = wx.CheckBox(self, -1) - #txt = """Nombre d'occurrences par uce""" - #self.label_occuce = wx.StaticText(self, -1, txt) - #self.spin_ctrl_4 = wx.SpinCtrl(self, -1, "",size = (100,30), min=10, max=1000, initial = 35) #txt = u"""Fréquence minimum d'une forme #analysée (0 = non utilisé)""" #self.label_8 = wx.StaticText(self, -1, txt) @@ -1681,7 +1112,7 @@ class StatDialog(wx.Dialog): def __do_layout(self) : first = wx.BoxSizer(wx.VERTICAL) - sizer = wx.FlexGridSizer(4,2,0,0) + sizer = wx.FlexGridSizer(0,2,0,0) sizer.Add(self.label_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5) sizer.Add(self.radio_lem, 0, wx.ALIGN_LEFT, 5) sizer.Add(wx.StaticLine(self),0, wx.ALIGN_LEFT, 5) @@ -1715,33 +1146,15 @@ class StatDialog(wx.Dialog): def __set_properties(self) : self.SetTitle(u'Préférences') - #self.spin_ctrl_4.Enable(False) - #self.spin_ctrl_5.Enable(False) - #self.spin_max_actives.Enable(False) - -# def OnCheckUce(self, evt) : -# if self.check_uce.GetValue() : -# self.spin_ctrl_4.Enable(True) -# self.spin_ctrl_5.Enable(True) -# if self.spin_ctrl_5.GetValue() > 0 : -# self.spin_max_actives.Enable(False) -# else : -# self.spin_max_actives.Enable(True) -# else : -# self.spin_ctrl_4.Enable(False) -# self.spin_ctrl_5.Enable(False) -# self.spin_max_actives.Enable(False) - -# def OnSpin(self, evt) : -# if self.spin_ctrl_5.GetValue() > 0 : -# self.spin_max_actives.Enable(False) -# else : -# self.spin_max_actives.Enable(True) def OnKeys(self, evt): - dial = AlcOptFrame(self.parent, self) + dial = AlcOptFrame(self, self.parent.parent) dial.CenterOnParent() - val = dial.ShowModal() + dial.ShowModal() + for i in range(0,len(dial.listlabel)): + dial.keys[dial.listcle[i]] = dial.listspin[i].GetValue() + DoConf().makeoptions(['KEY'], [dial.keys], outfile = self.parent.parent.ConfigPath['key']) + dial.Destroy() class LexDialog( wx.Dialog ): @@ -1752,7 +1165,7 @@ class LexDialog( wx.Dialog ): bSizer2 = wx.BoxSizer( wx.VERTICAL ) - fgSizer2 = wx.FlexGridSizer( 2, 2, 0, 0 ) + fgSizer2 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer2.SetFlexibleDirection( wx.BOTH ) fgSizer2.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -1792,18 +1205,19 @@ class LexDialog( wx.Dialog ): class PrefUCECarac(wx.Dialog): def __init__(self, parent, *args, **kwds): kwds['style'] = wx.DEFAULT_DIALOG_STYLE - kwds['title'] = u"UCE caractéristiques" + kwds['title'] = u"Segments de texte caractéristiques" wx.Dialog.__init__(self, *args, **kwds) self.parent = parent first = wx.BoxSizer(wx.VERTICAL) - sizer = wx.FlexGridSizer(2,2,0,0) + sizer = wx.FlexGridSizer(0,2,0,0) self.label_type = wx.StaticText(self, -1, u"Score de classement") sizer.Add(self.label_type, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5) - self.radio_type = wx.RadioBox(self, -1, u"", choices=[u'absolu (somme des chi2 des formes marquées de l\'UCE)', u'relatif (moyenne des chi2 des formes marquées de l\'UCE)'], majorDimension=0, style=wx.RA_SPECIFY_ROWS) + self.radio_type = wx.RadioBox(self, -1, u"", choices=[u'absolu (somme des chi2 des formes marquées du segment)', u'relatif (moyenne des chi2 des formes marquées du segment)'], majorDimension=0, style=wx.RA_SPECIFY_ROWS) sizer.Add(self.radio_type, 0, wx.ALIGN_RIGHT, 5) - self.txt_eff = wx.StaticText(self, -1, u"Nombre d\'UCE maximum") + self.txt_eff = wx.StaticText(self, -1, u"Nombre maximum de segments de texte") sizer.Add(self.txt_eff, 0, wx.ALIGN_CENTRE, 5) self.spin_eff = wx.SpinCtrl(self, -1, '', size = (100, 30), min = 1, max = 100000, initial = 50) + self.spin_eff.SetValue(50) sizer.Add(self.spin_eff, 0, wx.ALIGN_CENTRE|wx.ALL, 5) first.Add(sizer, 0, wx.ALL, 5) btnsizer = wx.StdDialogButtonSizer() @@ -1827,7 +1241,7 @@ class PrefSegProf(wx.Dialog) : self.label = wx.StaticText( self, wx.ID_ANY, txt, wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer1.Add( self.label, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5 ) - fgSizer1 = wx.FlexGridSizer( 2, 2, 0, 0 ) + fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -1898,7 +1312,7 @@ class PrefQuestAlc ( wx.Dialog ): #--------------------------------------------------------------- bSizer2 = wx.BoxSizer( wx.VERTICAL ) - fgSizer1 = wx.FlexGridSizer( 2, 2, 0, 0 ) + fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -2054,7 +1468,7 @@ class FindInCluster(wx.Frame): # begin wxGlade: MyFrame.__init__ wx.Frame.__init__(self, parent, id) self.spanel = wx.ScrolledWindow(self, -1, style=wx.TAB_TRAVERSAL) - self.sizer1 = wx.FlexGridSizer(len(result)+1,4,0,0) + self.sizer1 = wx.FlexGridSizer(0,4,0,0) self.parent = parent self.formes = {} txt = [u'forme',u'classe',u'chi2',u'voir'] @@ -2128,11 +1542,11 @@ class FindInCluster(wx.Frame): cl = self.formes[idb][1] - 1 forme = self.formes[idb][0] profile.ProfNB.SetSelection(cl) - UnSelectList(profile.ProfNB.GetPage(cl).list) - datas = dict([[profile.ProfNB.GetPage(cl).getColumnText(i,6),i] for i in range(profile.ProfNB.GetPage(cl).list.GetItemCount())]) - profile.ProfNB.GetPage(cl).list.SetItemState(datas[self.formes[idb][0]], wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) - profile.ProfNB.GetPage(cl).list.Focus(datas[forme]) - profile.ProfNB.GetPage(cl).list.SetFocus() + UnSelectList(profile.ProfNB.GetPage(cl)) + datas = dict([[profile.ProfNB.GetPage(cl).getColumnText(i,6),i] for i in range(profile.ProfNB.GetPage(cl).GetItemCount())]) + profile.ProfNB.GetPage(cl).SetItemState(datas[self.formes[idb][0]], wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) + profile.ProfNB.GetPage(cl).Focus(datas[forme]) + profile.ProfNB.GetPage(cl).SetFocus() def OnCloseMe(self, evt) : self.Close(True) @@ -2140,10 +1554,10 @@ class FindInCluster(wx.Frame): def OnCloseWindow(self, evt): self.Destroy() -class SearchDial ( wx.Dialog ): +class SearchDial ( wx.Frame ): def __init__( self, parent, listctrl, col, shown): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE ) self.parent = parent self.listctrl = listctrl self.col = col @@ -2181,10 +1595,10 @@ class SearchDial ( wx.Dialog ): pass def OnSearch(self, evt): - UnSelectList(self.listctrl.list) + UnSelectList(self.listctrl) search_word = self.search.GetValue() if search_word.strip() != '' : - formes = [self.listctrl.getColumnText(i, self.col) for i in range(self.listctrl.list.GetItemCount())] + formes = [self.listctrl.getColumnText(i, self.col) for i in range(self.listctrl.GetItemCount())] if search_word.endswith(u'*') : search_word = search_word[0:-1] result = [j for j, forme in enumerate(formes) if forme.startswith(search_word)] @@ -2202,15 +1616,15 @@ class SearchDial ( wx.Dialog ): def showitems(self, items) : if len(items) == 1 : - self.listctrl.list.SetItemState(items[0], wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) - self.listctrl.list.Focus(items[0]) - self.listctrl.list.SetFocus() + self.listctrl.SetItemState(items[0], wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) + self.listctrl.Focus(items[0]) + self.listctrl.SetFocus() self.Destroy() else : for i in items : - self.listctrl.list.SetItemState(i, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) - self.listctrl.list.Focus(items[0]) - self.listctrl.list.SetFocus() + self.listctrl.SetItemState(i, wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) + self.listctrl.Focus(items[0]) + self.listctrl.SetFocus() self.forward.Enable(True) self.backward.Enable(False) self.items = items @@ -2228,12 +1642,12 @@ class SearchDial ( wx.Dialog ): first_forme = proflist[0] cl = first_forme[1] - 1 profile.ProfNB.SetSelection(cl) - profile.ProfNB.GetPage(cl).list.SetFocus() - UnSelectList(profile.ProfNB.GetPage(cl).list) - datas = dict([[profile.ProfNB.GetPage(cl).getColumnText(i,6),i] for i in range(profile.ProfNB.GetPage(cl).list.GetItemCount())]) - profile.ProfNB.GetPage(cl).list.SetItemState(datas[first_forme[0]], wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) - profile.ProfNB.GetPage(cl).list.Focus(datas[first_forme[0]]) - profile.ProfNB.GetPage(cl).list.SetFocus() + profile.ProfNB.GetPage(cl).SetFocus() + UnSelectList(profile.ProfNB.GetPage(cl)) + datas = dict([[profile.ProfNB.GetPage(cl).getColumnText(i,6),i] for i in range(profile.ProfNB.GetPage(cl).GetItemCount())]) + profile.ProfNB.GetPage(cl).SetItemState(datas[first_forme[0]], wx.LIST_STATE_SELECTED, wx.LIST_STATE_SELECTED) + profile.ProfNB.GetPage(cl).Focus(datas[first_forme[0]]) + profile.ProfNB.GetPage(cl).SetFocus() if len(proflist) == 1 : self.Destroy() else : @@ -2244,8 +1658,8 @@ class SearchDial ( wx.Dialog ): self.noresult() def onforward(self, evt) : - self.listctrl.list.Focus(self.items[self.forwitem]) - self.listctrl.list.SetFocus() + self.listctrl.Focus(self.items[self.forwitem]) + self.listctrl.SetFocus() self.forwitem += 1 if self.forwitem == len(self.items) : self.forward.Enable(False) @@ -2256,8 +1670,8 @@ class SearchDial ( wx.Dialog ): self.backward.Enable(True) def onbackward(self, evt) : - self.listctrl.list.Focus(self.items[self.backitem]) - self.listctrl.list.SetFocus() + self.listctrl.Focus(self.items[self.backitem]) + self.listctrl.SetFocus() self.backitem -= 1 if self.backitem == -1 : self.forwitem -= 1 @@ -2287,24 +1701,30 @@ def UnSelectList(liste) : class OptLexi(wx.Dialog): - def __init__(self, *args, **kwds): + def __init__(self, parent, force_chi = False): # begin wxGlade: MyDialog.__init__ - kwds["style"] = wx.DEFAULT_DIALOG_STYLE - wx.Dialog.__init__(self, *args, **kwds) + #kwds["style"] = wx.DEFAULT_DIALOG_STYLE + wx.Dialog.__init__(self, parent, style = wx.DEFAULT_DIALOG_STYLE) self.listet = None self.variables = None - self.labellem = wx.StaticText(self, -1, u"Lemmatisation : ") - self.checklem = wx.CheckBox(self, -1) + self.force_chi = force_chi + #self.labellem = wx.StaticText(self, -1, u"Lemmatisation : ") + #self.checklem = wx.CheckBox(self, -1) self.label_var = wx.StaticText(self, -1, u"Sélection par :") self.choice = wx.Choice(self, -1, (100,50), choices = [u'variables', u'modalités']) self.label1 = wx.StaticText(self, -1, u"Choix") self.list_box_1 = wx.ListBox(self, -1, choices=[], size = wx.Size( 150,200 ), style=wx.LB_EXTENDED | wx.LB_HSCROLL) self.button_2 = wx.Button(self, wx.ID_CANCEL, "") self.button_1 = wx.Button(self, wx.ID_OK, "") + if not self.force_chi : + indices = [u'loi hypergéométique', u'chi2'] + else : + indices = [u'chi2'] self.label_indice = wx.StaticText(self, -1, u"indice") - self.choice_indice = wx.Choice(self, -1, (100,50), choices = [u'loi hypergéométique', u'chi2']) - self.label = wx.StaticText(self, -1, u"effectif minimum") - self.spin = wx.SpinCtrl(self, -1, min = 1, max = 10000) + self.choice_indice = wx.Choice(self, -1, (100,50), choices = indices) + if not self.force_chi : + self.label = wx.StaticText(self, -1, u"effectif minimum") + self.spin = wx.SpinCtrl(self, -1, min = 1, max = 10000, initial = 10) self.Bind(wx.EVT_CHOICE, self.onselect, self.choice) self.__set_properties() self.__do_layout() @@ -2313,18 +1733,20 @@ class OptLexi(wx.Dialog): def __set_properties(self): # begin wxGlade: MyDialog.__set_properties self.SetTitle("Choix des variables") - self.spin.SetValue(10) + if not self.force_chi : + self.spin.SetValue(10) self.choice.SetSelection(0) + self.choice_indice.SetSelection(0) #self.SetMinSize(wx.Size(300, 400)) # end wxGlade def __do_layout(self): # begin wxGlade: MyDialog.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2 = wx.FlexGridSizer(2,2,0,0) + sizer_2 = wx.FlexGridSizer(0,2,0,0) sizer_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2.Add(self.labellem, 0, wx.ALIGN_CENTER_VERTICAL, 3) - sizer_2.Add(self.checklem, 0, wx.ALIGN_CENTER_VERTICAL, 3) + #sizer_2.Add(self.labellem, 0, wx.ALIGN_CENTER_VERTICAL, 3) + #sizer_2.Add(self.checklem, 0, wx.ALIGN_CENTER_VERTICAL, 3) sizer_2.Add(self.label_var, 0, wx.ALIGN_CENTER_VERTICAL, 3) sizer_2.Add(self.choice, 0, wx.ALIGN_CENTER_VERTICAL, 3) sizer_2.Add(self.label1, 0, wx.ALIGN_CENTER_VERTICAL, 3) @@ -2333,8 +1755,9 @@ class OptLexi(wx.Dialog): sizer_3.Add(self.button_1, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 3) sizer_2.Add(self.label_indice, 0, wx.ALIGN_CENTER_VERTICAL, 3) sizer_2.Add(self.choice_indice, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 3) - sizer_2.Add(self.label, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 3) - sizer_2.Add(self.spin, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 3) + if not self.force_chi : + sizer_2.Add(self.label, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 3) + sizer_2.Add(self.spin, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 3) sizer_1.Add(sizer_2, 0, wx.ALIGN_CENTER_HORIZONTAL, 3) sizer_1.Add(sizer_3, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 3) self.SetSizer(sizer_1) @@ -2493,18 +1916,18 @@ class PrefWordCloud ( wx.Dialog ): fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Sélectionner les formes", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText1.Wrap( -1 ) - fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) + #self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Sélectionner les formes", wx.DefaultPosition, wx.DefaultSize, 0 ) + #self.m_staticText1.Wrap( -1 ) + #fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) - self.but_selectcol = wx.Button( self, wx.ID_ANY, u"Sélectionner", wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.but_selectcol, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + #self.but_selectcol = wx.Button( self, wx.ID_ANY, u"Sélectionner", wx.DefaultPosition, wx.DefaultSize, 0 ) + #fgSizer1.Add( self.but_selectcol, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_staticline1 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer1.Add( self.m_staticline1, 0, wx.EXPAND |wx.ALL, 5 ) + #self.m_staticline1 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + #fgSizer1.Add( self.m_staticline1, 0, wx.EXPAND |wx.ALL, 5 ) - self.m_staticline2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - fgSizer1.Add( self.m_staticline2, 0, wx.EXPAND |wx.ALL, 5 ) + #self.m_staticline2 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + #fgSizer1.Add( self.m_staticline2, 0, wx.EXPAND |wx.ALL, 5 ) bSizer1 = wx.BoxSizer( wx.HORIZONTAL ) @@ -2513,6 +1936,7 @@ class PrefWordCloud ( wx.Dialog ): bSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) self.spin_H = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.Size( 100,30 ), wx.SP_ARROW_KEYS, 0, 10000, 600 ) + self.spin_H.SetValue( 800 ) bSizer1.Add( self.spin_H, 0, wx.ALL, 5 ) fgSizer1.Add( bSizer1, 1, wx.EXPAND, 5 ) @@ -2524,6 +1948,7 @@ class PrefWordCloud ( wx.Dialog ): bSizer3.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) self.spin_L = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.Size( 100,30 ), wx.SP_ARROW_KEYS, 0, 10000, 600 ) + self.spin_L.SetValue( 800 ) bSizer3.Add( self.spin_L, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) fgSizer1.Add( bSizer3, 1, wx.EXPAND, 5 ) @@ -2534,11 +1959,27 @@ class PrefWordCloud ( wx.Dialog ): self.m_staticline4 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) fgSizer1.Add( self.m_staticline4, 0, wx.EXPAND |wx.ALL, 5 ) + self.m_staticText11 = wx.StaticText( self, wx.ID_ANY, u"Format de l'image", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText11.Wrap( -1 ) + fgSizer1.Add( self.m_staticText11, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + formatChoices = [ u"png", u"svg" ] + self.format = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, formatChoices, 0 ) + self.format.SetSelection( 0 ) + fgSizer1.Add( self.format, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + self.m_staticline13 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + fgSizer1.Add( self.m_staticline13, 0, wx.EXPAND |wx.ALL, 5 ) + + self.m_staticline14 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + fgSizer1.Add( self.m_staticline14, 0, wx.EXPAND |wx.ALL, 5 ) + self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Nombre maximum de formes", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText5.Wrap( -1 ) fgSizer1.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) self.spin_maxword = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 10000, 600 ) + self.spin_maxword.SetValue( 600 ) fgSizer1.Add( self.spin_maxword, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.m_staticline5 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) @@ -2547,6 +1988,21 @@ class PrefWordCloud ( wx.Dialog ): self.m_staticline6 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) fgSizer1.Add( self.m_staticline6, 0, wx.EXPAND |wx.ALL, 5 ) + self.typeformes = wx.StaticText( self, wx.ID_ANY, u"formes retenues", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.typeformes.Wrap( -1 ) + fgSizer1.Add( self.typeformes, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + typeformeschoiceChoices = [ u"actives", u"supplémentaires", u"actives et supplémentaires" ] + self.typeformeschoice = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, typeformeschoiceChoices, 0 ) + self.typeformeschoice.SetSelection( 0 ) + fgSizer1.Add( self.typeformeschoice, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + self.m_staticline11 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + fgSizer1.Add( self.m_staticline11, 0, wx.EXPAND |wx.ALL, 5 ) + + self.m_staticline12 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + fgSizer1.Add( self.m_staticline12, 0, wx.EXPAND |wx.ALL, 5 ) + self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"Taille du texte", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText6.Wrap( -1 ) fgSizer1.Add( self.m_staticText6, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) @@ -2560,6 +2016,7 @@ class PrefWordCloud ( wx.Dialog ): bSizer5.Add( self.m_staticText7, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.spin_mincex = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 1000, 5 ) + self.spin_mincex.SetValue( 5 ) bSizer5.Add( self.spin_mincex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) bSizer4.Add( bSizer5, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 ) @@ -2571,6 +2028,7 @@ class PrefWordCloud ( wx.Dialog ): bSizer6.Add( self.m_staticText8, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.spin_maxcex = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 1000, 50 ) + self.spin_maxcex.SetValue( 50 ) bSizer6.Add( self.spin_maxcex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) bSizer4.Add( bSizer6, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 ) @@ -2764,11 +2222,12 @@ class CorpusPref ( wx.Dialog ): def __init__( self, parent, parametres ): wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Préférences", pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) self.parent = parent - langues_n = [u'français', u'english', u'german (expérimentale)', u'italian (expérimentale)'] - self.langues = [u'french', u'english', u'german', 'italian'] - self.encodages = encodages + langues_n = [u'français', u'english', u'german (expérimentale)', u'italian', u'swedish (expérimentale)', u'portuguese (expérimentale)', u'greek (expériementale)', u'autre...'] + self.langues = [u'french', u'english', u'german', 'italian', 'swedish', u'portuguese', 'greek', 'other'] + self.encodages = [enc[0].lower() for enc in encodages] + ucimark = [u'****', u'0000'] - ucemethod = [u'charactères', u'occurrences'] + ucemethod = [u'charactères', u'occurrences', u'paragraphes'] self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) @@ -2792,7 +2251,7 @@ class CorpusPref ( wx.Dialog ): self.m_staticText1.Wrap( -1 ) fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) - encodage_choicesChoices = [' - '.join(encodage) for encodage in self.encodages] + encodage_choicesChoices = [' - '.join(encodage) for encodage in encodages] self.encodage_choices = wx.Choice( self.m_panel1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, encodage_choicesChoices, 0 ) self.encodage_choices.SetSelection( 0 ) fgSizer1.Add( self.encodage_choices, 0, wx.ALL, 5 ) @@ -2896,7 +2355,7 @@ class CorpusPref ( wx.Dialog ): fgSizer4.Add( self.check_charact, 0, wx.ALL, 5 ) self.txt_charact = wx.TextCtrl( self.m_panel2, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - self.txt_charact.SetMinSize( wx.Size( 200,-1 ) ) + self.txt_charact.SetMinSize( wx.Size( 400,-1 ) ) fgSizer4.Add( self.txt_charact, 0, wx.ALL|wx.EXPAND, 5 ) @@ -2926,7 +2385,7 @@ class CorpusPref ( wx.Dialog ): self.check_ponct = wx.CheckBox( self.m_panel2, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) fgSizer3.Add( self.check_ponct, 0, wx.ALL, 5 ) - self.m_staticText16 = wx.StaticText( self.m_panel2, wx.ID_ANY, u"Pas d'espace entre deux formes (pour le chinois par exemple)", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText16 = wx.StaticText( self.m_panel2, wx.ID_ANY, u"Pas d'espace entre deux formes", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText16.Wrap( -1 ) fgSizer3.Add( self.m_staticText16, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) @@ -2968,7 +2427,14 @@ class CorpusPref ( wx.Dialog ): pass def setparametres(self, parametres) : - self.encodage_choices.SetSelection(0) + if locale.getpreferredencoding().lower() == 'mac-roman' : + enc = self.encodages.index('macroman') + else : + try : + enc = self.encodages.index(locale.getpreferredencoding().lower()) + except ValueError : + enc = self.encodages.index('utf-8') + self.encodage_choices.SetSelection(enc) self.lang_choices.SetSelection(0) self.repout_choices.SetValue(parametres['pathout']) self.ucimark_choices.SetSelection(parametres['ucimark']) @@ -2986,7 +2452,7 @@ class CorpusPref ( wx.Dialog ): def doparametres(self) : parametres = {} - parametres['encoding'] = self.encodages[self.encodage_choices.GetSelection()][0] + parametres['encoding'] = encodages[self.encodage_choices.GetSelection()][0] parametres['lang'] = self.langues[self.lang_choices.GetSelection()] parametres['pathout'] = self.repout_choices.GetValue() parametres['ucimark'] = self.ucimark_choices.GetSelection() @@ -3009,3 +2475,196 @@ class CorpusPref ( wx.Dialog ): parametres[val] = 0 return parametres +class message(wx.Dialog): + def __init__(self, parent, title, size, save = True): + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_DIALOG_STYLE ) + self.save = save + self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + + self.html = "" + self.HtmlPage=wx.html.HtmlWindow(self, -1) + self.HtmlPage.SetMinSize( size ) + if "gtk2" in wx.PlatformInfo: + self.HtmlPage.SetStandardFonts() + self.HtmlPage.SetFonts('Courier','Courier') + + self.button_1 = wx.Button(self, wx.ID_CANCEL) + + self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) + if self.save : + self.button_2 = wx.Button(self, wx.ID_SAVE) + self.Bind(wx.EVT_BUTTON, self.OnSavePage, self.button_2) + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) + self.__do_layout() + + def __do_layout(self): + sizer_2 = wx.BoxSizer(wx.VERTICAL) + sizer_2.Add(self.HtmlPage, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0) + m_sdbSizer1 = wx.StdDialogButtonSizer() + m_sdbSizer1.AddButton( self.button_1 ) + if self.save : + m_sdbSizer1.AddButton( self.button_2 ) + m_sdbSizer1.Realize() + sizer_2.Add(m_sdbSizer1, 1, wx.EXPAND, 5) + self.SetSizer(sizer_2) + self.Layout() + sizer_2.Fit( self ) + + def OnSavePage(self, evt) : + dlg = wx.FileDialog( + self, message="Enregistrer sous...", defaultDir=os.getcwd(), + defaultFile="concordancier.html", wildcard="html|*.html", style=wx.SAVE | wx.OVERWRITE_PROMPT + ) + dlg.SetFilterIndex(2) + dlg.CenterOnParent() + if dlg.ShowModal() == wx.ID_OK: + path = dlg.GetPath() + with open(path, 'w') as f : + f.write(self.html) + + def OnCloseMe(self, event): + self.Close(True) + + def OnCloseWindow(self, event): + self.Destroy() + +class ExtractDialog ( wx.Dialog ): + + def __init__( self, parent, option ): + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) + + self.option = option + + self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + + fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) + fgSizer1.SetFlexibleDirection( wx.BOTH ) + fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) + + self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Corpus", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText1.Wrap( -1 ) + fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) + + self.corpusfile = wx.FilePickerCtrl( self, wx.ID_ANY, wx.EmptyString, u"Select a file", u"*.txt", wx.DefaultPosition, wx.Size( -1,-1 ), wx.FLP_DEFAULT_STYLE|wx.FLP_FILE_MUST_EXIST|wx.FLP_OPEN ) + self.corpusfile.SetMinSize( wx.Size( 500,-1 ) ) + + fgSizer1.Add( self.corpusfile, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Encodage", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText2.Wrap( -1 ) + fgSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + encodageChoices = [' - '.join(encodage) for encodage in encodages] + self.encodage = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, encodageChoices, 0 ) + self.encodage.SetSelection( 0 ) + self.encodage.SetMinSize( wx.Size( 200,-1 ) ) + + fgSizer1.Add( self.encodage, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + if option == 'splitvar' : + self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Variable (avec * mais sans le _ )", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText3.Wrap( -1 ) + fgSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + self.txtvar = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.txtvar.SetMinSize( wx.Size( 200,-1 ) ) + + fgSizer1.Add( self.txtvar, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + if option == 'mods' : + self.m_staticText4 = wx.StaticText( self, wx.ID_ANY, u"Modalités (une par ligne, avec * )", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText4.Wrap( -1 ) + fgSizer1.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + self.txtmods = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_MULTILINE ) + self.txtmods.SetMinSize( wx.Size( 200,150 ) ) + + fgSizer1.Add( self.txtmods, 0, wx.ALL|wx.EXPAND, 5 ) + + self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Format de l'extraction", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText5.Wrap( -1 ) + fgSizer1.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + extractformatChoices = [ u"Un seul fichier", u"Un fichier par modalité" ] + self.extractformat = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, extractformatChoices, 1, wx.RA_SPECIFY_COLS ) + self.extractformat.SetSelection( 0 ) + fgSizer1.Add( self.extractformat, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + + fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 ) + + m_sdbSizer1 = wx.StdDialogButtonSizer() + self.m_sdbSizer1OK = wx.Button( self, wx.ID_OK ) + m_sdbSizer1.AddButton( self.m_sdbSizer1OK ) + self.m_sdbSizer1Cancel = wx.Button( self, wx.ID_CANCEL ) + m_sdbSizer1.AddButton( self.m_sdbSizer1Cancel ) + m_sdbSizer1.Realize(); + + fgSizer1.Add( m_sdbSizer1, 1, wx.EXPAND, 5 ) + + + self.SetSizer( fgSizer1 ) + self.Layout() + fgSizer1.Fit( self ) + + self.Centre( wx.BOTH ) + + def make_param(self) : + parametres = {} + le = [enc[0].lower() for enc in encodages] + parametres['filein'] = self.corpusfile.GetPath() + encodage = le[self.encodage.GetSelection()] + parametres['encodein'] = encodage + if self.option == 'splitvar' : + parametres['var'] = self.txtvar.GetValue() + if self.option == 'mods' : + parametres['mods'] = self.txtmods.GetValue().splitlines() + if self.extractformat.GetSelection() == 0 : + parametres['onefile'] = True + else : + parametres['onefile'] = False + parametres['encodeout'] = locale.getpreferredencoding() + return parametres + + def __del__( self ): + pass + +class FreqDialog(wx.Dialog): + def __init__(self, parent, ID, listcol, title, size) : + wx.Dialog.__init__(self, parent, ID, title, size=size, pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE | wx.CANCEL | wx.OK ) + pre = wx.PreDialog() + pre.SetExtraStyle(wx.DIALOG_EX_CONTEXTHELP) + pre.Create(parent, ID, title, wx.DefaultPosition, size, wx.DEFAULT_DIALOG_STYLE | wx.CANCEL | wx.OK) + self.PostCreate(pre) + self.parent = parent + sizer = wx.BoxSizer(wx.VERTICAL) + #self.content = parent.content + self.header = listcol + #LABELLIST = [] + #for i in self.header: + # forme = i + # if len(forme) > 60 : + # LABELLIST.append(i[0:60]) + # else: + # LABELLIST.append(i) + self.list_box_1 = wx.ListBox(self, -1, choices=self.header, style=wx.LB_EXTENDED | wx.LB_HSCROLL) + sizer.Add(self.list_box_1, 0, 5) + + btnsizer = wx.BoxSizer(wx.HORIZONTAL) + + btn = wx.Button(self, wx.ID_CANCEL) + btn.SetHelpText("Annuler") + btnsizer.Add(btn) + + btn = wx.Button(self, wx.ID_OK) + btn.SetHelpText("Valider") + btn.SetDefault() + btnsizer.Add(btn) + + sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_CENTER_HORIZONTAL, 5) + self.SetSizer(sizer) + sizer.Fit(self) + self.SetTitle(u"Sélection") + + # end wxGlade +