X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=guifunct.py;h=9fb70b00bcb257a045b69f3d87ea788cb5b3ad2d;hp=a98f6e1e73b788359dfc4fad43b23b989900344f;hb=b5c29c4ff9eaa0979a0bb524d9395301c447783d;hpb=9807dd4ff12bb4206359404461c7170361e35d67 diff --git a/guifunct.py b/guifunct.py index a98f6e1..9fb70b0 100644 --- a/guifunct.py +++ b/guifunct.py @@ -11,6 +11,7 @@ import dialog 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,7 +42,7 @@ 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] @@ -58,6 +59,7 @@ def get_table_param(self, filename) : if self.tableau.parametres['colsep'] == 'tabulation' : self.tableau.parametres['colsep'] = '\t' 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), style=wx.DEFAULT_DIALOG_STYLE) @@ -148,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 : @@ -169,7 +172,16 @@ class PrefSimi ( wx.Dialog ): if wordlist is not None : self.listcol = ListForSpec(self, self, wordlist, ['eff']) self.listcol.SetMinSize( wx.Size( 270,-1 ) ) - bSizer16.Add( self.listcol, 0, wx.ALL|wx.EXPAND, 5 ) + listsizer = wx.BoxSizer( wx.VERTICAL ) + countsizer = wx.BoxSizer( wx.HORIZONTAL ) + self.butcount = wx.Button(self, -1, "count") + 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 ) + listsizer.Add(countsizer, 0, wx.ALL, 5) + listsizer.Add(self.listcol, 2, wx.ALL|wx.EXPAND, 5 ) + #bSizer16.Add( self.listcol, 0, wx.ALL|wx.EXPAND, 5 ) + bSizer16.Add( listsizer, 0, wx.ALL|wx.EXPAND, 5) if selected is None : for row in xrange(self.listcol.GetItemCount()): self.listcol.Select(row) @@ -240,7 +252,7 @@ class PrefSimi ( wx.Dialog ): 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", u'web2D', u"web3D" ] + choice3Choices = [ u"dynamique", u"statique", u"3D"]#, u'web2D', u"web3D" ] self.choice3 = wx.Choice( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, choice3Choices, 0 ) self.choice3.SetSelection( 0 ) @@ -313,6 +325,19 @@ class PrefSimi ( wx.Dialog ): self.check_elab = wx.CheckBox( self.m_panel2, 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_staticline39 = wx.StaticLine( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + fgSizer3.Add( self.m_staticline39, 0, wx.EXPAND |wx.ALL, 5 ) + + 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").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 ) + + self.check_curved = wx.CheckBox( self.m_panel2, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + fgSizer3.Add( self.check_curved, 0, wx.ALL, 5 ) + self.m_staticline2914 = wx.StaticLine( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) fgSizer3.Add( self.m_staticline2914, 0, wx.EXPAND, 5 ) @@ -599,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 ) @@ -705,16 +730,6 @@ class PrefSimi ( wx.Dialog ): self.__set_properties() # 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 ) - # self.checki.Bind( wx.EVT_CHECKBOX, self.OnChecki ) - # self.check_vcex.Bind( wx.EVT_CHECKBOX, self.OnCheck_vcex ) - # self.checkit.Bind( wx.EVT_CHECKBOX, self.OnCheckit ) - # self.check_s_size.Bind( wx.EVT_CHECKBOX, self.OnCheck_s_size ) - - # Connect Events if not self.paramsimi['first'] : self.check_coord.Bind( wx.EVT_CHECKBOX, self.OnKeepCoords ) self.choice3.Bind( wx.EVT_CHOICE, self.OnChangeType ) @@ -725,6 +740,11 @@ class PrefSimi ( wx.Dialog ): 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 ) + self.listcol.Bind( wx.EVT_LIST_ITEM_SELECTED, self.ChangeCount) + self.listcol.Bind( wx.EVT_LIST_ITEM_DESELECTED, self.ChangeCount) + self.butcount.Bind( wx.EVT_BUTTON, self.ChangeCount) + self.ChangeCount(wx.EVT_BUTTON) + def __set_properties(self): self.choice1.SetSelection(self.paramsimi['coeff']) @@ -772,6 +792,10 @@ class PrefSimi ( wx.Dialog ): self.comcheck.SetValue(self.paramsimi['com']) self.choix_com.SetSelection(self.paramsimi['communities']) self.halo.SetValue(self.paramsimi['halo']) + self.check_curved.SetValue(self.paramsimi.get('edgecurved', True)) + + def ChangeCount(self, evt) : + self.textcount.SetValue('%i' % self.listcol.GetSelectedItemCount()) def OnCheck_s_size(self, evt): if self.check_s_size.GetValue() : @@ -891,19 +915,22 @@ class PrepSimi : self.parametres['listet'] = self.etline else: vardial.Destroy() - last = self.dial.listcol.GetFirstSelected() - lastl = [self.dial.listcol.GetFirstSelected()] - indexes = [self.dial.listcol.getColumnText(self.dial.listcol.GetFirstSelected(),0)] - while self.dial.listcol.GetNextSelected(last) != -1: - last = self.dial.listcol.GetNextSelected(last) - lastl.append(last) - indexes.append(self.dial.listcol.getColumnText(last,0)) - column = [actives.index(val) for val in indexes] - column.sort() - with open(pathout, 'w') as f : - f.write('\n'.join([`val` for val in column])) - self.make_param() - self.dial.Destroy() + self.val = False + self.dial.Destroy() + if self.val : + last = self.dial.listcol.GetFirstSelected() + lastl = [self.dial.listcol.GetFirstSelected()] + indexes = [self.dial.listcol.getColumnText(self.dial.listcol.GetFirstSelected(),0)] + while self.dial.listcol.GetNextSelected(last) != -1: + last = self.dial.listcol.GetNextSelected(last) + lastl.append(last) + indexes.append(self.dial.listcol.getColumnText(last,0)) + column = [actives.index(val) for val in indexes] + column.sort() + with open(pathout, 'w') as f : + f.write('\n'.join([`val` for val in column])) + self.make_param() + self.dial.Destroy() else : self.dial.Destroy() @@ -945,12 +972,12 @@ class PrepSimi : 'com' :self.dial.comcheck.GetValue(), 'communities' : self.dial.choix_com.GetSelection(), 'halo' : self.dial.halo.GetValue(), + 'edgecurved' : self.dial.check_curved.GetValue(), } if 'cexfromchi' in self.parametres : param['cexfromchi'] = self.dial.checkit.GetValue() if 'sfromchi' in self.parametres : param['sfromchi'] = self.dial.checki.GetValue() - print param if 'vlabcolor' in self.parametres : param['vlabcolor'] = self.parametres['vlabcolor'] if 'check_bystar' in dir(self.dial) : @@ -962,10 +989,12 @@ 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 ) - + 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 ) @@ -1054,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( 473,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 ) @@ -1069,49 +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", 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...", 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", 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, 1, wx.EXPAND, 5 ) - - self.but_edit = wx.Button( self, wx.ID_ANY, u"Edit", wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.but_edit, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 0 ) - self.but_compute = wx.Button( self, wx.ID_ANY, u"Compute", wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.but_compute, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 ) + fgSizer3.SetFlexibleDirection( wx.BOTH ) + fgSizer3.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) + self.but_edit = wx.Button( self.panel, wx.ID_ANY, u"Edit", wx.DefaultPosition, wx.DefaultSize, 0 ) + fgSizer3.Add( self.but_edit, 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, 5 ) + self.but_compute = wx.Button( self.panel, wx.ID_ANY, u"Compute", 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, 0 ) + + 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 ) @@ -1119,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 )