diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index 722fcc74..ea2ebdef 100644 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -60,7 +60,7 @@ debugging: if False, pass on partially supported game types. If true, have a go logging.info("Initialising Absolute converter class") self.filetype = "text" self.codepage = "cp1252" - self.siteId = 3 # Needs to match id entry in Sites database + self.siteId = 5 # Needs to match id entry in Sites database self.debugging = debugging if autostart: self.start() diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index e01a6b43..2d59e8f1 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -584,19 +584,20 @@ class Config: return paths def get_frames(self, site = "PokerStars"): + if site not in self.supported_sites: return False return self.supported_sites[site].use_frames == True def get_default_colors(self, site = "PokerStars"): colors = {} - if self.supported_sites[site].hudopacity == "": + if site not in self.supported_sites or self.supported_sites[site].hudopacity == "": colors['hudopacity'] = 0.90 else: colors['hudopacity'] = float(self.supported_sites[site].hudopacity) - if self.supported_sites[site].hudbgcolor == "": + if site not in self.supported_sites or self.supported_sites[site].hudbgcolor == "": colors['hudbgcolor'] = "#FFFFFF" else: colors['hudbgcolor'] = self.supported_sites[site].hudbgcolor - if self.supported_sites[site].hudfgcolor == "": + if site not in self.supported_sites or self.supported_sites[site].hudfgcolor == "": colors['hudfgcolor'] = "#000000" else: colors['hudfgcolor'] = self.supported_sites[site].hudfgcolor @@ -604,6 +605,8 @@ class Config: def get_default_font(self, site = 'PokerStars'): (font, font_size) = ("Sans", "8") + if site not in self.supported_sites: + return ("Sans", "8") if self.supported_sites[site].font == "": font = "Sans" else: diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py index ffcab178..bc07f7d0 100644 --- a/pyfpdb/GuiPlayerStats.py +++ b/pyfpdb/GuiPlayerStats.py @@ -132,7 +132,7 @@ class GuiPlayerStats (threading.Thread): self.stats_vbox = gtk.VBox(False, 0) self.stats_vbox.show() self.stats_frame.add(self.stats_vbox) - self.fillStatsFrame(self.stats_vbox) + # self.fillStatsFrame(self.stats_vbox) self.main_hbox.pack_start(self.filters.get_vbox()) self.main_hbox.pack_start(self.stats_frame, expand=True, fill=True) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index 04b67c7a..8a7aa740 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -60,6 +60,8 @@ class Hud: def __init__(self, parent, table, max, poker_game, config, db_connection): # __init__ is (now) intended to be called from the stdin thread, so it # cannot touch the gui + if parent == None: # running from cli .. + self.parent = self self.parent = parent self.table = table self.config = config @@ -125,7 +127,8 @@ class Hud: self.menu = gtk.Menu() self.item1 = gtk.MenuItem('Kill this HUD') self.menu.append(self.item1) - self.item1.connect("activate", self.parent.kill_hud, self.table_name) + if self.parent != None: + self.item1.connect("activate", self.parent.kill_hud, self.table_name) self.item1.show() self.item2 = gtk.MenuItem('Save Layout') @@ -233,7 +236,7 @@ class Hud: # Need range here, not xrange -> need the actual list adj = range(0, self.max + 1) # default seat adjustments = no adjustment # does the user have a fav_seat? - if int(config.supported_sites[self.table.site].layout[self.max].fav_seat) > 0: + if self.table.site != None and int(config.supported_sites[self.table.site].layout[self.max].fav_seat) > 0: try: fav_seat = config.supported_sites[self.table.site].layout[self.max].fav_seat actual_seat = self.get_actual_seat(config.supported_sites[self.table.site].screen_name) @@ -600,15 +603,17 @@ if __name__== "__main__": c = Configuration.Config() #tables = Tables.discover(c) - t = Tables.discover_table_by_name(c, "Motorway") + t = Tables.discover_table_by_name(c, "Patriot Dr") if t is None: print "Table not found." db = Database.Database(c, 'fpdb', 'holdem') + + stat_dict = db.get_stats_from_hand(1) # for t in tables: - win = Hud(t, 10, 'holdem', c, db) - win.create(1, c) + win = Hud(None, t, 10, 'holdem', c, db) # parent, table, max, poker_game, config, db_connection + win.create(1, c, stat_dict, None) # hand, config, stat_dict, cards): # t.get_details() - win.update(8300, db, c) + win.update(8300, c) # self, hand, config): gtk.main()