Make Grapher use new Filters object
This commit is contained in:
Worros
parent
2550a0b0e0
commit
d16bb0ac8b
|
|
@ -96,8 +96,7 @@ class Filters(threading.Thread):
|
||||||
self.fillDateFrame(vbox)
|
self.fillDateFrame(vbox)
|
||||||
dateFrame.add(vbox)
|
dateFrame.add(vbox)
|
||||||
|
|
||||||
graphButton=gtk.Button("Generate Graph")
|
self.graphButton=gtk.Button("Generate Graph")
|
||||||
#graphButton.connect("clicked", self.generateGraph, "cliced data")
|
|
||||||
|
|
||||||
self.fig = None
|
self.fig = None
|
||||||
self.exportButton=gtk.Button("Export to File")
|
self.exportButton=gtk.Button("Export to File")
|
||||||
|
|
@ -109,7 +108,7 @@ class Filters(threading.Thread):
|
||||||
self.mainVBox.add(gamesFrame)
|
self.mainVBox.add(gamesFrame)
|
||||||
self.mainVBox.add(limitsFrame)
|
self.mainVBox.add(limitsFrame)
|
||||||
self.mainVBox.add(dateFrame)
|
self.mainVBox.add(dateFrame)
|
||||||
self.mainVBox.add(graphButton)
|
self.mainVBox.add(self.graphButton)
|
||||||
self.mainVBox.add(self.exportButton)
|
self.mainVBox.add(self.exportButton)
|
||||||
|
|
||||||
self.mainVBox.show_all()
|
self.mainVBox.show_all()
|
||||||
|
|
@ -119,6 +118,21 @@ class Filters(threading.Thread):
|
||||||
return self.mainVBox
|
return self.mainVBox
|
||||||
#end def get_vbox
|
#end def get_vbox
|
||||||
|
|
||||||
|
def getSites(self):
|
||||||
|
return self.sites
|
||||||
|
|
||||||
|
def getSiteIds(self):
|
||||||
|
return self.siteid
|
||||||
|
|
||||||
|
def getHeroes(self):
|
||||||
|
return self.heroes
|
||||||
|
|
||||||
|
def getDates(self):
|
||||||
|
return self.__get_dates()
|
||||||
|
|
||||||
|
def registerGraphCallback(self, callback):
|
||||||
|
self.graphButton.connect("clicked", callback, "clicked")
|
||||||
|
|
||||||
def createPlayerLine(self, hbox, site, player):
|
def createPlayerLine(self, hbox, site, player):
|
||||||
label = gtk.Label(site +" id:")
|
label = gtk.Label(site +" id:")
|
||||||
hbox.pack_start(label, False, False, 0)
|
hbox.pack_start(label, False, False, 0)
|
||||||
|
|
@ -266,6 +280,12 @@ class Filters(threading.Thread):
|
||||||
def __get_dates(self):
|
def __get_dates(self):
|
||||||
t1 = self.start_date.get_text()
|
t1 = self.start_date.get_text()
|
||||||
t2 = self.end_date.get_text()
|
t2 = self.end_date.get_text()
|
||||||
|
|
||||||
|
if t1 == '':
|
||||||
|
t1 = '1970-01-01'
|
||||||
|
if t2 == '':
|
||||||
|
t2 = '2020-12-12'
|
||||||
|
|
||||||
return (t1, t2)
|
return (t1, t2)
|
||||||
|
|
||||||
def __get_date(self, widget, calendar, entry, win):
|
def __get_date(self, widget, calendar, entry, win):
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,73 @@ except:
|
||||||
|
|
||||||
import fpdb_import
|
import fpdb_import
|
||||||
import fpdb_db
|
import fpdb_db
|
||||||
|
import Filters
|
||||||
|
|
||||||
class GuiGraphViewer (threading.Thread):
|
class GuiGraphViewer (threading.Thread):
|
||||||
|
|
||||||
|
def __init__(self, db, settings, querylist, config, debug=True):
|
||||||
|
"""Constructor for GraphViewer"""
|
||||||
|
self.debug=debug
|
||||||
|
#print "start of GraphViewer constructor"
|
||||||
|
self.db=db
|
||||||
|
self.cursor=db.cursor
|
||||||
|
self.settings=settings
|
||||||
|
self.sql=querylist
|
||||||
|
self.conf = config
|
||||||
|
|
||||||
|
self.filters = Filters.Filters(db, settings, config, querylist)
|
||||||
|
self.filters.registerGraphCallback(self.generateGraph)
|
||||||
|
|
||||||
|
self.mainHBox = gtk.HBox(False, 0)
|
||||||
|
self.mainHBox.show()
|
||||||
|
|
||||||
|
self.leftPanelBox = self.filters.get_vbox()
|
||||||
|
self.graphBox = gtk.VBox(False, 0)
|
||||||
|
|
||||||
|
self.hpane = gtk.HPaned()
|
||||||
|
self.hpane.pack1(self.leftPanelBox)
|
||||||
|
self.hpane.pack2(self.graphBox)
|
||||||
|
|
||||||
|
self.mainHBox.add(self.hpane)
|
||||||
|
|
||||||
|
self.fig = None
|
||||||
|
self.exportButton=gtk.Button("Export to File")
|
||||||
|
self.exportButton.connect("clicked", self.exportGraph, "show clicked")
|
||||||
|
self.exportButton.set_sensitive(False)
|
||||||
|
|
||||||
|
self.fig = Figure(figsize=(5,4), dpi=100)
|
||||||
|
self.canvas = None
|
||||||
|
|
||||||
|
self.mainHBox.show_all()
|
||||||
|
|
||||||
|
#################################
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
|
@ -59,11 +124,14 @@ class GuiGraphViewer (threading.Thread):
|
||||||
sitenos = []
|
sitenos = []
|
||||||
playerids = []
|
playerids = []
|
||||||
|
|
||||||
|
sites = self.filters.getSites()
|
||||||
|
heroes = self.filters.getHeroes()
|
||||||
|
siteids = self.filters.getSiteIds()
|
||||||
# Which sites are selected?
|
# Which sites are selected?
|
||||||
for site in self.sites:
|
for site in sites:
|
||||||
if self.sites[site] == True:
|
if sites[site] == True:
|
||||||
sitenos.append(self.siteid[site])
|
sitenos.append(siteids[site])
|
||||||
self.cursor.execute(self.sql.query['getPlayerId'], (self.heroes[site],))
|
self.cursor.execute(self.sql.query['getPlayerId'], (heroes[site],))
|
||||||
result = self.db.cursor.fetchall()
|
result = self.db.cursor.fetchall()
|
||||||
if len(result) == 1:
|
if len(result) == 1:
|
||||||
playerids.append(result[0][0])
|
playerids.append(result[0][0])
|
||||||
|
|
@ -117,12 +185,7 @@ class GuiGraphViewer (threading.Thread):
|
||||||
def getRingProfitGraph(self, names, sites):
|
def getRingProfitGraph(self, names, sites):
|
||||||
tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
|
tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
|
||||||
# print "DEBUG: getRingProfitGraph"
|
# print "DEBUG: getRingProfitGraph"
|
||||||
start_date, end_date = self.__get_dates()
|
start_date, end_date = self.filters.getDates()
|
||||||
|
|
||||||
if start_date == '':
|
|
||||||
start_date = '1970-01-01'
|
|
||||||
if end_date == '':
|
|
||||||
end_date = '2020-12-12'
|
|
||||||
|
|
||||||
#Buggered if I can find a way to do this 'nicely' take a list of intergers and longs
|
#Buggered if I can find a way to do this 'nicely' take a list of intergers and longs
|
||||||
# and turn it into a tuple readale by sql.
|
# and turn it into a tuple readale by sql.
|
||||||
|
|
@ -153,136 +216,6 @@ class GuiGraphViewer (threading.Thread):
|
||||||
return line/100
|
return line/100
|
||||||
#end of def getRingProfitGraph
|
#end of def getRingProfitGraph
|
||||||
|
|
||||||
def createPlayerLine(self, hbox, site, player):
|
|
||||||
label = gtk.Label(site +" id:")
|
|
||||||
hbox.pack_start(label, False, False, 0)
|
|
||||||
label.show()
|
|
||||||
|
|
||||||
pname = gtk.Entry()
|
|
||||||
pname.set_text(player)
|
|
||||||
pname.set_width_chars(20)
|
|
||||||
hbox.pack_start(pname, False, True, 0)
|
|
||||||
pname.connect("changed", self.__set_hero_name, site)
|
|
||||||
#TODO: Look at GtkCompletion - to fill out usernames
|
|
||||||
pname.show()
|
|
||||||
|
|
||||||
self.__set_hero_name(pname, site)
|
|
||||||
|
|
||||||
def __set_hero_name(self, w, site):
|
|
||||||
self.heroes[site] = w.get_text()
|
|
||||||
# print "DEBUG: settings heroes[%s]: %s"%(site, self.heroes[site])
|
|
||||||
|
|
||||||
def createSiteLine(self, hbox, site):
|
|
||||||
cb = gtk.CheckButton(site)
|
|
||||||
cb.connect('clicked', self.__set_site_select, site)
|
|
||||||
hbox.pack_start(cb, False, False, 0)
|
|
||||||
cb.show()
|
|
||||||
|
|
||||||
def __set_site_select(self, w, site):
|
|
||||||
# This doesn't behave as intended - self.site only allows 1 site for the moment.
|
|
||||||
print w.get_active()
|
|
||||||
self.sites[site] = w.get_active()
|
|
||||||
print "self.sites[%s] set to %s" %(site, self.sites[site])
|
|
||||||
|
|
||||||
def fillPlayerFrame(self, vbox):
|
|
||||||
for site in self.conf.get_supported_sites():
|
|
||||||
pathHBox = gtk.HBox(False, 0)
|
|
||||||
vbox.pack_start(pathHBox, False, True, 0)
|
|
||||||
pathHBox.show()
|
|
||||||
|
|
||||||
player = self.conf.supported_sites[site].screen_name
|
|
||||||
self.createPlayerLine(pathHBox, site, player)
|
|
||||||
|
|
||||||
def fillSitesFrame(self, vbox):
|
|
||||||
for site in self.conf.get_supported_sites():
|
|
||||||
hbox = gtk.HBox(False, 0)
|
|
||||||
vbox.pack_start(hbox, False, True, 0)
|
|
||||||
hbox.show()
|
|
||||||
self.createSiteLine(hbox, site)
|
|
||||||
#Get db site id for filtering later
|
|
||||||
self.cursor.execute(self.sql.query['getSiteId'], (site,))
|
|
||||||
result = self.db.cursor.fetchall()
|
|
||||||
if len(result) == 1:
|
|
||||||
self.siteid[site] = result[0][0]
|
|
||||||
else:
|
|
||||||
print "Either 0 or more than one site matched - EEK"
|
|
||||||
|
|
||||||
def fillDateFrame(self, vbox):
|
|
||||||
# Hat tip to Mika Bostrom - calendar code comes from PokerStats
|
|
||||||
hbox = gtk.HBox()
|
|
||||||
vbox.pack_start(hbox, False, True, 0)
|
|
||||||
hbox.show()
|
|
||||||
|
|
||||||
lbl_start = gtk.Label('From:')
|
|
||||||
lbl_start.show()
|
|
||||||
|
|
||||||
btn_start = gtk.Button()
|
|
||||||
btn_start.set_image(gtk.image_new_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON))
|
|
||||||
btn_start.connect('clicked', self.__calendar_dialog, self.start_date)
|
|
||||||
btn_start.show()
|
|
||||||
|
|
||||||
hbox.pack_start(lbl_start, expand=False, padding=3)
|
|
||||||
hbox.pack_start(btn_start, expand=False, padding=3)
|
|
||||||
hbox.pack_start(self.start_date, expand=False, padding=2)
|
|
||||||
self.start_date.show()
|
|
||||||
|
|
||||||
#New row for end date
|
|
||||||
hbox = gtk.HBox()
|
|
||||||
vbox.pack_start(hbox, False, True, 0)
|
|
||||||
hbox.show()
|
|
||||||
|
|
||||||
lbl_end = gtk.Label(' To:')
|
|
||||||
lbl_end.show()
|
|
||||||
btn_end = gtk.Button()
|
|
||||||
btn_end.set_image(gtk.image_new_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON))
|
|
||||||
btn_end.connect('clicked', self.__calendar_dialog, self.end_date)
|
|
||||||
btn_end.show()
|
|
||||||
|
|
||||||
btn_clear = gtk.Button(label=' Clear Dates ')
|
|
||||||
btn_clear.connect('clicked', self.__clear_dates)
|
|
||||||
btn_clear.show()
|
|
||||||
|
|
||||||
hbox.pack_start(lbl_end, expand=False, padding=3)
|
|
||||||
hbox.pack_start(btn_end, expand=False, padding=3)
|
|
||||||
hbox.pack_start(self.end_date, expand=False, padding=2)
|
|
||||||
self.end_date.show()
|
|
||||||
|
|
||||||
hbox.pack_start(btn_clear, expand=False, padding=15)
|
|
||||||
|
|
||||||
def __calendar_dialog(self, widget, entry):
|
|
||||||
d = gtk.Window(gtk.WINDOW_TOPLEVEL)
|
|
||||||
d.set_title('Pick a date')
|
|
||||||
|
|
||||||
vb = gtk.VBox()
|
|
||||||
cal = gtk.Calendar()
|
|
||||||
vb.pack_start(cal, expand=False, padding=0)
|
|
||||||
|
|
||||||
btn = gtk.Button('Done')
|
|
||||||
btn.connect('clicked', self.__get_date, cal, entry, d)
|
|
||||||
|
|
||||||
vb.pack_start(btn, expand=False, padding=4)
|
|
||||||
|
|
||||||
d.add(vb)
|
|
||||||
d.set_position(gtk.WIN_POS_MOUSE)
|
|
||||||
d.show_all()
|
|
||||||
|
|
||||||
def __clear_dates(self, w):
|
|
||||||
self.start_date.set_text('')
|
|
||||||
self.end_date.set_text('')
|
|
||||||
|
|
||||||
def __get_dates(self):
|
|
||||||
t1 = self.start_date.get_text()
|
|
||||||
t2 = self.end_date.get_text()
|
|
||||||
return (t1, t2)
|
|
||||||
|
|
||||||
def __get_date(self, widget, calendar, entry, win):
|
|
||||||
# year and day are correct, month is 0..11
|
|
||||||
(year, month, day) = calendar.get_date()
|
|
||||||
month += 1
|
|
||||||
ds = '%04d-%02d-%02d' % (year, month, day)
|
|
||||||
entry.set_text(ds)
|
|
||||||
win.destroy()
|
|
||||||
|
|
||||||
def exportGraph (self, widget, data):
|
def exportGraph (self, widget, data):
|
||||||
if self.fig is None:
|
if self.fig is None:
|
||||||
return # Might want to disable export button until something has been generated.
|
return # Might want to disable export button until something has been generated.
|
||||||
|
|
@ -303,112 +236,4 @@ class GuiGraphViewer (threading.Thread):
|
||||||
#TODO: This asks for a directory but will take a filename and overwrite it.
|
#TODO: This asks for a directory but will take a filename and overwrite it.
|
||||||
self.fig.savefig(self.exportDir, format="png")
|
self.fig.savefig(self.exportDir, format="png")
|
||||||
|
|
||||||
def __init__(self, db, settings, querylist, config, debug=True):
|
|
||||||
"""Constructor for GraphViewer"""
|
|
||||||
self.debug=debug
|
|
||||||
#print "start of GraphViewer constructor"
|
|
||||||
self.db=db
|
|
||||||
self.cursor=db.cursor
|
|
||||||
self.settings=settings
|
|
||||||
self.sql=querylist
|
|
||||||
self.conf = config
|
|
||||||
|
|
||||||
self.sites = {}
|
|
||||||
self.siteid = {}
|
|
||||||
self.heroes = {}
|
|
||||||
|
|
||||||
# For use in date ranges.
|
|
||||||
self.start_date = gtk.Entry(max=12)
|
|
||||||
self.end_date = gtk.Entry(max=12)
|
|
||||||
self.start_date.set_property('editable', False)
|
|
||||||
self.end_date.set_property('editable', False)
|
|
||||||
|
|
||||||
self.mainHBox = gtk.HBox(False, 0)
|
|
||||||
self.mainHBox.show()
|
|
||||||
|
|
||||||
self.leftPanelBox = gtk.VBox(False, 0)
|
|
||||||
self.graphBox = gtk.VBox(False, 0)
|
|
||||||
|
|
||||||
self.hpane = gtk.HPaned()
|
|
||||||
self.hpane.pack1(self.leftPanelBox)
|
|
||||||
self.hpane.pack2(self.graphBox)
|
|
||||||
self.hpane.show()
|
|
||||||
|
|
||||||
self.mainHBox.add(self.hpane)
|
|
||||||
|
|
||||||
playerFrame = gtk.Frame("Hero:")
|
|
||||||
playerFrame.set_label_align(0.0, 0.0)
|
|
||||||
playerFrame.show()
|
|
||||||
vbox = gtk.VBox(False, 0)
|
|
||||||
vbox.show()
|
|
||||||
|
|
||||||
self.fillPlayerFrame(vbox)
|
|
||||||
playerFrame.add(vbox)
|
|
||||||
|
|
||||||
sitesFrame = gtk.Frame("Sites:")
|
|
||||||
sitesFrame.set_label_align(0.0, 0.0)
|
|
||||||
sitesFrame.show()
|
|
||||||
vbox = gtk.VBox(False, 0)
|
|
||||||
vbox.show()
|
|
||||||
|
|
||||||
self.fillSitesFrame(vbox)
|
|
||||||
sitesFrame.add(vbox)
|
|
||||||
|
|
||||||
dateFrame = gtk.Frame("Date:")
|
|
||||||
dateFrame.set_label_align(0.0, 0.0)
|
|
||||||
dateFrame.show()
|
|
||||||
vbox = gtk.VBox(False, 0)
|
|
||||||
vbox.show()
|
|
||||||
|
|
||||||
self.fillDateFrame(vbox)
|
|
||||||
dateFrame.add(vbox)
|
|
||||||
|
|
||||||
graphButton=gtk.Button("Generate Graph")
|
|
||||||
graphButton.connect("clicked", self.generateGraph, "cliced data")
|
|
||||||
graphButton.show()
|
|
||||||
|
|
||||||
self.fig = None
|
|
||||||
self.exportButton=gtk.Button("Export to File")
|
|
||||||
self.exportButton.connect("clicked", self.exportGraph, "show clicked")
|
|
||||||
self.exportButton.set_sensitive(False)
|
|
||||||
self.exportButton.show()
|
|
||||||
|
|
||||||
self.leftPanelBox.add(playerFrame)
|
|
||||||
self.leftPanelBox.add(sitesFrame)
|
|
||||||
self.leftPanelBox.add(dateFrame)
|
|
||||||
self.leftPanelBox.add(graphButton)
|
|
||||||
self.leftPanelBox.add(self.exportButton)
|
|
||||||
|
|
||||||
self.leftPanelBox.show()
|
|
||||||
self.graphBox.show()
|
|
||||||
|
|
||||||
self.fig = Figure(figsize=(5,4), dpi=100)
|
|
||||||
self.canvas = None
|
|
||||||
|
|
||||||
#################################
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
#################################
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user