From 8471f13da32bcffcb529a4ecedea54a9ecf2fc1f Mon Sep 17 00:00:00 2001
From: Cas Cremers <cas.cremers@gmail.com>
Date: Mon, 25 Aug 2008 16:59:15 +0200
Subject: [PATCH] Added 'prune' switch support in GUI.

Allows to use the 'stop at first attack' feature of the backend.
---
 gui/Gui/Scytherthread.py  |  4 +++-
 gui/Gui/Settingswindow.py | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gui/Gui/Scytherthread.py b/gui/Gui/Scytherthread.py
index dff63f3..3cdf3c4 100644
--- a/gui/Gui/Scytherthread.py
+++ b/gui/Gui/Scytherthread.py
@@ -78,7 +78,9 @@ class ScytherThread(threading.Thread):
         VISTA screwed up the standard C function tmpfile() (It's in a
         directory to which normal users cannot write...)
         """
-        if int(Preference.get('allattacks','0')) == 0:
+        # TODO Notice the stupid default setting too ('2') which is
+        # needed here. This really needs cleanup.
+        if int(Preference.get('prune','2')) != 0:
             if claims:
                 for cl in claims:
                     if len(cl.attacks) > 1:
diff --git a/gui/Gui/Settingswindow.py b/gui/Gui/Settingswindow.py
index 50547ff..a8d4c14 100644
--- a/gui/Gui/Settingswindow.py
+++ b/gui/Gui/Settingswindow.py
@@ -99,12 +99,12 @@ class SettingsWindow(wx.Panel):
         grid.titleAdd("Advanced parameters")
 
         # Continue after finding the first attack
-        self.allattacks = int(Preference.get('allattacks','0'))
-        claimoptions = ['Yes','No']
-        r8 = wx.StaticText(self,-1,"Stop after finding one attack")
+        self.prune = int(Preference.get('prune','2'))
+        claimoptions = ['Find all attacks','Find first attack','Find best attack']
+        r8 = wx.StaticText(self,-1,"Search pruning")
         l8 = self.ch = wx.Choice(self,-1,choices=claimoptions)
-        l8.SetSelection(self.allattacks)
-        self.Bind(wx.EVT_CHOICE,self.EvtAllAttacks,l8)
+        l8.SetSelection(self.prune)
+        self.Bind(wx.EVT_CHOICE,self.EvtPrune,l8)
         grid.stepAdd(l8,r8)
 
         # Bound on the number of patterns
@@ -152,9 +152,9 @@ class SettingsWindow(wx.Panel):
     def EvtFontsize(self,evt):
         self.fontsize = evt.GetInt()
 
-    def EvtAllAttacks(self,evt):
-        self.allattacks = evt.GetInt()
-        Preference.set('allattacks',self.allattacks)
+    def EvtPrune(self,evt):
+        self.prune = evt.GetInt()
+        Preference.set('prune',self.prune)
 
     def EvtMaxAttacks(self,evt):
         self.maxattacks = evt.GetInt()
@@ -173,9 +173,8 @@ class SettingsWindow(wx.Panel):
         tstr += "--max-runs=%s " % (str(self.maxruns))
         # Matching type
         tstr += "--match=%s " % (str(self.match))
-        # All attacks (has to go BEFORE max attacks)
-        if self.allattacks != 0:
-            tstr += "--all-attacks "
+        # Prune (has to go BEFORE max attacks)
+        tstr += "--prune=%s" % (str(self.prune))
         # Max attacks/classes
         if self.maxattacks != 0:
             tstr += "--max-attacks=%s " % (str(self.maxattacks))