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

Merge branch 'master' of git://git.assembla.com/fpdboz.git

Browse Source
This commit is contained in:
unknown 2009-10-27 11:05:31 -04:00
commit 269bc0b7a3
7 changed files with 273 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pyfpdb/GuiGraphViewer.py
View File

@ -97,34 +97,6 @@ class GuiGraphViewer (threading.Thread):
self.db.rollback() self.db.rollback()
#################################
#
# self.db.cursor.execute("""select UNIX_TIMESTAMP(handStart) as time, id from Hands ORDER BY time""")
# THRESHOLD = 1800
# hands = self.db.cursor.fetchall()
#
# times = map(lambda x:long(x[0]), hands)
# handids = map(lambda x:int(x[1]), hands)
# print "DEBUG: len(times) %s" %(len(times))
# diffs = diff(times)
# print "DEBUG: len(diffs) %s" %(len(diffs))
# index = nonzero(diff(times) > THRESHOLD)
# print "DEBUG: len(index[0]) %s" %(len(index[0]))
# print "DEBUG: index %s" %(index)
# print "DEBUG: index[0][0] %s" %(index[0][0])
#
# total = 0
#
# last_idx = 0
# for i in range(len(index[0])):
# print "Hands in session %4s: %4s Start: %s End: %s Total: %s" %(i, index[0][i] - last_idx, strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])), strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])), times[index[0][i]] - times[last_idx])
# total = total + (index[0][i] - last_idx)
# last_idx = index[0][i] + 1
#
# print "Total: ", total
#################################
def get_vbox(self): def get_vbox(self):
"""returns the vbox of this thread""" """returns the vbox of this thread"""
return self.mainHBox return self.mainHBox

117
pyfpdb/GuiPlayerStats.py
View File

@ -15,6 +15,7 @@
#In the "official" distribution you can find the license in #In the "official" distribution you can find the license in
#agpl-3.0.txt in the docs folder of the package. #agpl-3.0.txt in the docs folder of the package.
import traceback
import threading import threading
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
@ -29,7 +30,11 @@ import Database
import fpdb_db import fpdb_db
import Filters import Filters
colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5
ranks = {'x':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}
class GuiPlayerStats (threading.Thread): class GuiPlayerStats (threading.Thread):
def __init__(self, config, querylist, mainwin, debug=True): def __init__(self, config, querylist, mainwin, debug=True):
self.debug = debug self.debug = debug
self.conf = config self.conf = config
@ -210,8 +215,8 @@ class GuiPlayerStats (threading.Thread):
# Display summary table at top of page # Display summary table at top of page
# 3rd parameter passes extra flags, currently includes: # 3rd parameter passes extra flags, currently includes:
# holecards - whether to display card breakdown (True/False) # holecards - whether to display card breakdown (True/False)
# numhands - min number hands required when displaying all players # numhands - min number hands required when displaying all players
flags = [False, self.filters.getNumHands()] flags = [False, self.filters.getNumHands()]
self.addTable(swin, 'playerDetailedStats', flags, playerids, sitenos, limits, type, seats, groups, dates) self.addTable(swin, 'playerDetailedStats', flags, playerids, sitenos, limits, type, seats, groups, dates)
@ -248,26 +253,65 @@ class GuiPlayerStats (threading.Thread):
cell.set_property('text', str) cell.set_property('text', str)
cell.set_property('foreground', 'red') cell.set_property('foreground', 'red')
else: else:
cell.set_property('foreground', 'green') cell.set_property('foreground', 'darkgreen')
return return
def sortnums(self, model, iter1, iter2, n):
try:
ret = 0
a = self.liststore.get_value(iter1, n)
b = self.liststore.get_value(iter2, n)
if 'f' in self.cols_to_show[n][4]:
try: a = float(a)
except: a = 0.0
try: b = float(b)
except: b = 0.0
if n == 0:
a1,a2,a3 = ranks[a[0]], ranks[a[1]], (a+'o')[2]
b1,b2,b3 = ranks[b[0]], ranks[b[1]], (b+'o')[2]
if a1 > b1 or ( a1 == b1 and (a2 > b2 or (a2 == b2 and a3 > b3) ) ):
ret = 1
else:
ret = -1
else:
if a < b:
ret = -1
elif a == b:
ret = 0
else:
ret = 1
#print "n =", n, "iter1[n] =", self.liststore.get_value(iter1,n), "iter2[n] =", self.liststore.get_value(iter2,n), "ret =", ret
except:
err = traceback.extract_tb(sys.exc_info()[2])
print "***sortnums error: " + str(sys.exc_info()[1])
print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] )
return(ret)
def sortcols(self, col, n): def sortcols(self, col, n):
#This doesn't actually work yet try:
if n == 0: #This doesn't actually work yet - clicking heading in top section sorts bottom section :-(
# Card values can stay the same for the moment. if col.get_sort_order() == gtk.SORT_ASCENDING:
return col.set_sort_order(gtk.SORT_DESCENDING)
if col.get_sort_order() == gtk.SORT_ASCENDING: else:
col.set_sort_order(gtk.SORT_DESCENDING) col.set_sort_order(gtk.SORT_ASCENDING)
else: self.liststore.set_sort_column_id(n, col.get_sort_order())
col.set_sort_order(gtk.SORT_ASCENDING) self.liststore.set_sort_func(n, self.sortnums, n)
self.liststore.set_sort_column_id(n, col.get_sort_order()) for i in xrange(len(self.listcols)):
self.listcols[i].set_sort_indicator(False)
self.listcols[n].set_sort_indicator(True)
# use this listcols[col].set_sort_indicator(True)
# to turn indicator off for other cols
except:
err = traceback.extract_tb(sys.exc_info()[2])
print "***sortcols error: " + str(sys.exc_info()[1])
print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] )
def addTable(self, vbox, query, flags, playerids, sitenos, limits, type, seats, groups, dates): def addTable(self, vbox, query, flags, playerids, sitenos, limits, type, seats, groups, dates):
counter = 0 counter = 0
row = 0 row = 0
sqlrow = 0 sqlrow = 0
colalias,colshow,colheading,colxalign,colformat,coltype = 0,1,2,3,4,5
if not flags: holecards = False if not flags: holecards = False
else: holecards = flags[0] else: holecards = flags[0]
@ -278,10 +322,10 @@ class GuiPlayerStats (threading.Thread):
colnames = [desc[0].lower() for desc in self.cursor.description] colnames = [desc[0].lower() for desc in self.cursor.description]
# pre-fetch some constant values: # pre-fetch some constant values:
cols_to_show = [x for x in self.columns if x[colshow]] self.cols_to_show = [x for x in self.columns if x[colshow]]
hgametypeid_idx = colnames.index('hgametypeid') hgametypeid_idx = colnames.index('hgametypeid')
self.liststore = gtk.ListStore(*([str] * len(cols_to_show))) self.liststore = gtk.ListStore(*([str] * len(self.cols_to_show)))
view = gtk.TreeView(model=self.liststore) view = gtk.TreeView(model=self.liststore)
view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH) view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH)
#vbox.pack_start(view, expand=False, padding=3) #vbox.pack_start(view, expand=False, padding=3)
@ -291,44 +335,45 @@ class GuiPlayerStats (threading.Thread):
textcell50.set_property('xalign', 0.5) textcell50.set_property('xalign', 0.5)
numcell = gtk.CellRendererText() numcell = gtk.CellRendererText()
numcell.set_property('xalign', 1.0) numcell.set_property('xalign', 1.0)
listcols = [] self.listcols = []
idx = 0
# Create header row eg column: ("game", True, "Game", 0.0, "%s") # Create header row eg column: ("game", True, "Game", 0.0, "%s")
for col, column in enumerate(cols_to_show): for col, column in enumerate(self.cols_to_show):
if column[colalias] == 'game' and holecards: if column[colalias] == 'game' and holecards:
s = [x for x in self.columns if x[colalias] == 'hand'][0][colheading] s = [x for x in self.columns if x[colalias] == 'hand'][0][colheading]
else: else:
s = column[colheading] s = column[colheading]
listcols.append(gtk.TreeViewColumn(s)) self.listcols.append(gtk.TreeViewColumn(s))
view.append_column(listcols[col]) view.append_column(self.listcols[col])
#listcols[col].set_clickable(True)
#listcols[col].set_sort_indicator(True)
#listcols[col].connect("clicked", self.sortcols, idx)
if column[colformat] == '%s': if column[colformat] == '%s':
if column[colxalign] == 0.0: if column[colxalign] == 0.0:
listcols[col].pack_start(textcell, expand=True) self.listcols[col].pack_start(textcell, expand=True)
listcols[col].add_attribute(textcell, 'text', col) self.listcols[col].add_attribute(textcell, 'text', col)
else: else:
listcols[col].pack_start(textcell50, expand=True) self.listcols[col].pack_start(textcell50, expand=True)
listcols[col].add_attribute(textcell50, 'text', col) self.listcols[col].add_attribute(textcell50, 'text', col)
listcols[col].set_expand(True) self.listcols[col].set_expand(True)
else: else:
listcols[col].pack_start(numcell, expand=True) self.listcols[col].pack_start(numcell, expand=True)
listcols[col].add_attribute(numcell, 'text', col) self.listcols[col].add_attribute(numcell, 'text', col)
listcols[col].set_expand(True) self.listcols[col].set_expand(True)
#listcols[col].set_alignment(column[colxalign]) # no effect? #self.listcols[col].set_alignment(column[colxalign]) # no effect?
if holecards:
self.listcols[col].set_clickable(True)
self.listcols[col].connect("clicked", self.sortcols, col)
if col == 0:
self.listcols[col].set_sort_order(gtk.SORT_DESCENDING)
self.listcols[col].set_sort_indicator(True)
if column[coltype] == 'cash': if column[coltype] == 'cash':
listcols[col].set_cell_data_func(numcell, self.ledger_style_render_func) self.listcols[col].set_cell_data_func(numcell, self.ledger_style_render_func)
else: else:
listcols[col].set_cell_data_func(numcell, self.reset_style_render_func) self.listcols[col].set_cell_data_func(numcell, self.reset_style_render_func)
idx = idx+1
rows = len(result) # +1 for title row rows = len(result) # +1 for title row
while sqlrow < rows: while sqlrow < rows:
treerow = [] treerow = []
for col,column in enumerate(cols_to_show): for col,column in enumerate(self.cols_to_show):
if column[colalias] in colnames: if column[colalias] in colnames:
value = result[sqlrow][colnames.index(column[colalias])] value = result[sqlrow][colnames.index(column[colalias])]
if column[colalias] == 'plposition': if column[colalias] == 'plposition':

268
pyfpdb/GuiSessionViewer.py
View File

@ -21,10 +21,17 @@ import pygtk
pygtk.require('2.0') pygtk.require('2.0')
import gtk import gtk
import os import os
import traceback
from time import time, strftime, localtime from time import time, strftime, localtime
try: try:
import matplotlib
matplotlib.use('GTK')
from matplotlib.figure import Figure
from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
from matplotlib.finance import candlestick2
from numpy import diff, nonzero, sum, cumsum, max, mina from numpy import diff, nonzero, sum, cumsum, max, mina
import matplotlib.finance
# from matplotlib.dates import DateFormatter, WeekdayLocator, HourLocator, \ # from matplotlib.dates import DateFormatter, WeekdayLocator, HourLocator, \
# DayLocator, MONDAY, timezone # DayLocator, MONDAY, timezone
@ -49,6 +56,11 @@ class GuiSessionViewer (threading.Thread):
self.MYSQL_INNODB = 2 self.MYSQL_INNODB = 2
self.PGSQL = 3 self.PGSQL = 3
self.SQLITE = 4 self.SQLITE = 4
self.fig = None
self.canvas = None
self.ax = None
self.graphBox = None
# create new db connection to avoid conflicts with other threads # create new db connection to avoid conflicts with other threads
self.db = Database.Database(self.conf, sql=self.sql) self.db = Database.Database(self.conf, sql=self.sql)
@ -67,17 +79,17 @@ class GuiSessionViewer (threading.Thread):
filters_display = { "Heroes" : True, filters_display = { "Heroes" : True,
"Sites" : True, "Sites" : True,
"Games" : False, "Games" : False,
"Limits" : True, "Limits" : False,
"LimitSep" : True, "LimitSep" : False,
"LimitType" : True, "LimitType" : False,
"Type" : True, "Type" : True,
"Seats" : True, "Seats" : False,
"SeatSep" : True, "SeatSep" : False,
"Dates" : True, "Dates" : True,
"Groups" : True, "Groups" : False,
"GroupsAll" : True, "GroupsAll" : False,
"Button1" : True, "Button1" : True,
"Button2" : True "Button2" : False
} }
self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display) self.filters = Filters.Filters(self.db, self.conf, self.sql, display = filters_display)
@ -182,17 +194,20 @@ class GuiSessionViewer (threading.Thread):
print "No limits found" print "No limits found"
return return
self.createStatsTable(vbox, playerids, sitenos, limits, seats) self.createStatsPane(vbox, playerids, sitenos, limits, seats)
def createStatsTable(self, vbox, playerids, sitenos, limits, seats): def createStatsPane(self, vbox, playerids, sitenos, limits, seats):
starttime = time() starttime = time()
# Display summary table at top of page (results, opens, closes, highs, lows) = self.generateDatasets(playerids, sitenos, limits, seats)
# 3rd parameter passes extra flags, currently includes:
# holecards - whether to display card breakdown (True/False)
flags = [False]
self.addTable(vbox, 'playerDetailedStats', flags, playerids, sitenos, limits, seats)
self.graphBox = gtk.VBox(False, 0)
self.graphBox.show()
self.generateGraph(opens, closes, highs, lows)
vbox.pack_start(self.graphBox)
# Separator # Separator
sep = gtk.HSeparator() sep = gtk.HSeparator()
vbox.pack_start(sep, expand=False, padding=3) vbox.pack_start(sep, expand=False, padding=3)
@ -212,92 +227,24 @@ class GuiSessionViewer (threading.Thread):
vbox1.show() vbox1.show()
swin.add_with_viewport(vbox1) swin.add_with_viewport(vbox1)
# Detailed table self.addTable(vbox1, results)
flags = [True]
self.addTable(vbox1, 'playerDetailedStats', flags, playerids, sitenos, limits, seats)
self.db.rollback() self.db.rollback()
print "Stats page displayed in %4.2f seconds" % (time() - starttime) print "Stats page displayed in %4.2f seconds" % (time() - starttime)
#end def fillStatsFrame(self, vbox): #end def fillStatsFrame(self, vbox):
def generateGraph(self, vbox, data): def generateDatasets(self, playerids, sitenos, limits, seats):
fig = figure()
fig.subplots_adjust(bottom=0.2)
ax = fig.add_subplot(111)
ax.xaxis.set_major_locator(mondays)
ax.xaxis.set_minor_locator(alldays)
ax.xaxis.set_major_formatter(weekFormatter)
#ax.xaxis.set_minor_formatter(dayFormatter)
#plot_day_summary(ax, quotes, ticksize=3)
# candlestick(ax, quotes, width=0.6)
# candlestick2(ax, opens, closes, highs, lows, width=4, colorup='k', colordown='r', alpha=0.75)
# Represent the open, close as a bar line and high low range as a vertical line.
# ax : an Axes instance to plot to
# width : the bar width in points
# colorup : the color of the lines where close >= open
# colordown : the color of the lines where close < open
# alpha : bar transparency
# return value is lineCollection, barCollection
ax.xaxis_date()
ax.autoscale_view()
setp( gca().get_xticklabels(), rotation=45, horizontalalignment='right')
show()
def addTable(self, vbox, query, flags, playerids, sitenos, limits, seats):
row = 0
sqlrow = 0
colalias,colshow,colheading,colxalign,colformat = 0,1,2,3,4
if not flags: holecards = False
else: holecards = flags[0]
# pre-fetch some constant values:
cols_to_show = [x for x in self.columns if x[colshow]]
self.liststore = gtk.ListStore(*([str] * len(cols_to_show)))
view = gtk.TreeView(model=self.liststore)
view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH)
vbox.add(view)
textcell = gtk.CellRendererText()
textcell50 = gtk.CellRendererText()
textcell50.set_property('xalign', 0.5)
numcell = gtk.CellRendererText()
numcell.set_property('xalign', 1.0)
listcols = []
# Create header row eg column: ("game", True, "Game", 0.0, "%s")
for col, column in enumerate(cols_to_show):
s = column[colheading]
listcols.append(gtk.TreeViewColumn(s))
view.append_column(listcols[col])
if column[colformat] == '%s':
if column[colxalign] == 0.0:
listcols[col].pack_start(textcell, expand=True)
listcols[col].add_attribute(textcell, 'text', col)
else:
listcols[col].pack_start(textcell50, expand=True)
listcols[col].add_attribute(textcell50, 'text', col)
listcols[col].set_expand(True)
else:
listcols[col].pack_start(numcell, expand=True)
listcols[col].add_attribute(numcell, 'text', col)
listcols[col].set_expand(True)
# Get a list of all handids and their timestampts # Get a list of all handids and their timestampts
# FIXME: Will probably want to be able to filter this list eventually #FIXME: Query still need to filter on blind levels
# FIXME: Join on handsplayers for Hero to get other useful stuff like total profit?
q = """ q = self.sql.query['sessionStats']
select UNIX_TIMESTAMP(h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit start_date, end_date = self.filters.getDates()
from HandsPlayers hp q = q.replace("<datestest>", " between '" + start_date + "' and '" + end_date + "'")
inner join Hands h on (h.id = hp.handId)
inner join Gametypes gt on (gt.Id = h.gameTypeId) nametest = str(tuple(playerids))
inner join Sites s on (s.Id = gt.siteId) nametest = nametest.replace("L", "")
inner join Players p on (p.Id = hp.playerId) nametest = nametest.replace(",)",")")
where hp.playerId in (2) q = q.replace("<player_test>", nametest)
order by time
"""
self.db.cursor.execute(q) self.db.cursor.execute(q)
THRESHOLD = 1800 THRESHOLD = 1800
hands = self.db.cursor.fetchall() hands = self.db.cursor.fetchall()
@ -329,30 +276,121 @@ order by time
for i in range(len(index[0])): for i in range(len(index[0])):
sid = i # Session id sid = i # Session id
hds = index[0][i] - last_idx # Number of hands in session hds = index[0][i] - last_idx # Number of hands in session
stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])) # Formatted start time if hds > 0:
etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])) # Formatted end time stime = strftime("%d/%m/%Y %H:%M", localtime(times[last_idx])) # Formatted start time
hph = (times[index[0][i]] - times[last_idx])/60 # Hands per hour etime = strftime("%d/%m/%Y %H:%M", localtime(times[index[0][i]])) # Formatted end time
won = sum(winnings[last_idx:index[0][i]])/100.0 hph = (times[index[0][i]] - times[last_idx])/60 # Hands per hour
hwm = max(cum_sum[last_idx:index[0][i]]) won = sum(winnings[last_idx:index[0][i]])/100.0
lwm = min(cum_sum[last_idx:index[0][i]]) hwm = max(cum_sum[last_idx:index[0][i]])
print "DEBUG: range: (%s, %s) - (min, max): (%s, %s)" %(last_idx, index[0][i], hwm, lwm) lwm = min(cum_sum[last_idx:index[0][i]])
#print "DEBUG: range: (%s, %s) - (min, max): (%s, %s)" %(last_idx, index[0][i], hwm, lwm)
results.append([sid, hds, stime, etime, hph, won]) results.append([sid, hds, stime, etime, hph, won])
opens.append((sum(winnings[:last_idx]))/100) opens.append((sum(winnings[:last_idx]))/100)
closes.append((sum(winnings[:index[0][i]]))/100) closes.append((sum(winnings[:index[0][i]]))/100)
highs.append(hwm) highs.append(hwm)
lows.append(lwm) lows.append(lwm)
print "Hands in session %4s: %4s Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won) #print "Hands in session %4s: %4s Start: %s End: %s HPH: %s Profit: %s" %(sid, hds, stime, etime, hph, won)
total = total + (index[0][i] - last_idx) total = total + (index[0][i] - last_idx)
last_idx = index[0][i] + 1 last_idx = index[0][i] + 1
return (results, opens, closes, highs, lows)
def clearGraphData(self):
try:
try:
if self.canvas:
self.graphBox.remove(self.canvas)
except:
pass
if self.fig != None:
self.fig.clear()
self.fig = Figure(figsize=(5,4), dpi=100)
if self.canvas is not None:
self.canvas.destroy()
self.canvas = FigureCanvas(self.fig) # a gtk.DrawingArea
except:
err = traceback.extract_tb(sys.exc_info()[2])[-1]
print "***Error: "+err[2]+"("+str(err[1])+"): "+str(sys.exc_info()[1])
raise
def generateGraph(self, opens, closes, highs, lows):
self.clearGraphData()
#FIXME: Weird - first data entry is crashing this for me
opens = opens[1:]
closes = closes[1:]
highs = highs[1:]
lows = lows[1:]
# print "DEBUG:"
# print "highs = %s" % highs
# print "lows = %s" % lows
# print "opens = %s" % opens
# print "closes = %s" % closes
# print "len(highs): %s == len(lows): %s" %(len(highs), len(lows))
# print "len(opens): %s == len(closes): %s" %(len(opens), len(closes))
#
# for i in range(len(highs)):
# print "DEBUG: (%s, %s, %s, %s)" %(lows[i], opens[i], closes[i], highs[i])
# print "DEBUG: diffs h/l: %s o/c: %s" %(lows[i] - highs[i], opens[i] - closes[i])
self.ax = self.fig.add_subplot(111)
self.ax.set_title("Session candlestick graph")
#Set axis labels and grid overlay properites
self.ax.set_xlabel("Sessions", fontsize = 12)
self.ax.set_ylabel("$", fontsize = 12)
self.ax.grid(color='g', linestyle=':', linewidth=0.2)
candlestick2(self.ax, opens, closes, highs, lows, width=0.50, colordown='r', colorup='g', alpha=1.00)
self.graphBox.add(self.canvas)
self.canvas.show()
self.canvas.draw()
def addTable(self, vbox, results):
row = 0
sqlrow = 0
colalias,colshow,colheading,colxalign,colformat = 0,1,2,3,4
# pre-fetch some constant values:
cols_to_show = [x for x in self.columns if x[colshow]]
self.liststore = gtk.ListStore(*([str] * len(cols_to_show)))
for row in results: for row in results:
iter = self.liststore.append(row) iter = self.liststore.append(row)
print "DEBUG: highs = %s" % highs view = gtk.TreeView(model=self.liststore)
print "DEBUG: lows = %s" % lows view.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_BOTH)
print "DEBUG: opens = %s" % opens vbox.add(view)
print "DEBUG: closes = %s" % closes textcell = gtk.CellRendererText()
textcell50 = gtk.CellRendererText()
textcell50.set_property('xalign', 0.5)
numcell = gtk.CellRendererText()
numcell.set_property('xalign', 1.0)
listcols = []
# Create header row eg column: ("game", True, "Game", 0.0, "%s")
for col, column in enumerate(cols_to_show):
s = column[colheading]
listcols.append(gtk.TreeViewColumn(s))
view.append_column(listcols[col])
if column[colformat] == '%s':
if column[colxalign] == 0.0:
listcols[col].pack_start(textcell, expand=True)
listcols[col].add_attribute(textcell, 'text', col)
else:
listcols[col].pack_start(textcell50, expand=True)
listcols[col].add_attribute(textcell50, 'text', col)
listcols[col].set_expand(True)
else:
listcols[col].pack_start(numcell, expand=True)
listcols[col].add_attribute(numcell, 'text', col)
listcols[col].set_expand(True)
vbox.show_all() vbox.show_all()

7
pyfpdb/Mucked.py
View File

@ -63,7 +63,12 @@ class Aux_Window(object):
card_images = 53 * [0] card_images = 53 * [0]
suits = ('s', 'h', 'd', 'c') suits = ('s', 'h', 'd', 'c')
ranks = (14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2) ranks = (14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2)
pb = gtk.gdk.pixbuf_new_from_file(self.config.execution_path(self.params['deck'])) deckimg = self.params['deck']
try:
pb = gtk.gdk.pixbuf_new_from_file(self.config.execution_path(deckimg))
except:
stockpath = '/usr/share/python-fpdb/' + deckimg
pb = gtk.gdk.pixbuf_new_from_file(stockpath)
for j in range(0, 13): for j in range(0, 13):
for i in range(0, 4): for i in range(0, 4):

27
pyfpdb/SQL.py
View File

@ -2475,6 +2475,33 @@ class Sql:
GROUP BY h.handStart, hp.handId, hp.totalProfit GROUP BY h.handStart, hp.handId, hp.totalProfit
ORDER BY h.handStart""" ORDER BY h.handStart"""
####################################
# Session stats query
####################################
if db_server == 'mysql':
self.query['sessionStats'] = """
SELECT UNIX_TIMESTAMP(h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
FROM HandsPlayers hp
INNER JOIN Hands h on (h.id = hp.handId)
INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId)
INNER JOIN Sites s on (s.Id = gt.siteId)
INNER JOIN Players p on (p.Id = hp.playerId)
WHERE hp.playerId in <player_test>
AND date_format(h.handStart, '%Y-%m-%d') <datestest>
ORDER by time"""
elif db_server == 'postgresql':
self.query['sessionStats'] = """
SELECT EXTRACT(epoch from h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
FROM HandsPlayers hp
INNER JOIN Hands h on (h.id = hp.handId)
INNER JOIN Gametypes gt on (gt.Id = h.gameTypeId)
INNER JOIN Sites s on (s.Id = gt.siteId)
INNER JOIN Players p on (p.Id = hp.playerId)
WHERE hp.playerId in <player_test>
AND h.handStart <datestest>
ORDER by time"""
elif db_server == 'sqlite':
self.query['sessionStats'] = """ """
#################################### ####################################
# Queries to rebuild/modify hudcache # Queries to rebuild/modify hudcache

4
pyfpdb/fpdb.py
View File

@ -82,7 +82,7 @@ import FpdbSQLQueries
import Configuration import Configuration
from Exceptions import * from Exceptions import *
VERSION = "0.11" VERSION = "0.12"
class fpdb: class fpdb:
def tab_clicked(self, widget, tab_name): def tab_clicked(self, widget, tab_name):
@ -656,6 +656,8 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
else: else:
self.window.set_skip_taskbar_hint(False) self.window.set_skip_taskbar_hint(False)
self.window.set_skip_pager_hint(False) self.window.set_skip_pager_hint(False)
# Tell GTK not to propagate this signal any further
return True
def statusicon_menu(self, widget, button, time, data = None): def statusicon_menu(self, widget, button, time, data = None):
# we don't need to pass data here, since we do keep track of most all # we don't need to pass data here, since we do keep track of most all

4
setup.py
View File

@ -19,6 +19,8 @@ setup(name = 'fpdb',
('/usr/share/applications', ('/usr/share/applications',
['files/fpdb.desktop']), ['files/fpdb.desktop']),
('/usr/share/python-fpdb', ('/usr/share/python-fpdb',
['pyfpdb/logging.conf']) ['pyfpdb/logging.conf', 'pyfpdb/Cards01.png',
'pyfpdb/HUD_config.xml.example'
])
] ]
) )