From e303123dfe22d6e73f248a11e68e7916735de4b6 Mon Sep 17 00:00:00 2001 From: lastpoet Date: Tue, 5 Oct 2010 15:42:05 +0100 Subject: [PATCH 1/2] explain defaults --- pyfpdb/Configuration.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index fdb7edb3..76f343e6 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -570,7 +570,8 @@ class GUICashStats(list): def get_defaults(self): """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'plposition', u'Posn', False, False, u'%s', u'str', 1.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'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'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'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], @@ -599,7 +600,7 @@ class GUICashStats(list): [u'variance', u'Variance', True, True, u'%5.2f', u'str', 1.0] ] for col in defaults: - self.append (col) + self.append (col) # def __str__(self): # s = "" From 0469b80e4428823352532bf93d9598f5f928dcaf Mon Sep 17 00:00:00 2001 From: lastpoet Date: Tue, 5 Oct 2010 18:04:06 +0100 Subject: [PATCH 2/2] Add name(s) and site(s) to the graph --- pyfpdb/GuiGraphViewer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py index df584d11..e3a8402d 100644 --- a/pyfpdb/GuiGraphViewer.py +++ b/pyfpdb/GuiGraphViewer.py @@ -148,6 +148,7 @@ class GuiGraphViewer (threading.Thread): limits = self.filters.getLimits() games = self.filters.getGames() graphops = self.filters.getGraphOps() + names = "" for i in ('show', 'none'): if i in limits: @@ -156,10 +157,11 @@ class GuiGraphViewer (threading.Thread): for site in sites: if sites[site] == True: 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) if result is not None: playerids.append(int(result)) + names = names + "\n"+_hname + " on "+site if not sitenos: #Should probably pop up here. @@ -226,7 +228,7 @@ class GuiGraphViewer (threading.Thread): #TODO: Do something useful like alert user #print "No hands returned by graph query" else: - self.ax.set_title(_("Profit graph for ring games")) + self.ax.set_title(_("Profit graph for ring games"+names),fontsize=12) #Draw plot self.ax.plot(green, color='green', label=_('Hands: %d\nProfit (%s): %.2f') %(len(green),graphops['dspin'], green[-1]))