From aecfa6d61b23e25f865d793fa776439ed4039f3e Mon Sep 17 00:00:00 2001 From: steffen123 Date: Wed, 13 Aug 2008 04:22:22 +0100 Subject: [PATCH] git31 - last git added generating the reaction to steal data. this git adds em to tv. On the tested hand this works correctly :) --- docs/known-bugs-and-planned-features.txt | 6 ++++-- pyfpdb/fpdb.py | 2 +- pyfpdb/table_viewer.py | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt index fcb3b1f3..6f02aabf 100644 --- a/docs/known-bugs-and-planned-features.txt +++ b/docs/known-bugs-and-planned-features.txt @@ -1,8 +1,8 @@ todolist (db=database, imp=importer, tv=tableviewer) Everything is subject to change. -before alpha2 -============= +alpha2 +====== add steal reaction to tv CB, 2nd/3rd Barrel, fold to these printhand each and the 2/3 relevant printplayerflags respectively on ps-lhe-ring-successful-steal-by-cutoff.txt and ps-lhe-ring-call-3B-preflop-cb-no2b.txt @@ -14,6 +14,7 @@ expand instructions for profile file, again, the release-creator will cat it. delete old mailing list and create fpdb-announce finish updating filelist return sng support +update abbreviations.txt alpha3 ====== @@ -23,6 +24,7 @@ show database version error in GUI before beta =========== +optionally combine FB/FS separate all gui and all processing into files that are named accordingly ensure that there is only one db handle flying around and that its state is handled properly, ie. by the GUI. i think that might be why we have to reconnect the DB in tableviewer. figure out what slowed it down so much between git19 and git21 (8/9aug) diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index ab26977e..2e8038f7 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -347,7 +347,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt") 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: alpha1+, git30") + self.window.set_title("Free Poker DB - version: alpha1+, git31") 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 9c0b9af8..33af6a78 100755 --- a/pyfpdb/table_viewer.py +++ b/pyfpdb/table_viewer.py @@ -59,12 +59,11 @@ class table_viewer (threading.Thread): arr=[] #first prepare the header row if (self.category=="holdem" or self.category=="omahahi" or self.category=="omahahilo"): - tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "ST", "AF", "FF", "AT", "FT", "AR", "FR", "SD/F", "W$wsF", "W$@SD") + tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "ST", "FS", "FB", "AF", "FF", "AT", "FT", "AR", "FR", "WtSD", "W$wsF", "W$SD") if self.settings['tv-combinedPostflop']: - tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "ST", "Postf A", "Postf F", "SD/F", "W$wsF", "W$@SD") + tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "ST", "FS", "FB", "Postf A", "Postf F", "WtSD", "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") arr.append(tmp) #then the data rows @@ -108,6 +107,8 @@ class table_viewer (threading.Thread): 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[25],row[24])+" ("+str(row[24])+")") #ST + tmp.append(self.hudDivide(row[29],row[28])+" ("+str(row[28])+")") #FS + tmp.append(self.hudDivide(row[27],row[26])+" ("+str(row[26])+")") #FB if self.settings['tv-combinedPostflop']: aggCount=row[13]+row[14]+row[15]