More GuiSessionViewer updates
Getting closer to a decent layout
This commit is contained in:
Worros
parent
397f654789
commit
a2309f704c
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
||||||
|
|
@ -50,6 +57,11 @@ class GuiSessionViewer (threading.Thread):
|
||||||
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)
|
||||||
self.cursor = self.db.cursor
|
self.cursor = self.db.cursor
|
||||||
|
|
@ -182,17 +194,27 @@ 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)
|
|
||||||
|
|
||||||
|
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))
|
||||||
|
|
||||||
|
|
||||||
|
self.graphBox = gtk.VBox(False, 0)
|
||||||
|
self.graphBox.show()
|
||||||
|
self.generateGraph(opens[:5], closes[:5], highs[:5], lows[:5])
|
||||||
|
|
||||||
|
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,82 +234,19 @@ 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: Will probably want to be able to filter this list eventually
|
||||||
# FIXME: Join on handsplayers for Hero to get other useful stuff like total profit?
|
# FIXME: Join on handsplayers for Hero to get other useful stuff like total profit?
|
||||||
|
|
||||||
|
|
||||||
|
# Postgres version requires - EXTRACT(epoch from h.handStart)
|
||||||
q = """
|
q = """
|
||||||
select UNIX_TIMESTAMP(h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
|
select UNIX_TIMESTAMP(h.handStart) as time, hp.handId, hp.startCash, hp.winnings, hp.totalProfit
|
||||||
from HandsPlayers hp
|
from HandsPlayers hp
|
||||||
|
|
@ -329,30 +288,110 @@ 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()
|
||||||
|
|
||||||
|
highs = [7.0999999999999996, -48.200000000000003, -79.400000000000006, -75.549999999999997, -66.700000000000003, -72.549999999999997, -64.799999999999997, -75.150000000000006, -61.350000000000001, -32.049999999999997, -19.899999999999999, -49.5, -172.75, -176.0, -230.56, -243.41]
|
||||||
|
lows = [-75.0, -84.900000000000006, -104.7, -131.0, -95.650000000000006, -136.65000000000001, -127.7, -113.59999999999999, -158.19999999999999, -66.349999999999994, -72.599999999999994, -171.84999999999999, -203.0, -257.94999999999999, -251.99000000000001, -246.56]
|
||||||
|
opens = [0.0, -64.349999999999994, -105.55, -79.400000000000006, -78.25, -75.700000000000003, -83.599999999999994, -81.950000000000003, -100.59999999999999, -60.299999999999997, -36.299999999999997, -49.600000000000001, -172.5, -197.55000000000001, -251.59999999999999, -246.93000000000001]
|
||||||
|
closes = [-64.450000000000003, -83.099999999999994, -79.400000000000006, -78.25, -75.700000000000003, -83.599999999999994, -81.950000000000003, -100.59999999999999, -61.350000000000001, -32.799999999999997, -49.950000000000003, -171.75, -197.55000000000001, -251.59999999999999, -247.84999999999999, -245.87]
|
||||||
|
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,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):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user