diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 4abac8ec..3fba5c5e 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -146,6 +146,14 @@ class Database: ranks = ('', '', '2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A') cards = "" for i in xrange(1, 8): +# key = 'card' + str(i) + 'Value' +# if not d.has_key(key): continue +# if d[key] == None: +# break +# elif d[key] == 0: +# cards += "xx" +# else: +# cards += ranks[d['card' + str(i) + 'Value']] + d['card' +str(i) + 'Suit'] cv = "card%dValue" % i if cv not in d or d[cv] == None: break diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index 5e4e6f3d..f7351526 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -2,18 +2,7 @@ - + @@ -60,18 +49,7 @@ - + @@ -106,41 +84,39 @@ - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + - + - + + + + + + + + + + + + @@ -153,7 +129,7 @@ - + @@ -177,7 +153,7 @@ - + @@ -185,7 +161,7 @@ - + @@ -220,15 +196,15 @@ - + - - - + + + diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index ddd6b30a..f47d93e9 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -219,8 +219,9 @@ class Hud: self.config.save() def adj_seats(self, hand, config): - - adj = xrange(0, self.max + 1) # default seat adjustments = no adjustment + +# 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? try: sys.stderr.write("site = %s, max = %d, fav seat = %d\n" % (self.table.site, self.max, config.supported_sites[self.table.site].layout[self.max].fav_seat)) diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 06a216b3..90af4b8f 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -215,7 +215,7 @@ class Stud_cards: self.config = config # self.db_name = db_name - self.card_images = self.get_card_images() + self.card_images = self.parent.get_card_images() self.seen_cards = {} self.grid_contents = {} self.eb = {} @@ -280,7 +280,7 @@ class Stud_cards: (4, cards[8:10]), (5, cards[10:12]), (6, cards[12:14])): if not i[1] == "xx": self.seen_cards[(i[0], c - 1)]. \ - set_from_pixbuf(self.card_images[self.split_cards(i[1])]) + set_from_pixbuf(self.card_images[self.parent.split_cards(i[1])]) ## action in tool tips for 3rd street cards for c in (0, 1, 2): for r in range(0, self.rows):