evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix problem with multiple tables from same tournament.

Browse Source
This commit is contained in:
Eratosthenes 2010-11-30 18:33:44 -05:00
parent 0d79fe8f09
commit fa32ed8c46
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyfpdb/HUD_main.pyw Executable file → Normal file
View File

@ -297,7 +297,8 @@ class HUD_main(object):
t1 = time.time() t1 = time.time()
if type == "tour": # hand is from a tournament if type == "tour": # hand is from a tournament
temp_key = tour_number # temp_key = tour_number
temp_key = "%s Table %s" % (tour_number, tab_number)
else: else:
temp_key = table_name temp_key = table_name

18
pyfpdb/TableWindow.py
View File

@ -104,12 +104,14 @@ gobject.signal_new("table_changed", gtk.Window,
# title bar and window borders. To put it another way, this is the # title bar and window borders. To put it another way, this is the
# screen location of (0, 0) in the working window. # screen location of (0, 0) in the working window.
# tournament = Tournament number for a tournament or None for a cash game. # tournament = Tournament number for a tournament or None for a cash game.
# table = Table number for a tournament. # tw.table = tournament: Table number for the tournament.
# gdkhandle = # cash: full Table name as given by the poker site
# window = # tw.gdkhandle = gdk handle for the poker client window - used to nail the hud to the window
# parent = # tw.window = is this still used?
# game = # tw.parent = window object of the parent of the client window, only used in Linux
# search_string = # tw.game = the poker game being played at the table, only used in mixed games
# tw.search_string = regular expression used to find the table, supplied by XToFpdb.py
# tw.key = a string formulated to be a unique id for this table window, used in the hud main window
class Table_Window(object): class Table_Window(object):
def __init__(self, config, site, table_name = None, tournament = None, table_number = None): def __init__(self, config, site, table_name = None, tournament = None, table_number = None):
@ -124,13 +126,13 @@ class Table_Window(object):
self.type = "tour" self.type = "tour"
table_kwargs = dict(tournament = self.tournament, table_number = self.table) table_kwargs = dict(tournament = self.tournament, table_number = self.table)
self.tableno_re = getTableNoRe(self.config, self.site, tournament = self.tournament) self.tableno_re = getTableNoRe(self.config, self.site, tournament = self.tournament)
self.key = tournament # used as key for the hud_dict in HUD_main self.key = "%s Table %s" % (tournament, str(self.table))
elif table_name is not None: elif table_name is not None:
self.name = table_name self.name = table_name
self.type = "cash" self.type = "cash"
self.tournament = None self.tournament = None
table_kwargs = dict(table_name = table_name) table_kwargs = dict(table_name = table_name)
self.key = table_name self.key = table_name # used as key for the hud_dict in HUD_main
else: else:
return None return None