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

- Some updates.

Browse Source
This commit is contained in:
ccremers 2006-08-09 11:28:01 +00:00
parent 0c3f860b7b
commit 9c819b71d9
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gui/Gui/Scytherthread.py
View File

@ -283,7 +283,7 @@ class ResultWindow(wx.Frame):
views += self.BuildClaim(grid,claims[index],index+1) views += self.BuildClaim(grid,claims[index],index+1)
if views > 0: if views > 0:
titlebar(6,"View",1) titlebar(7,"View",1)
self.SetSizer(grid) self.SetSizer(grid)
self.Fit() self.Fit()
@ -350,6 +350,7 @@ class ResultWindow(wx.Frame):
# remark something about completeness # remark something about completeness
remark = "" remark = ""
atxt = cl.stateName(n) atxt = cl.stateName(n)
vstatus = ""
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
@ -357,15 +358,27 @@ class ResultWindow(wx.Frame):
else: else:
# some attacks/states within bounds # some attacks/states within bounds
remark = "At least %i %s" % (n,atxt) remark = "At least %i %s" % (n,atxt)
if not self.state:
vstatus = "Falsified"
else: else:
if n == 0: if n == 0:
# no attacks, no states # no attacks, no states
remark = "No %s" % (atxt) remark = "No %s" % (atxt)
if cl.state:
vstatus = "Falsified"
else:
vstatus = "Verified"
else: else:
# there exist n states/attacks (within any number of runs) # there exist n states/attacks (within any number of runs)
remark = "Exactly %i %s" % (n,atxt) remark = "Exactly %i %s" % (n,atxt)
addtxt(remark,xpos) if cl.state:
xpos += 1 vstatus = "Verified"
else:
vstatus = "Falsified"
addtxt(vstatus,xpos)
addtxt(remark,xpos+1)
xpos += 2
# add view button (enabled later if needed) # add view button (enabled later if needed)
if n > 0: if n > 0:
@ -427,22 +440,19 @@ class ScytherRun(object):
def attackDone(attack,total,done): def attackDone(attack,total,done):
if resultwin: if resultwin:
if done < total: txt = "Generating attack graphs (%i of %i done)." % (done,total)
txt = "Generating attack graphs (%i of %i done)." % (done,total)
else:
txt = "Done."
resultwin.SetStatusText(txt) resultwin.SetStatusText(txt)
resultwin.Refresh() #resultwin.Refresh()
def claimDone(claim): def claimDone(claim):
if resultwin: if resultwin:
if claim.button and len(claim.attacks) > 0: if claim.button and len(claim.attacks) > 0:
claim.button.Enable() claim.button.Enable()
#resultwin.Refresh()
def allDone(): def allDone():
if resultwin: if resultwin:
resultwin.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) resultwin.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
resultwin.SetStatusText("Done.")
resultwin.Center() resultwin.Center()
resultwin.Show(True) resultwin.Show(True)