From 49d8e0055d63521e5c8153541ea4f11de806296a Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 2 Aug 2010 16:47:32 -0400
Subject: [PATCH 1/4] tweak cards shown regex

---
 pyfpdb/EverleafToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py
index 454f7e79..8bff1cdd 100755
--- a/pyfpdb/EverleafToFpdb.py
+++ b/pyfpdb/EverleafToFpdb.py
@@ -58,7 +58,7 @@ class Everleaf(HandHistoryConverter):
             self.re_HeroCards       = re.compile(ur"^Dealt to %s \[ (?P<CARDS>.*) \]$" % player_re, re.MULTILINE)
             # ^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P<BET>[.,\d]+) (USD|EURO|Chips)\])?
             self.re_Action          = re.compile(ur"^%s(?P<ATYPE>: bets| checks| raises| calls| folds)(\s\[(?:[$€]?) (?P<BET>[.,\d]+)\s?(USD|EURO|Chips|)\])?" % player_re, re.MULTILINE)
-            self.re_ShowdownAction  = re.compile(ur"^%s shows \[ (?P<CARDS>.*) \]$" % player_re, re.MULTILINE)
+            self.re_ShowdownAction  = re.compile(ur"^%s shows \[ (?P<CARDS>.*) \]" % player_re, re.MULTILINE)
             self.re_CollectPot      = re.compile(ur"^%s wins (?:[$€]?)\s?(?P<POT>[.\d]+) (USD|EURO|chips)(.*?\[ (?P<CARDS>.*?) \])?" % player_re, re.MULTILINE)
             self.re_SitsOut         = re.compile(ur"^%s sits out" % player_re, re.MULTILINE)
 

From 7cd9b767a7e42dd68a631cd942a5c87608f57536 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 2 Aug 2010 17:33:18 -0400
Subject: [PATCH 2/4] add some missing stats to the default popup

---
 pyfpdb/HUD_config.xml.example | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example
index 9ee17c1c..da257d1c 100644
--- a/pyfpdb/HUD_config.xml.example
+++ b/pyfpdb/HUD_config.xml.example
@@ -556,22 +556,26 @@ Left-Drag to Move"
 
     <popup_windows>
         <pu pu_name="default">
+            <pu_stat pu_stat_name="playername"> </pu_stat>
+            <pu_stat pu_stat_name="totalprofit"> </pu_stat>
+            <pu_stat pu_stat_name="profit100"> </pu_stat>             
             <pu_stat pu_stat_name="n"> </pu_stat>
             <pu_stat pu_stat_name="vpip"> </pu_stat>
             <pu_stat pu_stat_name="pfr"> </pu_stat>
             <pu_stat pu_stat_name="three_B_0"> </pu_stat>
             <pu_stat pu_stat_name="steal"> </pu_stat>
+            <pu_stat pu_stat_name="f_steal"> </pu_stat>
             <pu_stat pu_stat_name="f_BB_steal"> </pu_stat>
             <pu_stat pu_stat_name="f_SB_steal"> </pu_stat>
             <pu_stat pu_stat_name="wmsd"> </pu_stat>
             <pu_stat pu_stat_name="wtsd"> </pu_stat>
             <pu_stat pu_stat_name="WMsF"> </pu_stat>
+            <pu_stat pu_stat_name="agg_fact"> </pu_stat>
             <pu_stat pu_stat_name="a_freq1"> </pu_stat>
             <pu_stat pu_stat_name="a_freq2"> </pu_stat>
             <pu_stat pu_stat_name="a_freq3"> </pu_stat>
             <pu_stat pu_stat_name="a_freq4"> </pu_stat>
             <pu_stat pu_stat_name="agg_freq"> </pu_stat>
-            <pu_stat pu_stat_name="agg_fact"> </pu_stat>
             <pu_stat pu_stat_name="cbet"> </pu_stat>
             <pu_stat pu_stat_name="cb1"> </pu_stat>
             <pu_stat pu_stat_name="cb2"> </pu_stat>

From 0c318df8ea1c9da5ab643eb7bc79edf0a7d89d5f Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Mon, 2 Aug 2010 17:50:19 -0400
Subject: [PATCH 3/4] fix comment on cbet stat

---
 pyfpdb/Stats.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py
index 9bb6307c..74558da8 100755
--- a/pyfpdb/Stats.py
+++ b/pyfpdb/Stats.py
@@ -589,8 +589,8 @@ def agg_fact(stat_dict, player):
 
 def cbet(stat_dict, player):
 
-    """    Flop continuation bet."""
-    """    Continuation bet % = (times made a continuation bet on the flop) * 100 / (number of opportunities to make a continuation bet on the flop) """
+    """    Total continuation bet."""
+    """    Continuation bet % = (times made a continuation bet on any street) * 100 / (number of opportunities to make a continuation bet on any street) """
 
     stat = 0.0
     try:

From d20c82c2964444b70abea55ba813dc4cffb35d34 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Tue, 3 Aug 2010 00:24:14 -0400
Subject: [PATCH 4/4] add preflop actors to blindsantes for determining who was
 in hand for wtsd calcs

---
 pyfpdb/DerivedStats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index 7778c956..26e95394 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -292,7 +292,7 @@ class DerivedStats():
         
         # hand.players includes people that are sitting out on some sites.
         # Those that posted an ante should have been deal cards.
-        p_in = set([x[0] for x in hand.actions['BLINDSANTES']])
+        p_in = set([x[0] for x in hand.actions['BLINDSANTES']] + [x[0] for x in hand.actions['PREFLOP']])
 
         for (i, street) in enumerate(hand.actionStreets):
             actions = hand.actions[street]