elif type == "Texte":
return False, [False]
elif type == "Analyse":
- return [False]
+ return False
def getfileextension(file) :
return os.path.splitext(file)[1]
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)
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 :
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 )
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 )
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 )
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 )
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())
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()
'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) :
class TGenFrame ( wx.Frame ):
def __init__( self, parent, corpus, Tgen ):
- wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Tgen", pos = wx.DefaultPosition, size = wx.Size( 600,434 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP )
+ wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Tgen", pos = wx.DefaultPosition, size = wx.Size( -1, -1 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.STAY_ON_TOP )
self.Tgen = Tgen
self.parent = parent
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.SetMinSize( wx.Size( 200,250 ) )
- 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.SetMinSize( wx.Size( 200,250 ) )
- 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.Add( self.but_del, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
- fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 5 )
+ fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 0 )
fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 )
fgSizer3.SetFlexibleDirection( wx.BOTH )
self.but_compute = wx.Button( self, 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, 5 )
+ fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 0 )
- bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+ bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
m_sdbSizer2 = wx.StdDialogButtonSizer()
self.m_sdbSizer2OK = wx.Button( self, wx.ID_OK )
self.SetSizer( bSizer1 )
self.Layout()
+ bSizer1.Fit( self )
self.Centre( wx.BOTH )