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

Merge branch 'master' of git://git.assembla.com/free_poker_tools into session

Browse Source 
Conflicts:

	pyfpdb/Hud.py
This commit is contained in:
Worros
2008-12-20 12:19:37 +09:00
parent 16f9906d84 bb9f85233e
commit 83f50bafd3
4 changed files with 126 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyfpdb/Hud.py
+19 -13
View File
@@ -47,12 +47,12 @@ import HUD_main
class Hud:
def __init__(self, table, max, poker_game, config, db_name):
def __init__(self, table, max, poker_game, config, db_connection):
self.table = table
self.config = config
self.poker_game = poker_game
self.max = max
self.db_name = db_name
self.db_connection = db_connection
self.deleted = False
self.stacked = True
self.site = table.site
@@ -61,7 +61,13 @@ class Hud:
self.stat_windows = {}
self.popup_windows = {}
self.aux_windows = []
self.font = pango.FontDescription("Sans 7")
(font, font_size) = config.get_default_font(self.table.site)
print "font = ", font, "size = ", font_size
if font == None or font_size == None:
self.font = pango.FontDescription("Sans 7")
else:
print "Setting font to ", font + " " + font_size
self.font = pango.FontDescription(font + " " + font_size)
# Set up a main window for this this instance of the HUD
self.main_window = gtk.Window()
@@ -129,7 +135,7 @@ class Hud:
if not win32gui.IsWindow(self.table.number):
self.kill_hud()
return False
(x, y) = self.main_window.parentgdkhandle.get_origin()
if self.table.x != x or self.table.y != y:
self.table.x = x
@@ -141,7 +147,7 @@ class Hud:
(x, y) = loc[adj[i]]
if self.stat_windows.has_key(i):
self.stat_windows[i].relocate(x, y)
return True
def on_button_press(self, widget, event):
@@ -184,9 +190,9 @@ class Hud:
try:
if int(config.supported_sites[self.table.site].layout[self.max].fav_seat) > 0:
fav_seat = config.supported_sites[self.table.site].layout[self.max].fav_seat
db_connection = Database.Database(config, self.db_name, 'temp')
actual_seat = db_connection.get_actual_seat(hand, config.supported_sites[self.table.site].screen_name)
db_connection.close_connection()
# db_connection = Database.Database(config, self.db_name, 'temp')
actual_seat = self.db_connection.get_actual_seat(hand, config.supported_sites[self.table.site].screen_name)
# db_connection.close_connection()
for i in range(0, self.max + 1):
j = actual_seat + i
if j > self.max: j = j - self.max
@@ -234,7 +240,7 @@ class Hud:
game_params = config.get_game_parameters(self.poker_game)
if not game_params['aux'] == "":
aux_params = config.get_aux_parameters(game_params['aux'])
self.aux_windows.append(eval("%s.%s(gtk.Window(), self, config, 'fpdb')" % (aux_params['module'], aux_params['class'])))
self.aux_windows.append(eval("%s.%s(gtk.Window(), self, config, aux_params)" % (aux_params['module'], aux_params['class'])))
if os.name == "nt":
gobject.timeout_add(500, self.update_table_position)
@@ -410,7 +416,7 @@ class Stat_Window:
self.e_box[r][c].add(self.label[r][c])
self.e_box[r][c].connect("button_press_event", self.button_press_cb)
font = pango.FontDescription("Sans 7")
# font = pango.FontDescription(self.font)
self.label[r][c].modify_font(font)
self.window.set_opacity(parent.colors['hudopacity'])
@@ -479,12 +485,12 @@ class Popup_window:
break
# get a database connection
db_connection = Database.Database(stat_window.parent.config, stat_window.parent.db_name, 'temp')
# db_connection = Database.Database(stat_window.parent.config, stat_window.parent.db_name, 'temp')
# calculate the stat_dict and then create the text for the pu
# stat_dict = db_connection.get_stats_from_hand(stat_window.parent.hand, stat_window.player_id)
stat_dict = db_connection.get_stats_from_hand(stat_window.parent.hand)
db_connection.close_connection()
stat_dict = self.db_connection.get_stats_from_hand(stat_window.parent.hand)
# db_connection.close_connection()
pu_text = ""
for s in stat_list: