From e56e071b7c147e072669b23fcfd7f16956ea2ae4 Mon Sep 17 00:00:00 2001
From: steffen123 <steffen@sycamoretest.info>
Date: Sun, 10 Aug 2008 03:26:51 +0100
Subject: [PATCH] git22 - now shows single postflop agg/fold rate - can be
 changed by editing fpdb. may flip this arbitrarily, will export it to profile
 soon

---
 docs/known-bugs-and-planned-features.txt |  2 +-
 pyfpdb/fpdb.py                           |  2 +-
 pyfpdb/table_viewer.py                   | 24 ++++++++++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt
index c7488f17..df741292 100644
--- a/docs/known-bugs-and-planned-features.txt
+++ b/docs/known-bugs-and-planned-features.txt
@@ -21,7 +21,7 @@ why do we have to reconnect in tv.read_names_clicked?
 implement error file in importer
 catch index error, type error, file not found error
 finish updating filelist
-optionally show single postflop agg/fold rate
+export combinedPostflop from table_viewer.prepareData to profile
 use different colours according to classification.
 table with data for graphs for SD/F, W$wSF, W$@SD
 
diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index a1705200..c0846f60 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -343,7 +343,7 @@ blabla""")
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 		self.window.connect("delete_event", self.delete_event)
 		self.window.connect("destroy", self.destroy)
-		self.window.set_title("Free Poker DB - version: pre-alpha, git21")
+		self.window.set_title("Free Poker DB - version: pre-alpha, git22")
 		self.window.set_border_width(1)
 		self.window.set_size_request(950,400)
 		self.window.set_resizable(True)
diff --git a/pyfpdb/table_viewer.py b/pyfpdb/table_viewer.py
index 0f0dd71d..2d1b9299 100755
--- a/pyfpdb/table_viewer.py
+++ b/pyfpdb/table_viewer.py
@@ -57,9 +57,12 @@ class table_viewer (threading.Thread):
 		"""prepares the data for display by refresh_clicked, returns a 2D array"""
 		#print "start of prepare_data"
 		arr=[]
+		combinedPostflop=True #todo: export as option
 		#first prepare the header row
 		if (self.category=="holdem" or self.category=="omahahi" or self.category=="omahahilo"):
 			tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "AF", "FF", "AT", "FT", "AR", "FR", "SD/F", "W$wsF", "W$@SD")
+			if (combinedPostflop):
+				tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "F-R Aggr", "F-R Fold", "SD/F", "W$wsF", "W$@SD")
 		else:
 			raise fpdb_simple.FpdbError("reimplement stud")
 			tmp=("Name", "Hands", "VPI3", "A3", "3B4B_3" "A4", "F4", "A5", "F5", "A6", "F6", "A7", "F7", "SD/4")
@@ -105,12 +108,21 @@ class table_viewer (threading.Thread):
 			tmp.append(self.hudDivide(row[5],row[4])) #VPIP
 			tmp.append(self.hudDivide(row[6],row[4])) #PFR
 			tmp.append(self.hudDivide(row[8],row[7])+" ("+str(row[7])+")") #PF3B4B
-			tmp.append(self.hudDivide(row[13],row[9])+" ("+str(row[9])+")") #AF
-			tmp.append(self.hudDivide(row[17],row[16])+" ("+str(row[16])+")") #FF
-			tmp.append(self.hudDivide(row[14],row[10])+" ("+str(row[10])+")") #AT
-			tmp.append(self.hudDivide(row[19],row[18])+" ("+str(row[18])+")") #FT
-			tmp.append(self.hudDivide(row[15],row[11])+" ("+str(row[11])+")") #AR
-			tmp.append(self.hudDivide(row[21],row[20])+" ("+str(row[20])+")") #FR
+			if (combinedPostflop):
+				aggCount=row[13]+row[14]+row[15]
+				handCount=row[9]+row[10]+row[11]
+				foldCount=row[17]+row[19]+row[21]
+				otherRaiseCount=row[16]+row[18]+row[20]
+				tmp.append(self.hudDivide(aggCount,handCount)+" ("+str(handCount)+")") #Agg
+				tmp.append(self.hudDivide(foldCount,otherRaiseCount)+" ("+str(otherRaiseCount)+")") #FF
+			else:
+				tmp.append(self.hudDivide(row[13],row[9])+" ("+str(row[9])+")") #AF
+				tmp.append(self.hudDivide(row[17],row[16])+" ("+str(row[16])+")") #FF
+				tmp.append(self.hudDivide(row[14],row[10])+" ("+str(row[10])+")") #AT
+				tmp.append(self.hudDivide(row[19],row[18])+" ("+str(row[18])+")") #FT
+				tmp.append(self.hudDivide(row[15],row[11])+" ("+str(row[11])+")") #AR
+				tmp.append(self.hudDivide(row[21],row[20])+" ("+str(row[20])+")") #FR
+			
 			tmp.append(self.hudDivide(row[12],row[9])+" ("+str(row[9])+")") #SD/F
 			tmp.append(self.hudDivide(row[22],row[9])+" ("+str(row[9])+")") #W$wSF
 			tmp.append(self.hudDivide(row[23],row[12])+" ("+str(row[12])+")") #W$@SD