projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proto
[iramuteq]
/
guifunct.py
diff --git
a/guifunct.py
b/guifunct.py
index
15dc08d
..
2dcc3da
100644
(file)
--- a/
guifunct.py
+++ b/
guifunct.py
@@
-1054,7
+1054,7
@@
class CreateTgenDialog ( wx.Frame ):
class TGenFrame ( wx.Frame ):
def __init__( self, parent, corpus, Tgen ):
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(
600
,434 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP )
self.Tgen = Tgen
self.parent = parent
self.Tgen = Tgen
self.parent = parent
@@
-1100,12
+1100,19
@@
class TGenFrame ( wx.Frame ):
fgSizer2.Add( self.but_del, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
fgSizer2.Add( self.but_del, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
- fgSizer1.Add( fgSizer2,
1
, wx.EXPAND, 5 )
+ fgSizer1.Add( fgSizer2,
0
, wx.EXPAND, 5 )
+ fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 )
+ fgSizer3.SetFlexibleDirection( wx.BOTH )
+ fgSizer3.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
self.but_edit = wx.Button( self, wx.ID_ANY, u"Edit", wx.DefaultPosition, wx.DefaultSize, 0 )
self.but_edit = wx.Button( self, 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 )
-
+ fgSizer3.Add( self.but_edit, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+ self.but_compute = wx.Button( self, wx.ID_ANY, u"Compute", wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer3.Add( self.but_compute, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+
+ fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 5 )
+
bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
m_sdbSizer2 = wx.StdDialogButtonSizer()
bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
m_sdbSizer2 = wx.StdDialogButtonSizer()
@@
-1128,6
+1135,7
@@
class TGenFrame ( wx.Frame ):
self.but_new.Bind( wx.EVT_BUTTON, self.OnNewTgen )
self.but_del.Bind( wx.EVT_BUTTON, self.OnDeleteTgen )
self.but_edit.Bind( wx.EVT_BUTTON, self.OnEditTgen )
self.but_new.Bind( wx.EVT_BUTTON, self.OnNewTgen )
self.but_del.Bind( wx.EVT_BUTTON, self.OnDeleteTgen )
self.but_edit.Bind( wx.EVT_BUTTON, self.OnEditTgen )
+ self.but_compute.Bind(wx.EVT_BUTTON, self.OnCompute)
self.m_sdbSizer2OK.Bind( wx.EVT_BUTTON, self.OnOK )
def __del__( self ):
self.m_sdbSizer2OK.Bind( wx.EVT_BUTTON, self.OnOK )
def __del__( self ):
@@
-1173,6
+1181,10
@@
class TGenFrame ( wx.Frame ):
self.dial.Show()
event.Skip()
self.dial.Show()
event.Skip()
+ def OnCompute(self, evt):
+ ira = wx.GetApp().GetTopWindow()
+ ira.tree.OnTgenCompute(evt)
+
def OnOK(self, evt):
self.Destroy()
def OnOK(self, evt):
self.Destroy()