andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Better remarks and layout

Browse Source
This commit is contained in:
ccremers 2006-08-03 14:14:38 +00:00
parent 1a66f7978d
commit a4313a0e9e
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gui/Scytherthread.py
View File

@ -102,7 +102,7 @@ class AttackThread(threading.Thread):
for cl in self.mainwin.claims: for cl in self.mainwin.claims:
for attack in cl.attacks: for attack in cl.attacks:
self.makeImage(attack) self.makeImage(attack)
if cl.button: if cl.button and len(cl.attacks) > 0:
cl.button.Enable() cl.button.Enable()
def makeImage(self,attack): def makeImage(self,attack):
@ -195,14 +195,20 @@ class ResultWindow(wx.Frame):
claims = mainwindow.claims claims = mainwindow.claims
self.grid = grid = wx.GridBagSizer(8,1+len(claims)) self.grid = grid = wx.GridBagSizer(8,1+len(claims))
grid.Add(wx.StaticText(self,-1,"Protocol "),(0,0)) def titlebar(x,title):
grid.Add(wx.StaticText(self,-1,"Role "),(0,1)) txt = wx.StaticText(self,-1,title + " ")
grid.Add(wx.StaticText(self,-1,"Label "),(0,2)) font = wx.Font(14,wx.NORMAL,wx.NORMAL,wx.NORMAL)
grid.Add(wx.StaticText(self,-1,"Claim type "),(0,3)) txt.SetFont(font)
grid.Add(wx.StaticText(self,-1,"Parameter "),(0,4)) grid.Add(txt,(0,x))
grid.Add(wx.StaticText(self,-1,"Status "),(0,5))
grid.Add(wx.StaticText(self,-1,"View "),(0,6))
titlebar(0,"Protocol")
titlebar(1,"Role")
titlebar(2,"Label")
titlebar(3,"Claim type")
titlebar(4,"Parameter")
titlebar(5,"Status")
titlebar(6,"View")
titlebar(7,"Remarks")
lastprot = None lastprot = None
lastrole = None lastrole = None
@ -236,30 +242,34 @@ class ResultWindow(wx.Frame):
blabel = "%i %s" % (n,cl.stateName(n)) blabel = "%i %s" % (n,cl.stateName(n))
cl.button = wx.Button(self,-1,blabel) cl.button = wx.Button(self,-1,blabel)
cl.button.Disable()
grid.Add(cl.button,(y,6)) grid.Add(cl.button,(y,6))
cl.button.Disable()
self.Bind(wx.EVT_BUTTON, self.onViewButton,cl.button) self.Bind(wx.EVT_BUTTON, self.onViewButton,cl.button)
else: else:
cl.button = None blabel = "%i %s" % (n,cl.stateName(n))
cl.button = wx.Button(self,-1,blabel)
grid.Add(cl.button,(y,6))
cl.button.Disable()
#cl.button = None
# remark something about completeness # remark something about completeness
remark = "" remark = ""
if not cl.complete: if not cl.complete:
if n == 0: if n == 0:
# no attacks, no states within bounds # no attacks, no states within bounds
remark = "(within bounds)" remark = "within bounds"
else: else:
# some attacks/states within bounds # some attacks/states within bounds
remark = "(at least, maybe more)" remark = "at least, maybe more"
else: else:
if n == 0: if n == 0:
# no attacks, no states # no attacks, no states
remark = "" remark = "none"
else: else:
# there exist n states/attacks (within any number of runs) # there exist n states/attacks (within any number of runs)
remark = "(exactly)" remark = "exactly"
grid.Add(wx.StaticText(self,-1,remark),(y,7)) grid.Add(wx.StaticText(self,-1," (%s)" % remark),(y,7))
sizer.Add(grid, 0,wx.ALIGN_CENTRE|wx.ALL,5) sizer.Add(grid, 0,wx.ALIGN_CENTRE|wx.ALL,5)