diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 9e6cde73..69acf7e7 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -376,7 +376,7 @@ class Flop_Mucked(Aux_Window): self.seen_cards[i].set_from_pixbuf(scratch) # self.m_windows[i].show_all() self.m_windows[i].resize(1,1) - self.m_windows[i].present() + self.m_windows[i].show() self.m_windows[i].move(self.positions[i][0], self.positions[i][1]) # here is where I move back self.displayed_cards = True @@ -407,7 +407,7 @@ class Flop_Mucked(Aux_Window): """Hide the mucked card windows.""" for (i, w) in self.m_windows.iteritems(): w.hide() - self.displayed_cards = False + self.displayed_cards = False def button_press_cb(self, widget, event, *args): """Handle button clicks in the event boxes.""" @@ -437,7 +437,7 @@ class Flop_Mucked(Aux_Window): def expose_all(self): for (i, cards) in self.hud.cards.iteritems(): - self.m_windows[i].present() + self.m_windows[i].show() self.m_windows[i].move(self.positions[i][0], self.positions[i][1]) # here is where I move back self.displayed_cards = True diff --git a/pyfpdb/fpdb_save_to_db.py b/pyfpdb/fpdb_save_to_db.py index 01bd71cc..d48f669b 100644 --- a/pyfpdb/fpdb_save_to_db.py +++ b/pyfpdb/fpdb_save_to_db.py @@ -73,7 +73,8 @@ def ring_holdem_omaha(config, backend, db, cursor, base, category, site_hand_no, saveActions = False if import_options['saveActions'] == 'False' else True fastStoreHudCache = False if import_options['fastStoreHudCache'] == 'False' else True - # print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache) +# print "DEBUG: saveActions = '%s' fastStoreHudCache = '%s'"%(saveActions, fastStoreHudCache) +# print "DEBUG: import_options = ", import_options t0 = time() fpdb_simple.fillCardArrays(len(names), base, category, card_values, card_suits) diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py index aa876804..27ce23da 100644 --- a/pyfpdb/fpdb_simple.py +++ b/pyfpdb/fpdb_simple.py @@ -513,7 +513,8 @@ def convertCardValues(arr): map(convertCardValuesBoard, arr) #end def convertCardValues -card_map = { "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8, "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14} +# a 0-card is one in a stud game that we did not see or was not shown +card_map = { "0": 0, "2": 2, "3" : 3, "4" : 4, "5" : 5, "6" : 6, "7" : 7, "8" : 8, "9" : 9, "T" : 10, "J" : 11, "Q" : 12, "K" : 13, "A" : 14} #converts the strings in the given array to ints (changes the passed array, no returning). see table design for conversion details def convertCardValuesBoard(arr):