Merge branch 'master' of git://git.assembla.com/fpdb-eric

This commit is contained in:
Eratosthenes 2009-12-04 12:16:26 -05:00
commit 2863edf1df
4 changed files with 318 additions and 319 deletions

View File

@ -173,26 +173,26 @@ class Hud:
item = gtk.CheckMenuItem(' All Levels') item = gtk.CheckMenuItem(' All Levels')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_aggregation, ('P',10000)) item.connect("activate", self.set_aggregation, ('P',10000))
setattr(self, 'h_aggBBmultItem10000', item) setattr(self, 'h_aggBBmultItem10000', item)
# #
item = gtk.MenuItem('For #Seats:') item = gtk.MenuItem('For #Seats:')
self.aggMenu.append(item) self.aggMenu.append(item)
# #
item = gtk.CheckMenuItem(' Any Number') item = gtk.CheckMenuItem(' Any Number')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_seats_style, ('P','A')) item.connect("activate", self.set_seats_style, ('P','A'))
setattr(self, 'h_seatsStyleOptionA', item) setattr(self, 'h_seatsStyleOptionA', item)
# #
item = gtk.CheckMenuItem(' Custom') item = gtk.CheckMenuItem(' Custom')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_seats_style, ('P','C')) item.connect("activate", self.set_seats_style, ('P','C'))
setattr(self, 'h_seatsStyleOptionC', item) setattr(self, 'h_seatsStyleOptionC', item)
# #
item = gtk.CheckMenuItem(' Exact') item = gtk.CheckMenuItem(' Exact')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_seats_style, ('P','E')) item.connect("activate", self.set_seats_style, ('P','E'))
setattr(self, 'h_seatsStyleOptionE', item) setattr(self, 'h_seatsStyleOptionE', item)
# #
item = gtk.MenuItem('Since:') item = gtk.MenuItem('Since:')
self.aggMenu.append(item) self.aggMenu.append(item)
# #
@ -242,26 +242,26 @@ class Hud:
item = gtk.CheckMenuItem(' All Levels') item = gtk.CheckMenuItem(' All Levels')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_aggregation, ('O',10000)) item.connect("activate", self.set_aggregation, ('O',10000))
setattr(self, 'aggBBmultItem10000', item) setattr(self, 'aggBBmultItem10000', item)
# #
item = gtk.MenuItem('For #Seats:') item = gtk.MenuItem('For #Seats:')
self.aggMenu.append(item) self.aggMenu.append(item)
# #
item = gtk.CheckMenuItem(' Any Number') item = gtk.CheckMenuItem(' Any Number')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_seats_style, ('O','A')) item.connect("activate", self.set_seats_style, ('O','A'))
setattr(self, 'seatsStyleOptionA', item) setattr(self, 'seatsStyleOptionA', item)
# #
item = gtk.CheckMenuItem(' Custom') item = gtk.CheckMenuItem(' Custom')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_seats_style, ('O','C')) item.connect("activate", self.set_seats_style, ('O','C'))
setattr(self, 'seatsStyleOptionC', item) setattr(self, 'seatsStyleOptionC', item)
# #
item = gtk.CheckMenuItem(' Exact') item = gtk.CheckMenuItem(' Exact')
self.aggMenu.append(item) self.aggMenu.append(item)
item.connect("activate", self.set_seats_style, ('O','E')) item.connect("activate", self.set_seats_style, ('O','E'))
setattr(self, 'seatsStyleOptionE', item) setattr(self, 'seatsStyleOptionE', item)
# #
item = gtk.MenuItem('Since:') item = gtk.MenuItem('Since:')
self.aggMenu.append(item) self.aggMenu.append(item)
# #
@ -358,7 +358,7 @@ class Hud:
def change_max_seats(self, widget): def change_max_seats(self, widget):
if self.max != widget.ms: if self.max != widget.ms:
print 'change_max_seats', widget.ms #print 'change_max_seats', widget.ms
self.max = widget.ms self.max = widget.ms
try: try:
self.kill() self.kill()
@ -402,7 +402,7 @@ class Hud:
else: else:
param = 'seats_style' param = 'seats_style'
prefix = '' prefix = ''
if style == 'A' and getattr(self, prefix+'seatsStyleOptionA').get_active(): if style == 'A' and getattr(self, prefix+'seatsStyleOptionA').get_active():
self.hud_params[param] = 'A' self.hud_params[param] = 'A'
getattr(self, prefix+'seatsStyleOptionC').set_active(False) getattr(self, prefix+'seatsStyleOptionC').set_active(False)
@ -678,7 +678,7 @@ class Stat_Window:
return True return True
def kill_popup(self, popup): def kill_popup(self, popup):
print "remove popup", popup #print "remove popup", popup
self.popups.remove(popup) self.popups.remove(popup)
popup.window.destroy() popup.window.destroy()

View File

@ -37,14 +37,20 @@ if os.name == 'nt' and sys.version[0:3] not in ('2.5', '2.6') and '-r' not in sy
os.execvpe('python.exe', ('python.exe', 'fpdb.py', '-r'), os.environ) # first arg is ignored (name of program being run) os.execvpe('python.exe', ('python.exe', 'fpdb.py', '-r'), os.environ) # first arg is ignored (name of program being run)
else: else:
print "\npython 2.5 not found, please install python 2.5 or 2.6 for fpdb\n" print "\npython 2.5 not found, please install python 2.5 or 2.6 for fpdb\n"
exit raw_input("Press ENTER to continue.")
exit()
else: else:
pass pass
#print "debug - not changing path" #print "debug - not changing path"
if os.name == 'nt': if os.name == 'nt':
import win32api try:
import win32con import win32api
import win32con
except ImportError:
print "We appear to be running in Windows, but the Windows Python Extensions are not loading. Please install the PYWIN32 package from http://sourceforge.net/projects/pywin32/"
raw_input("Press ENTER to continue.")
exit()
print "Python " + sys.version[0:3] + '...\n' print "Python " + sys.version[0:3] + '...\n'
@ -62,9 +68,14 @@ if not options.errorsToConsole:
import logging import logging
import pygtk try:
pygtk.require('2.0') import pygtk
import gtk pygtk.require('2.0')
import gtk
except:
print "Unable to load PYGTK modules required for GUI. Please install PyCairo, PyGObject, and PyGTK from www.pygtk.org."
raw_input("Press ENTER to continue.")
exit()
import interlocks import interlocks
@ -196,14 +207,14 @@ class fpdb:
def dia_about(self, widget, data=None): def dia_about(self, widget, data=None):
#self.warning_box("About FPDB:\n\nFPDB was originally created by a guy named Steffen, sometime in 2008, \nand is mostly worked on these days by people named Eratosthenes, s0rrow, _mt, EricBlade, sqlcoder, and other strange people.\n\n", "ABOUT FPDB") #self.warning_box("About FPDB:\n\nFPDB was originally created by a guy named Steffen, sometime in 2008, \nand is mostly worked on these days by people named Eratosthenes, s0rrow, _mt, EricBlade, sqlcoder, and other strange people.\n\n", "ABOUT FPDB")
dia = gtk.AboutDialog() dia = gtk.AboutDialog()
dia.set_name("FPDB") dia.set_name("Free Poker Database (FPDB)")
dia.set_version(VERSION) dia.set_version(VERSION)
dia.set_copyright("2008-2009, Steffen, Eratosthenes, s0rrow, EricBlade, _mt, sqlcoder, and others") dia.set_copyright("2008-2010, Steffen, Eratosthenes, s0rrow, EricBlade, _mt, sqlcoder, Bostik, and others")
dia.set_comments("GTK AboutDialog comments here") dia.set_comments("GTK AboutDialog comments here")
dia.set_license("GPL v3") dia.set_license("GPL v3")
dia.set_website("http://fpdb.sourceforge.net/") dia.set_website("http://fpdb.sourceforge.net/")
dia.set_authors("Steffen, Eratosthenes, s0rrow, EricBlade, _mt, and others") dia.set_authors("Steffen, Eratosthenes, s0rrow, EricBlade, _mt, sqlcoder, Bostik, and others")
dia.set_program_name("FPDB") dia.set_program_name("Free Poker Database (FPDB)")
dia.run() dia.run()
dia.destroy() dia.destroy()

File diff suppressed because it is too large Load Diff

View File

@ -1,55 +1,55 @@
***** Betfair Poker Hand History for Game 100000000 ***** ***** Betfair Poker Hand History for Game 100000000 *****
PL $0.05/$0.10 Omaha - Sunday, October 18, 20:00:00 GMT 2009 PL $0.05/$0.10 Omaha - Sunday, October 18, 20:00:00 GMT 2009
Table Death 1 6-max (Real Money) Table Death 1 6-max (Real Money)
Seat 2 is the button Seat 2 is the button
Total number of active players : 6 Total number of active players : 6
Seat 1: Player6 ( $1 ) Seat 1: Player6 ( $1 )
Seat 2: Player3 ( $9.38 ) Seat 2: Player3 ( $9.38 )
Seat 3: Player2 ( $2.82 ) Seat 3: Player2 ( $2.82 )
Seat 4: Player4 ( $4.13 ) Seat 4: Player4 ( $4.13 )
Seat 5: Player5 ( $28.77 ) Seat 5: Player5 ( $28.77 )
Seat 6: Player1 ( $6.46 ) Seat 6: Player1 ( $6.46 )
Player2 posts small blind [$0.05] Player2 posts small blind [$0.05]
Player4 posts big blind [$0.10] Player4 posts big blind [$0.10]
Player6 posts big blind [$0.10] Player6 posts big blind [$0.10]
** Dealing down cards ** ** Dealing down cards **
Dealt to Player6 [ 7c, 6c, 5h, Jh ] Dealt to Player6 [ 7c, 6c, 5h, Jh ]
Player5 folds Player5 folds
Player1 calls [$0.10] Player1 calls [$0.10]
Player6 checks Player6 checks
Player3 calls [$0.10] Player3 calls [$0.10]
Player2 raises to [$0.30] Player2 raises to [$0.30]
Player4 calls [$0.20] Player4 calls [$0.20]
Player1 calls [$0.20] Player1 calls [$0.20]
Player6 goes all-in Player6 goes all-in
Player6 raises to [$1] Player6 raises to [$1]
Player3 calls [$0.90] Player3 calls [$0.90]
Player2 calls [$0.70] Player2 calls [$0.70]
Player4 calls [$0.70] Player4 calls [$0.70]
Player1 calls [$0.70] Player1 calls [$0.70]
** Dealing Flop ** [ 4d, 5d, 6d ] ** Dealing Flop ** [ 4d, 5d, 6d ]
Player2 checks Player2 checks
Player4 checks Player4 checks
Player1 checks Player1 checks
Player3 checks Player3 checks
** Dealing Turn ** [ 3s ] ** Dealing Turn ** [ 3s ]
Player2 checks Player2 checks
Player4 bets [$0.10] Player4 bets [$0.10]
Player1 calls [$0.10] Player1 calls [$0.10]
Player3 folds Player3 folds
Player2 folds Player2 folds
** Dealing River ** [ 4c ] ** Dealing River ** [ 4c ]
Player4 goes all-in Player4 goes all-in
Player4 bets [$3.03] Player4 bets [$3.03]
Player1 calls [$3.03] Player1 calls [$3.03]
** Showdown ** ** Showdown **
Player6 shows [ 7c, 6c, 5h, Jh ] a straight, Seven to Three Player6 shows [ 7c, 6c, 5h, Jh ] a straight, Seven to Three
Player4 shows [ 7d, 8c, 3d, 6h ] a straight flush, Seven to Three Player4 shows [ 7d, 8c, 3d, 6h ] a straight flush, Seven to Three
Player1 shows [ 3h, 4h, Td, 4s ] four of a kind, Fours Player1 shows [ 3h, 4h, Td, 4s ] four of a kind, Fours
** Hand Conclusion ** ** Hand Conclusion **
Player4 wins $6.26 from side pot #1 with a straight flush, Seven to Three Player4 wins $6.26 from side pot #1 with a straight flush, Seven to Three
Player4 wins $4.44 from main pot with a straight flush, Seven to Three Player4 wins $4.44 from main pot with a straight flush, Seven to Three
************ Game 100000000 ends ************ ************ Game 100000000 ends ************