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

Merge branch 'master' of git://github.com/lastpoet/fpdb-lastpoet

Browse Source
This commit is contained in:
Worros 2010-10-06 10:47:23 +08:00
commit 2e2317d73f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyfpdb/Configuration.py
View File

@ -570,7 +570,8 @@ class GUICashStats(list):
def get_defaults(self): def get_defaults(self):
"""A list of defaults to be called, should there be no entry in config""" """A list of defaults to be called, should there be no entry in config"""
defaults = [ [u'game', u'Game', True, True, u'%s', u'str', 0.0], # SQL column name, display title, display all, display positional, format, type, alignment
defaults = [ [u'game', u'Game', True, True, u'%s', u'str', 0.0],
[u'hand', u'Hand', False, False, u'%s', u'str', 0.0], [u'hand', u'Hand', False, False, u'%s', u'str', 0.0],
[u'plposition', u'Posn', False, False, u'%s', u'str', 1.0], [u'plposition', u'Posn', False, False, u'%s', u'str', 1.0],
[u'pname', u'Name', False, False, u'%s', u'str', 0.0], [u'pname', u'Name', False, False, u'%s', u'str', 0.0],
@ -578,7 +579,7 @@ class GUICashStats(list):
[u'avgseats', u'Seats', False, False, u'%3.1f', u'str', 1.0], [u'avgseats', u'Seats', False, False, u'%3.1f', u'str', 1.0],
[u'vpip', u'VPIP', True, True, u'%3.1f', u'str', 1.0], [u'vpip', u'VPIP', True, True, u'%3.1f', u'str', 1.0],
[u'pfr', u'PFR', True, True, u'%3.1f', u'str', 1.0], [u'pfr', u'PFR', True, True, u'%3.1f', u'str', 1.0],
[u'pf3', u'PF3', True, True, u'%3.1f', u'str', 1.0], [u'pf3', u'PF9', True, True, u'%3.1f', u'str', 1.0],
[u'aggfac', u'AggFac', True, True, u'%2.2f', u'str', 1.0], [u'aggfac', u'AggFac', True, True, u'%2.2f', u'str', 1.0],
[u'aggfrq', u'AggFreq', True, True, u'%3.1f', u'str', 1.0], [u'aggfrq', u'AggFreq', True, True, u'%3.1f', u'str', 1.0],
[u'conbet', u'ContBet', True, True, u'%3.1f', u'str', 1.0], [u'conbet', u'ContBet', True, True, u'%3.1f', u'str', 1.0],
@ -599,7 +600,7 @@ class GUICashStats(list):
[u'variance', u'Variance', True, True, u'%5.2f', u'str', 1.0] [u'variance', u'Variance', True, True, u'%5.2f', u'str', 1.0]
] ]
for col in defaults: for col in defaults:
self.append (col) self.append (col)
# def __str__(self): # def __str__(self):
# s = "" # s = ""

6
pyfpdb/GuiGraphViewer.py
View File

@ -148,6 +148,7 @@ class GuiGraphViewer (threading.Thread):
limits = self.filters.getLimits() limits = self.filters.getLimits()
games = self.filters.getGames() games = self.filters.getGames()
graphops = self.filters.getGraphOps() graphops = self.filters.getGraphOps()
names = ""
for i in ('show', 'none'): for i in ('show', 'none'):
if i in limits: if i in limits:
@ -156,10 +157,11 @@ class GuiGraphViewer (threading.Thread):
for site in sites: for site in sites:
if sites[site] == True: if sites[site] == True:
sitenos.append(siteids[site]) sitenos.append(siteids[site])
_hname = Charset.to_utf8(heroes[site]) _hname = Charset.to_utf8(heroes[site])
result = self.db.get_player_id(self.conf, site, _hname) result = self.db.get_player_id(self.conf, site, _hname)
if result is not None: if result is not None:
playerids.append(int(result)) playerids.append(int(result))
names = names + "\n"+_hname + " on "+site
if not sitenos: if not sitenos:
#Should probably pop up here. #Should probably pop up here.
@ -226,7 +228,7 @@ class GuiGraphViewer (threading.Thread):
#TODO: Do something useful like alert user #TODO: Do something useful like alert user
#print "No hands returned by graph query" #print "No hands returned by graph query"
else: else:
self.ax.set_title(_("Profit graph for ring games")) self.ax.set_title(_("Profit graph for ring games"+names),fontsize=12)
#Draw plot #Draw plot
self.ax.plot(green, color='green', label=_('Hands: %d\nProfit (%s): %.2f') %(len(green),graphops['dspin'], green[-1])) self.ax.plot(green, color='green', label=_('Hands: %d\nProfit (%s): %.2f') %(len(green),graphops['dspin'], green[-1]))