mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
* improved statistics; added top10 for all games
git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@147 39dd0a4e-7c14-0410-91b3-c4f2d318f732
This commit is contained in:
skomoroh
parent
cc04055fef
commit
3a35c4e13b
5 changed files with 193 additions and 111 deletions
|
|
@ -276,7 +276,7 @@ class _GameStatResult:
|
||||||
self.total = 0 # sum of all values
|
self.total = 0 # sum of all values
|
||||||
self.average = 0
|
self.average = 0
|
||||||
|
|
||||||
def update(self, value, game_number, game_start_time):
|
def update(self, gameid, value, game_number, game_start_time):
|
||||||
# update min & max
|
# update min & max
|
||||||
if not self.min or value < self.min:
|
if not self.min or value < self.min:
|
||||||
self.min = value
|
self.min = value
|
||||||
|
|
@ -288,7 +288,8 @@ class _GameStatResult:
|
||||||
for i in self.top:
|
for i in self.top:
|
||||||
if value < i.value:
|
if value < i.value:
|
||||||
position = n+1
|
position = n+1
|
||||||
v = Struct(value=value,
|
v = Struct(gameid=gameid,
|
||||||
|
value=value,
|
||||||
game_number=game_number,
|
game_number=game_number,
|
||||||
game_start_time=game_start_time)
|
game_start_time=game_start_time)
|
||||||
self.top.insert(n, v)
|
self.top.insert(n, v)
|
||||||
|
|
@ -296,7 +297,8 @@ class _GameStatResult:
|
||||||
break
|
break
|
||||||
n += 1
|
n += 1
|
||||||
if not position and len(self.top) < TOP_SIZE:
|
if not position and len(self.top) < TOP_SIZE:
|
||||||
v = Struct(value=value,
|
v = Struct(gameid=gameid,
|
||||||
|
value=value,
|
||||||
game_number=game_number,
|
game_number=game_number,
|
||||||
game_start_time=game_start_time)
|
game_start_time=game_start_time)
|
||||||
self.top.append(v)
|
self.top.append(v)
|
||||||
|
|
@ -348,24 +350,24 @@ class GameStat:
|
||||||
score_p = None
|
score_p = None
|
||||||
if score is not None:
|
if score is not None:
|
||||||
score_p = self.score_result.update(
|
score_p = self.score_result.update(
|
||||||
score, game_number, game_start_time)
|
game.id, score, game_number, game_start_time)
|
||||||
score = game.getGameScoreCasino()
|
score = game.getGameScoreCasino()
|
||||||
##print 'GameScoreCasino:', score
|
##print 'GameScoreCasino:', score
|
||||||
score_casino_p = None
|
score_casino_p = None
|
||||||
if score is not None:
|
if score is not None:
|
||||||
score_casino_p = self.score_casino_result.update(
|
score_casino_p = self.score_casino_result.update(
|
||||||
score, game_number, game_start_time)
|
game.id, score, game_number, game_start_time)
|
||||||
|
|
||||||
if status == 0:
|
if status == 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
game.updateTime()
|
game.updateTime()
|
||||||
time_p = self.time_result.update(
|
time_p = self.time_result.update(
|
||||||
game.stats.elapsed_time, game_number, game_start_time)
|
game.id, game.stats.elapsed_time, game_number, game_start_time)
|
||||||
moves_p = self.moves_result.update(
|
moves_p = self.moves_result.update(
|
||||||
game.moves.index, game_number, game_start_time)
|
game.id, game.moves.index, game_number, game_start_time)
|
||||||
total_moves_p = self.total_moves_result.update(
|
total_moves_p = self.total_moves_result.update(
|
||||||
game.stats.total_moves, game_number, game_start_time)
|
game.id, game.stats.total_moves, game_number, game_start_time)
|
||||||
|
|
||||||
return time_p, moves_p, total_moves_p, score_p, score_casino_p
|
return time_p, moves_p, total_moves_p, score_p, score_casino_p
|
||||||
|
|
||||||
|
|
@ -470,8 +472,19 @@ class Statistics:
|
||||||
self.games_stats[player][game.id] = game_stat
|
self.games_stats[player][game.id] = game_stat
|
||||||
else:
|
else:
|
||||||
game_stat = self.games_stats[player][game.id]
|
game_stat = self.games_stats[player][game.id]
|
||||||
|
if 'all' not in self.games_stats[player]:
|
||||||
|
all_games_stat = GameStat('all')
|
||||||
|
self.games_stats[player]['all'] = all_games_stat
|
||||||
|
else:
|
||||||
|
all_games_stat = self.games_stats[player]['all']
|
||||||
|
all_games_stat.update(game, status)
|
||||||
return game_stat.update(game, status)
|
return game_stat.update(game, status)
|
||||||
|
|
||||||
|
## def __setstate__(self, state): # for backward compatible
|
||||||
|
## if 'gameid' not in state:
|
||||||
|
## self.gameid = None
|
||||||
|
## self.__dict__.update(state)
|
||||||
|
|
||||||
|
|
||||||
# /***********************************************************************
|
# /***********************************************************************
|
||||||
# // Comments
|
# // Comments
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ class PysolStatsFormatter:
|
||||||
if not gi:
|
if not gi:
|
||||||
gi = self.app.getGameInfo(GI.PROTECTED_GAMES.get(gameid))
|
gi = self.app.getGameInfo(GI.PROTECTED_GAMES.get(gameid))
|
||||||
if gi:
|
if gi:
|
||||||
name = gi.short_name
|
name = gi.name
|
||||||
else:
|
else:
|
||||||
name = _("** UNKNOWN %d **") % gameid
|
name = _("** UNKNOWN %d **") % gameid
|
||||||
f = pg[1]
|
f = pg[1]
|
||||||
|
|
|
||||||
|
|
@ -243,6 +243,25 @@ class Notebook(Widget):
|
||||||
"""Returns a list of all pane windows managed by the widget."""
|
"""Returns a list of all pane windows managed by the widget."""
|
||||||
return self.tk.call(self._w, "tabs")
|
return self.tk.call(self._w, "tabs")
|
||||||
|
|
||||||
|
def enableTraversal(self):
|
||||||
|
"""To enable keyboard traversal for a toplevel window containing a
|
||||||
|
notebook widget $nb, call:
|
||||||
|
|
||||||
|
ttk::notebook::enableTraversal $nb
|
||||||
|
|
||||||
|
This will extend the bindings for the toplevel widget containing the
|
||||||
|
notebook as follows:
|
||||||
|
|
||||||
|
* Control-Tab selects the tab following the currently selected one.
|
||||||
|
* Shift-Control-Tab selects the tab preceding the currently selected
|
||||||
|
one.
|
||||||
|
* Alt-K, where K is the mnemonic (underlined) character of any tab,
|
||||||
|
will select that tab.
|
||||||
|
|
||||||
|
Multiple notebooks in a single toplevel may be enabled for traversal,
|
||||||
|
including nested notebooks. However, notebook traversal only works
|
||||||
|
properly if all panes are direct children of the notebook."""
|
||||||
|
return self.tk.call("ttk::notebook::enableTraversal", self._w)
|
||||||
|
|
||||||
class Paned(Widget):
|
class Paned(Widget):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -413,7 +413,7 @@ class PysolMenubar(PysolMenubarActions):
|
||||||
menu.add_command(label=n_("S&tatus..."), command=self.mStatus, accelerator=m+"Y")
|
menu.add_command(label=n_("S&tatus..."), command=self.mStatus, accelerator=m+"Y")
|
||||||
menu.add_checkbutton(label=n_("&Comments..."), variable=self.tkopt.comment, command=self.mEditGameComment)
|
menu.add_checkbutton(label=n_("&Comments..."), variable=self.tkopt.comment, command=self.mEditGameComment)
|
||||||
menu.add_separator()
|
menu.add_separator()
|
||||||
menu.add_command(label=n_("&Statistics..."), command=lambda self=self: self.mPlayerStats(mode=102))
|
menu.add_command(label=n_("&Statistics..."), command=self.mPlayerStats)
|
||||||
menu.add_command(label=n_("Log..."), command=lambda self=self: self.mPlayerStats(mode=103))
|
menu.add_command(label=n_("Log..."), command=lambda self=self: self.mPlayerStats(mode=103))
|
||||||
menu.add_separator()
|
menu.add_separator()
|
||||||
menu.add_command(label=n_("D&emo statistics"), command=lambda self=self: self.mPlayerStats(mode=1102))
|
menu.add_command(label=n_("D&emo statistics"), command=lambda self=self: self.mPlayerStats(mode=1102))
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ class StatsDialog(MfxDialog):
|
||||||
def __init__(self, parent, title, app, player, gameid, **kw):
|
def __init__(self, parent, title, app, player, gameid, **kw):
|
||||||
|
|
||||||
kw = self.initKw(kw)
|
kw = self.initKw(kw)
|
||||||
|
title = _('Statistics')
|
||||||
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
|
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
|
||||||
|
|
||||||
self.font = app.getFont('default')
|
self.font = app.getFont('default')
|
||||||
|
|
@ -87,13 +88,6 @@ class StatsDialog(MfxDialog):
|
||||||
|
|
||||||
self.notebook_tabs = []
|
self.notebook_tabs = []
|
||||||
|
|
||||||
## frame = Tkinter.Frame(notebook)
|
|
||||||
## notebook.add(frame, text=_('Current game'))
|
|
||||||
## single_frame = SingleGameFrame(self, frame, app, player, gameid)
|
|
||||||
## single_frame.pack(side='left', expand=True, fill='both')
|
|
||||||
## top_frame = TopFrame(self, frame, app, player, gameid)
|
|
||||||
## top_frame.pack(side='right', expand=True, fill='both')
|
|
||||||
|
|
||||||
single_frame = SingleGameFrame(self, notebook, app, player, gameid)
|
single_frame = SingleGameFrame(self, notebook, app, player, gameid)
|
||||||
notebook.add(single_frame, text=_('Current game'))
|
notebook.add(single_frame, text=_('Current game'))
|
||||||
self.notebook_tabs.append(single_frame._w)
|
self.notebook_tabs.append(single_frame._w)
|
||||||
|
|
@ -115,6 +109,7 @@ class StatsDialog(MfxDialog):
|
||||||
if StatsDialog.SELECTED_TAB < len(self.notebook_tabs):
|
if StatsDialog.SELECTED_TAB < len(self.notebook_tabs):
|
||||||
notebook.select(StatsDialog.SELECTED_TAB)
|
notebook.select(StatsDialog.SELECTED_TAB)
|
||||||
bind(notebook, '<<NotebookTabChanged>>', self.tabChanged)
|
bind(notebook, '<<NotebookTabChanged>>', self.tabChanged)
|
||||||
|
##notebook.enableTraversal()
|
||||||
self.notebook = notebook
|
self.notebook = notebook
|
||||||
|
|
||||||
focus = self.createButtons(bottom_frame, kw)
|
focus = self.createButtons(bottom_frame, kw)
|
||||||
|
|
@ -173,6 +168,9 @@ class SingleGameFrame(Tkinter.Frame):
|
||||||
def __init__(self, dialog, parent, app, player, gameid, **kw):
|
def __init__(self, dialog, parent, app, player, gameid, **kw):
|
||||||
Tkinter.Frame.__init__(self, parent)
|
Tkinter.Frame.__init__(self, parent)
|
||||||
|
|
||||||
|
self.oval_width = 120
|
||||||
|
self.oval_height = 60
|
||||||
|
|
||||||
left_label = Tkinter.Label(self, image=app.gimages.logos[5])
|
left_label = Tkinter.Label(self, image=app.gimages.logos[5])
|
||||||
left_label.pack(side='left', expand=True, fill='both')
|
left_label.pack(side='left', expand=True, fill='both')
|
||||||
self.right_frame = Tkinter.Frame(self)
|
self.right_frame = Tkinter.Frame(self)
|
||||||
|
|
@ -197,7 +195,7 @@ class SingleGameFrame(Tkinter.Frame):
|
||||||
def _calc_tabs(self):
|
def _calc_tabs(self):
|
||||||
#
|
#
|
||||||
font = self.dialog.tkfont
|
font = self.dialog.tkfont
|
||||||
t0 = 160
|
t0 = self.oval_width+70
|
||||||
t = ''
|
t = ''
|
||||||
for i in (_("Won:"),
|
for i in (_("Won:"),
|
||||||
_("Lost:"),
|
_("Lost:"),
|
||||||
|
|
@ -238,7 +236,7 @@ class SingleGameFrame(Tkinter.Frame):
|
||||||
bg = style.lookup('.', 'background') or None
|
bg = style.lookup('.', 'background') or None
|
||||||
self.fg = fg
|
self.fg = fg
|
||||||
#
|
#
|
||||||
w, h = self.tab_x[-1], self.tab_y[-1]
|
w, h = self.tab_x[-1], max(self.tab_y[-1], self.oval_height+40)
|
||||||
c = Tkinter.Canvas(frame, width=w, height=h,
|
c = Tkinter.Canvas(frame, width=w, height=h,
|
||||||
bg=bg, highlightthickness=0)
|
bg=bg, highlightthickness=0)
|
||||||
c.pack(fill='both', expand=True)
|
c.pack(fill='both', expand=True)
|
||||||
|
|
@ -251,21 +249,28 @@ class SingleGameFrame(Tkinter.Frame):
|
||||||
x = tx[0]
|
x = tx[0]
|
||||||
dy = int(self.dialog.font_metrics['ascent']) - 10
|
dy = int(self.dialog.font_metrics['ascent']) - 10
|
||||||
dy = dy/2
|
dy = dy/2
|
||||||
c.create_text(x, ty[0]-dy, text=_("Won:"), anchor="nw", font=tfont, fill=fg)
|
c.create_text(x, ty[0]-dy, text=_("Won:"),
|
||||||
c.create_text(x, ty[1]-dy, text=_("Lost:"), anchor="nw", font=tfont, fill=fg)
|
anchor="nw", font=tfont, fill=fg)
|
||||||
c.create_text(x, ty[2]-dy, text=_("Total:"), anchor="nw", font=tfont, fill=fg)
|
c.create_text(x, ty[1]-dy, text=_("Lost:"),
|
||||||
|
anchor="nw", font=tfont, fill=fg)
|
||||||
|
c.create_text(x, ty[2]-dy, text=_("Total:"),
|
||||||
|
anchor="nw", font=tfont, fill=fg)
|
||||||
x = tx[1] - 16
|
x = tx[1] - 16
|
||||||
c.create_text(x, ty[0]-dy, text="%d" % won, anchor="ne", font=tfont, fill=fg)
|
c.create_text(x, ty[0]-dy, text="%d" % won,
|
||||||
c.create_text(x, ty[1]-dy, text="%d" % lost, anchor="ne", font=tfont, fill=fg)
|
anchor="ne", font=tfont, fill=fg)
|
||||||
c.create_text(x, ty[2]-dy, text="%d" % (won + lost), anchor="ne", font=tfont, fill=fg)
|
c.create_text(x, ty[1]-dy, text="%d" % lost,
|
||||||
|
anchor="ne", font=tfont, fill=fg)
|
||||||
|
c.create_text(x, ty[2]-dy, text="%d" % (won + lost),
|
||||||
|
anchor="ne", font=tfont, fill=fg)
|
||||||
y = ty[2] - 11
|
y = ty[2] - 11
|
||||||
c.create_line(tx[0], y, x, y, fill=fg)
|
c.create_line(tx[0], y, x, y, fill=fg)
|
||||||
if won + lost > 0:
|
if won + lost > 0:
|
||||||
x = tx[2]
|
x = tx[2]
|
||||||
pw = int(round(100.0 * pwon))
|
pw = int(round(100.0 * pwon))
|
||||||
c.create_text(x, ty[0]-dy, text="%d%%" % pw, anchor="ne", font=tfont, fill=fg)
|
c.create_text(x, ty[0]-dy, text="%d%%" % pw,
|
||||||
c.create_text(x, ty[1]-dy, text="%d%%" % (100-pw), anchor="ne", font=tfont, fill=fg)
|
anchor="ne", font=tfont, fill=fg)
|
||||||
|
c.create_text(x, ty[1]-dy, text="%d%%" % (100-pw),
|
||||||
|
anchor="ne", font=tfont, fill=fg)
|
||||||
|
|
||||||
|
|
||||||
def createPieChart(self, app, won, lost, text):
|
def createPieChart(self, app, won, lost, text):
|
||||||
|
|
@ -280,15 +285,20 @@ class SingleGameFrame(Tkinter.Frame):
|
||||||
#
|
#
|
||||||
tx, ty = self.tab_x, self.tab_y
|
tx, ty = self.tab_x, self.tab_y
|
||||||
x0, y0 = 20, 10 # base coords
|
x0, y0 = 20, 10 # base coords
|
||||||
w, h = 90, 50 # size
|
w = self.oval_width
|
||||||
|
h = self.oval_height
|
||||||
d = 9 # delta
|
d = 9 # delta
|
||||||
if won + lost > 0:
|
if won + lost > 0:
|
||||||
##s, ewon, elost = 90.0, -360.0 * pwon, -360.0 * plost
|
##s, ewon, elost = 90.0, -360.0 * pwon, -360.0 * plost
|
||||||
s, ewon, elost = 0.0, 360.0 * pwon, 360.0 * plost
|
s, ewon, elost = 0.0, 360.0 * pwon, 360.0 * plost
|
||||||
c.create_arc(x0, y0+d, x0+w, y0+h+d, fill="#007f00", start=s, extent=ewon)
|
c.create_arc(x0, y0+d, x0+w, y0+h+d, fill="#007f00",
|
||||||
c.create_arc(x0, y0+d, x0+w, y0+h+d, fill="#7f0000", start=s+ewon, extent=elost)
|
start=s, extent=ewon)
|
||||||
c.create_arc(x0, y0, x0+w, y0+h, fill="#00ff00", start=s, extent=ewon)
|
c.create_arc(x0, y0+d, x0+w, y0+h+d, fill="#7f0000",
|
||||||
c.create_arc(x0, y0, x0+w, y0+h, fill="#ff0000", start=s+ewon, extent=elost)
|
start=s+ewon, extent=elost)
|
||||||
|
c.create_arc(x0, y0, x0+w, y0+h, fill="#00ff00",
|
||||||
|
start=s, extent=ewon)
|
||||||
|
c.create_arc(x0, y0, x0+w, y0+h, fill="#ff0000",
|
||||||
|
start=s+ewon, extent=elost)
|
||||||
x, y = tx[0] - 25, ty[0]
|
x, y = tx[0] - 25, ty[0]
|
||||||
c.create_rectangle(x, y, x+10, y+10, fill="#00ff00")
|
c.create_rectangle(x, y, x+10, y+10, fill="#00ff00")
|
||||||
y = ty[1]
|
y = ty[1]
|
||||||
|
|
@ -296,7 +306,8 @@ class SingleGameFrame(Tkinter.Frame):
|
||||||
else:
|
else:
|
||||||
c.create_oval(x0, y0+d, x0+w, y0+h+d, fill="#7f7f7f")
|
c.create_oval(x0, y0+d, x0+w, y0+h+d, fill="#7f7f7f")
|
||||||
c.create_oval(x0, y0, x0+w, y0+h, fill="#f0f0f0")
|
c.create_oval(x0, y0, x0+w, y0+h, fill="#f0f0f0")
|
||||||
c.create_text(x0+w/2, y0+h/2, text=_("No games"), anchor="center", font=tfont, fill="#bfbfbf")
|
c.create_text(x0+w/2, y0+h/2, text=_("No games"),
|
||||||
|
anchor="center", font=tfont, fill="#bfbfbf")
|
||||||
#
|
#
|
||||||
self._createChartTexts(tx, ty, won, lost)
|
self._createChartTexts(tx, ty, won, lost)
|
||||||
|
|
||||||
|
|
@ -499,6 +510,7 @@ class LogDialog(MfxDialog):
|
||||||
self.CHAR_W = self.tkfont.measure('M')
|
self.CHAR_W = self.tkfont.measure('M')
|
||||||
|
|
||||||
kw = self.initKw(kw)
|
kw = self.initKw(kw)
|
||||||
|
title = _('Log')
|
||||||
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
|
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
|
||||||
|
|
||||||
##self.selected_game = None
|
##self.selected_game = None
|
||||||
|
|
@ -602,33 +614,34 @@ class Status_StatsDialog(MfxMessageDialog):
|
||||||
w2 = w2 + _("\nCards in Foundations: ") + str(n)
|
w2 = w2 + _("\nCards in Foundations: ") + str(n)
|
||||||
#
|
#
|
||||||
date = time.strftime("%Y-%m-%d %H:%M", time.localtime(game.gstats.start_time))
|
date = time.strftime("%Y-%m-%d %H:%M", time.localtime(game.gstats.start_time))
|
||||||
MfxMessageDialog.__init__(self, parent, title=_("Game status"),
|
MfxMessageDialog.__init__(
|
||||||
text=game.getTitleName() + "\n" +
|
self, parent, title=_("Game status"),
|
||||||
game.getGameNumber(format=1) + "\n" +
|
text=game.getTitleName() + "\n" +
|
||||||
_("Playing time: ") + game.getTime() + "\n" +
|
game.getGameNumber(format=1) + "\n" +
|
||||||
_("Started at: ") + date + "\n\n"+
|
_("Playing time: ") + game.getTime() + "\n" +
|
||||||
_("Moves: ") + str(game.moves.index) + "\n" +
|
_("Started at: ") + date + "\n\n"+
|
||||||
_("Undo moves: ") + str(stats.undo_moves) + "\n" +
|
_("Moves: ") + str(game.moves.index) + "\n" +
|
||||||
_("Bookmark moves: ") + str(gstats.goto_bookmark_moves) + "\n" +
|
_("Undo moves: ") + str(stats.undo_moves) + "\n" +
|
||||||
_("Demo moves: ") + str(stats.demo_moves) + "\n" +
|
_("Bookmark moves: ") + str(gstats.goto_bookmark_moves) + "\n" +
|
||||||
_("Total player moves: ") + str(stats.player_moves) + "\n" +
|
_("Demo moves: ") + str(stats.demo_moves) + "\n" +
|
||||||
_("Total moves in this game: ") + str(stats.total_moves) + "\n" +
|
_("Total player moves: ") + str(stats.player_moves) + "\n" +
|
||||||
_("Hints: ") + str(stats.hints) + "\n" +
|
_("Total moves in this game: ") + str(stats.total_moves) + "\n" +
|
||||||
"\n" +
|
_("Hints: ") + str(stats.hints) + "\n" +
|
||||||
w1 + w2,
|
"\n" +
|
||||||
strings=(_("&OK"),
|
w1 + w2,
|
||||||
(_("&Statistics..."), 101)),
|
strings=(_("&OK"),
|
||||||
image=game.app.gimages.logos[3],
|
(_("&Statistics..."), 101)),
|
||||||
image_side="left", image_padx=20,
|
image=game.app.gimages.logos[3],
|
||||||
padx=20,
|
image_side="left", image_padx=20,
|
||||||
)
|
padx=20,
|
||||||
|
)
|
||||||
|
|
||||||
# /***********************************************************************
|
# /***********************************************************************
|
||||||
# //
|
# //
|
||||||
# ************************************************************************/
|
# ************************************************************************/
|
||||||
|
|
||||||
class _TopDialog(MfxDialog):
|
class _TopDialog(MfxDialog):
|
||||||
def __init__(self, parent, title, top, **kw):
|
def __init__(self, parent, title, app, gameid, top, **kw):
|
||||||
kw = self.initKw(kw)
|
kw = self.initKw(kw)
|
||||||
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
|
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
|
||||||
top_frame, bottom_frame = self.createFrames(kw)
|
top_frame, bottom_frame = self.createFrames(kw)
|
||||||
|
|
@ -644,15 +657,19 @@ class _TopDialog(MfxDialog):
|
||||||
cnf['text'] = _('N')
|
cnf['text'] = _('N')
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=0, column=0, sticky='ew')
|
l.grid(row=0, column=0, sticky='ew')
|
||||||
|
if gameid == 'all':
|
||||||
|
cnf['text'] = _('Game')
|
||||||
|
l = Tkinter.Label(**cnf)
|
||||||
|
l.grid(row=0, column=1, sticky='ew')
|
||||||
cnf['text'] = _('Game number')
|
cnf['text'] = _('Game number')
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=0, column=1, sticky='ew')
|
l.grid(row=0, column=2, sticky='ew')
|
||||||
cnf['text'] = _('Started at')
|
cnf['text'] = _('Started at')
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=0, column=2, sticky='ew')
|
l.grid(row=0, column=3, sticky='ew')
|
||||||
cnf['text'] = _('Result')
|
cnf['text'] = _('Result')
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=0, column=3, sticky='ew')
|
l.grid(row=0, column=4, sticky='ew')
|
||||||
|
|
||||||
row = 1
|
row = 1
|
||||||
for i in top:
|
for i in top:
|
||||||
|
|
@ -660,15 +677,22 @@ class _TopDialog(MfxDialog):
|
||||||
cnf['text'] = str(row)
|
cnf['text'] = str(row)
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=row, column=0, sticky='ew')
|
l.grid(row=row, column=0, sticky='ew')
|
||||||
|
if gameid == 'all':
|
||||||
|
name = app.getGameTitleName(i.gameid)
|
||||||
|
if name is None:
|
||||||
|
name = _("** UNKNOWN %d **") % i.gameid
|
||||||
|
cnf['text'] = name
|
||||||
|
l = Tkinter.Label(**cnf)
|
||||||
|
l.grid(row=row, column=1, sticky='ew')
|
||||||
# Game number
|
# Game number
|
||||||
cnf['text'] = '#'+str(i.game_number)
|
cnf['text'] = '#'+str(i.game_number)
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=row, column=1, sticky='ew')
|
l.grid(row=row, column=2, sticky='ew')
|
||||||
# Start time
|
# Start time
|
||||||
t = time.strftime('%Y-%m-%d %H:%M', time.localtime(i.game_start_time))
|
t = time.strftime('%Y-%m-%d %H:%M', time.localtime(i.game_start_time))
|
||||||
cnf['text'] = t
|
cnf['text'] = t
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=row, column=2, sticky='ew')
|
l.grid(row=row, column=3, sticky='ew')
|
||||||
# Result
|
# Result
|
||||||
if isinstance(i.value, float):
|
if isinstance(i.value, float):
|
||||||
# time
|
# time
|
||||||
|
|
@ -678,7 +702,7 @@ class _TopDialog(MfxDialog):
|
||||||
s = str(i.value)
|
s = str(i.value)
|
||||||
cnf['text'] = s
|
cnf['text'] = s
|
||||||
l = Tkinter.Label(**cnf)
|
l = Tkinter.Label(**cnf)
|
||||||
l.grid(row=row, column=3, sticky='ew')
|
l.grid(row=row, column=4, sticky='ew')
|
||||||
row += 1
|
row += 1
|
||||||
|
|
||||||
focus = self.createButtons(bottom_frame, kw)
|
focus = self.createButtons(bottom_frame, kw)
|
||||||
|
|
@ -697,46 +721,67 @@ class TopFrame(Tkinter.Frame):
|
||||||
self.app = app
|
self.app = app
|
||||||
self.dialog = dialog
|
self.dialog = dialog
|
||||||
|
|
||||||
left_label = Tkinter.Label(self, image=app.gimages.logos[4])
|
left_label = Tkinter.Label(self, image=app.gimages.logos[5])
|
||||||
left_label.pack(side='left', expand=True, fill='both')
|
left_label.pack(side='left', expand=True, fill='both')
|
||||||
frame = Tkinter.Frame(self)
|
|
||||||
frame.pack(side='right', expand=True, fill='both', padx=10, pady=10)
|
frame = Tkinter.LabelFrame(self, text='All games',
|
||||||
|
padding=(10,5,10,10))
|
||||||
|
frame.pack(side='top', expand=True, fill='x', padx=10, pady=10)
|
||||||
##frame.columnconfigure(0, weight=1)
|
##frame.columnconfigure(0, weight=1)
|
||||||
|
if not self.createTopFrame(frame, player, 'all'):
|
||||||
|
Tkinter.Label(frame, text=_('No TOP for all games')
|
||||||
|
).pack(padx=10, pady=10)
|
||||||
|
|
||||||
if (player in app.stats.games_stats and
|
frame = Tkinter.LabelFrame(self, text='Current game',
|
||||||
gameid in app.stats.games_stats[player] and
|
padding=(10,5,10,10))
|
||||||
app.stats.games_stats[player][gameid].time_result.top):
|
frame.pack(side='top', expand=True, fill='x', padx=10, pady=10)
|
||||||
|
##frame.columnconfigure(0, weight=1)
|
||||||
|
if not self.createTopFrame(frame, player, gameid):
|
||||||
|
Tkinter.Label(frame, text=_('No TOP for this game')
|
||||||
|
).pack(padx=10, pady=10)
|
||||||
|
|
||||||
Tkinter.Label(frame, text=_('Minimum')).grid(row=0, column=1, padx=4)
|
def createTopFrame(self, frame, player, gameid):
|
||||||
Tkinter.Label(frame, text=_('Maximum')).grid(row=0, column=2, padx=4)
|
app = self.app
|
||||||
Tkinter.Label(frame, text=_('Average')).grid(row=0, column=3, padx=4)
|
|
||||||
##Tkinter.Label(frame, text=_('Total')).grid(row=0, column=4)
|
|
||||||
|
|
||||||
s = app.stats.games_stats[player][gameid]
|
if (player not in app.stats.games_stats or
|
||||||
row = 1
|
gameid not in app.stats.games_stats[player] or
|
||||||
ll = [
|
not app.stats.games_stats[player][gameid].time_result.top):
|
||||||
(_('Playing time:'),
|
return False
|
||||||
format_time(s.time_result.min),
|
|
||||||
format_time(s.time_result.max),
|
Tkinter.Label(frame, text=_('Minimum')
|
||||||
format_time(s.time_result.average),
|
).grid(row=0, column=1, padx=5, pady=5)
|
||||||
format_time(s.time_result.total),
|
Tkinter.Label(frame, text=_('Maximum')
|
||||||
s.time_result.top,
|
).grid(row=0, column=2, padx=5, pady=5)
|
||||||
),
|
Tkinter.Label(frame, text=_('Average')
|
||||||
(_('Moves:'),
|
).grid(row=0, column=3, padx=5, pady=5)
|
||||||
s.moves_result.min,
|
##Tkinter.Label(frame, text=_('Total')).grid(row=0, column=4)
|
||||||
s.moves_result.max,
|
|
||||||
round(s.moves_result.average, 2),
|
s = app.stats.games_stats[player][gameid]
|
||||||
s.moves_result.total,
|
|
||||||
s.moves_result.top,
|
row = 1
|
||||||
),
|
ll = [
|
||||||
(_('Total moves:'),
|
(_('Playing time:'),
|
||||||
s.total_moves_result.min,
|
format_time(s.time_result.min),
|
||||||
s.total_moves_result.max,
|
format_time(s.time_result.max),
|
||||||
round(s.total_moves_result.average, 2),
|
format_time(s.time_result.average),
|
||||||
s.total_moves_result.total,
|
format_time(s.time_result.total),
|
||||||
s.total_moves_result.top,
|
s.time_result.top,
|
||||||
),
|
),
|
||||||
]
|
(_('Moves:'),
|
||||||
|
s.moves_result.min,
|
||||||
|
s.moves_result.max,
|
||||||
|
round(s.moves_result.average, 2),
|
||||||
|
s.moves_result.total,
|
||||||
|
s.moves_result.top,
|
||||||
|
),
|
||||||
|
(_('Total moves:'),
|
||||||
|
s.total_moves_result.min,
|
||||||
|
s.total_moves_result.max,
|
||||||
|
round(s.total_moves_result.average, 2),
|
||||||
|
s.total_moves_result.total,
|
||||||
|
s.total_moves_result.top,
|
||||||
|
),
|
||||||
|
]
|
||||||
## if s.score_result.min:
|
## if s.score_result.min:
|
||||||
## ll.append(('Score:',
|
## ll.append(('Score:',
|
||||||
## s.score_result.min,
|
## s.score_result.min,
|
||||||
|
|
@ -749,21 +794,26 @@ class TopFrame(Tkinter.Frame):
|
||||||
## s.score_casino_result.min,
|
## s.score_casino_result.min,
|
||||||
## s.score_casino_result.max,
|
## s.score_casino_result.max,
|
||||||
## round(s.score_casino_result.average, 2), ))
|
## round(s.score_casino_result.average, 2), ))
|
||||||
for l, min, max, avr, tot, top in ll:
|
for l, min, max, avr, tot, top in ll:
|
||||||
Tkinter.Label(frame, text=l).grid(row=row, column=0)
|
Tkinter.Label(frame, text=l
|
||||||
Tkinter.Label(frame, text=str(min)).grid(row=row, column=1)
|
).grid(row=row, column=0, padx=5, pady=5)
|
||||||
Tkinter.Label(frame, text=str(max)).grid(row=row, column=2)
|
Tkinter.Label(frame, text=str(min)
|
||||||
Tkinter.Label(frame, text=str(avr)).grid(row=row, column=3)
|
).grid(row=row, column=1, padx=5, pady=5)
|
||||||
##Tkinter.Label(frame, text=str(tot)).grid(row=row, column=4)
|
Tkinter.Label(frame, text=str(max)
|
||||||
b = Tkinter.Button(frame, text=TOP_TITLE+' ...', width=10,
|
).grid(row=row, column=2, padx=5, pady=5)
|
||||||
command=lambda top=top: self.showTop(top))
|
Tkinter.Label(frame, text=str(avr)
|
||||||
b.grid(row=row, column=5)
|
).grid(row=row, column=3, padx=5, pady=5)
|
||||||
row += 1
|
##Tkinter.Label(frame, text=str(tot)).grid(row=row, column=4)
|
||||||
else:
|
def command(gameid=gameid, top=top):
|
||||||
Tkinter.Label(frame, text=_('No TOP for this game')).pack()
|
self.showTop(gameid, top)
|
||||||
|
b = Tkinter.Button(frame, text=TOP_TITLE+' ...', width=10,
|
||||||
|
command=command)
|
||||||
|
b.grid(row=row, column=5)
|
||||||
|
row += 1
|
||||||
|
return True
|
||||||
|
|
||||||
def showTop(self, top):
|
def showTop(self, gameid, top):
|
||||||
d = _TopDialog(self.dialog.top, TOP_TITLE, top)
|
d = _TopDialog(self.dialog.top, TOP_TITLE, self.app, gameid, top)
|
||||||
|
|
||||||
|
|
||||||
# /***********************************************************************
|
# /***********************************************************************
|
||||||
|
|
@ -790,7 +840,7 @@ class ProgressionFrame(Tkinter.Frame):
|
||||||
frame.columnconfigure(0, weight=1)
|
frame.columnconfigure(0, weight=1)
|
||||||
|
|
||||||
# constants
|
# constants
|
||||||
self.canvas_width, self.canvas_height = 540, 220
|
self.canvas_width, self.canvas_height = 500, 250
|
||||||
if parent.winfo_screenwidth() < 800 or \
|
if parent.winfo_screenwidth() < 800 or \
|
||||||
parent.winfo_screenheight() < 600:
|
parent.winfo_screenheight() < 600:
|
||||||
self.canvas_width, self.canvas_height = 400, 200
|
self.canvas_width, self.canvas_height = 400, 200
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue