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

p51 - added to git instructions

Browse Source 
updated tv to use new HudCache
This commit is contained in:
steffen123 2008-08-18 03:56:59 +01:00
parent 6a5d1d6332
commit 6eb42cd05e
5 changed files with 55 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docs/git-instructions.txt
View File

@ -1,27 +0,0 @@
Hi, welcome to my minimal git guide for fpdb devs!
I'll expand this on request, if you have any questions just send me a mail at steffen@sycamoretest.info.
How to make a local git commit
==============================
go to the root of your fpdb directory and type:
git-add--interactive
If you added any new files press a and Enter, then type the number of your new file and press Enter twice. If you made any changes to existing files press u and enter. If you want to commit all changes press * and Enter twice. Press q to leave git-add--interactive.
Then create a file for your commit message (I call it since_last_commit.txt) but don't add this to the repository. In the first line of this file put a summary of your changes. If you wish to you can also add in a revision number. My tree (the "central" or "official" repository) uses the format gitX where X is a running number, e.g. git91 is followed by git92. Then give some details of your changes, try to mention anything non-trivial and definitely any user-visible bug fixes. If the table design has been changed that has to be mentioned in the first line.
Then run this:
git-commit -F since_last_commit.txt
todo: how to pull/push changes to/from me
todo: git-diff, git-rm, git-mv
License
=======
Trademarks of third parties have been used under Fair Use or similar laws.
Copyright 2008 Steffen Jobbagy-Felso
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
Version 1.2 as published by the Free Software Foundation; with
no Invariant Sections, no Front-Cover Texts, and with no Back-Cover
Texts. A copy of the license can be found in fdl-1.2.txt
The program itself is licensed under AGPLv3, see agpl-3.0.txt

7
docs/known-bugs-and-planned-features.txt
View File

@ -3,20 +3,19 @@ Everything is subject to change and especially the order will often change. Patc
alpha2 (release by 17Aug) alpha2 (release by 17Aug)
====== ======
add maxSeats to hands change config file to windows line endings
add sf.net logo to webpage add sf.net logo to webpage
change tabledesign VALIGN change tabledesign VALIGN
seperate and improve instructions for update seperate and improve instructions for update
split install instructions into OS-specific and OS-independent section
expand instructions for profile file expand instructions for profile file
add instructions for mailing list to contacts add instructions for mailing list to contacts
finish updating filelist
ebuild: symlink doesnt work, USE gtk, more automation, update install-in-gentoo.txt, set permissions in it, copy docs to correct place, use games eclass or whatever to get games group notice, print notice about install-in-gentoo.txt and mysql --config ebuild: symlink doesnt work, USE gtk, more automation, update install-in-gentoo.txt, set permissions in it, copy docs to correct place, use games eclass or whatever to get games group notice, print notice about install-in-gentoo.txt and mysql --config
add minimal instructions for developing to git-instructions
re-run existing regression tests re-run existing regression tests
alpha3 alpha3
====== ======
finish updating filelist
finish todos in git instructions
make sure totalProfit shows actual profit rather than winnings. make sure totalProfit shows actual profit rather than winnings.
update abbreviations.txt update abbreviations.txt
(steffen) finish bringing back tourney (steffen) finish bringing back tourney

52
pyfpdb/GuiTableViewer.py
View File

@ -102,7 +102,7 @@ class GuiTableViewer (threading.Thread):
else: else:
fpdb_simple.FpdbError("invalid seatCount") fpdb_simple.FpdbError("invalid seatCount")
self.cursor.execute("SELECT * FROM HudDataHoldemOmaha WHERE gametypeId=%s AND playerId=%s AND activeSeats>=%s AND activeSeats<=%s", (self.gametype_id, self.player_ids[player][0], minSeats, maxSeats)) self.cursor.execute("SELECT * FROM HudCache WHERE gametypeId=%s AND playerId=%s AND activeSeats>=%s AND activeSeats<=%s", (self.gametype_id, self.player_ids[player][0], minSeats, maxSeats))
rows=self.cursor.fetchall() rows=self.cursor.fetchall()
row=[] row=[]
@ -120,45 +120,45 @@ class GuiTableViewer (threading.Thread):
#print "in prep data, row_no:",row_no,"field_no:",field_no #print "in prep data, row_no:",row_no,"field_no:",field_no
row[field_no]+=rows[row_no][field_no] row[field_no]+=rows[row_no][field_no]
tmp.append(str(row[4]))#Hands tmp.append(str(row[6]))#Hands
tmp.append(self.hudDivide(row[5],row[4])) #VPIP tmp.append(self.hudDivide(row[7],row[6])) #VPIP
tmp.append(self.hudDivide(row[6],row[4])) #PFR tmp.append(self.hudDivide(row[8],row[6])) #PFR
tmp.append(self.hudDivide(row[8],row[7])+" ("+str(row[7])+")") #PF3B4B tmp.append(self.hudDivide(row[10],row[9])+" ("+str(row[9])+")") #PF3B4B
tmp.append(self.hudDivide(row[25],row[24])+" ("+str(row[24])+")") #ST tmp.append(self.hudDivide(row[31],row[30])+" ("+str(row[30])+")") #ST
if self.settings['tv-combinedStealFold']: if self.settings['tv-combinedStealFold']:
tmp.append(self.hudDivide(row[29]+row[27],row[28]+row[26])+" ("+str(row[28]+row[26])+")") #FSB tmp.append(self.hudDivide(row[35]+row[33],row[34]+row[32])+" ("+str(row[34]+row[32])+")") #FSB
else: else:
tmp.append(self.hudDivide(row[29],row[28])+" ("+str(row[28])+")") #FS tmp.append(self.hudDivide(row[35],row[34])+" ("+str(row[34])+")") #FS
tmp.append(self.hudDivide(row[27],row[26])+" ("+str(row[26])+")") #FB tmp.append(self.hudDivide(row[33],row[32])+" ("+str(row[32])+")") #FB
tmp.append(self.hudDivide(row[31],row[30])+" ("+str(row[30])+")") #CB tmp.append(self.hudDivide(row[37],row[36])+" ("+str(row[36])+")") #CB
if self.settings['tv-combined2B3B']: if self.settings['tv-combined2B3B']:
tmp.append(self.hudDivide(row[33]+row[35],row[32]+row[34])+" ("+str(row[32]+row[34])+")") #23B tmp.append(self.hudDivide(row[39]+row[41],row[38]+row[40])+" ("+str(row[38]+row[40])+")") #23B
else: else:
tmp.append(self.hudDivide(row[33],row[32])+" ("+str(row[32])+")") #2B tmp.append(self.hudDivide(row[39],row[38])+" ("+str(row[38])+")") #2B
tmp.append(self.hudDivide(row[35],row[34])+" ("+str(row[34])+")") #3B tmp.append(self.hudDivide(row[41],row[40])+" ("+str(row[40])+")") #3B
if self.settings['tv-combinedPostflop']: if self.settings['tv-combinedPostflop']:
aggCount=row[13]+row[14]+row[15] aggCount=row[16]+row[17]+row[18]
handCount=row[9]+row[10]+row[11] handCount=row[11]+row[12]+row[13]
foldCount=row[17]+row[19]+row[21] foldCount=row[24]+row[25]+row[26]
otherRaiseCount=row[16]+row[18]+row[20] otherRaiseCount=row[20]+row[21]+row[22]
tmp.append(self.hudDivide(aggCount,handCount)+" ("+str(handCount)+")") #Agg tmp.append(self.hudDivide(aggCount,handCount)+" ("+str(handCount)+")") #Agg
tmp.append(self.hudDivide(foldCount,otherRaiseCount)+" ("+str(otherRaiseCount)+")") #FF tmp.append(self.hudDivide(foldCount,otherRaiseCount)+" ("+str(otherRaiseCount)+")") #FF
else: else:
tmp.append(self.hudDivide(row[13],row[9])+" ("+str(row[9])+")") #AF tmp.append(self.hudDivide(row[16],row[11])+" ("+str(row[11])+")") #AF
tmp.append(self.hudDivide(row[17],row[16])+" ("+str(row[16])+")") #FF tmp.append(self.hudDivide(row[24],row[20])+" ("+str(row[20])+")") #FF
tmp.append(self.hudDivide(row[14],row[10])+" ("+str(row[10])+")") #AT tmp.append(self.hudDivide(row[17],row[12])+" ("+str(row[12])+")") #AT
tmp.append(self.hudDivide(row[19],row[18])+" ("+str(row[18])+")") #FT tmp.append(self.hudDivide(row[25],row[21])+" ("+str(row[21])+")") #FT
tmp.append(self.hudDivide(row[15],row[11])+" ("+str(row[11])+")") #AR tmp.append(self.hudDivide(row[18],row[13])+" ("+str(row[13])+")") #AR
tmp.append(self.hudDivide(row[21],row[20])+" ("+str(row[20])+")") #FR tmp.append(self.hudDivide(row[26],row[22])+" ("+str(row[22])+")") #FR
tmp.append(self.hudDivide(row[12],row[9])) #WtSD tmp.append(self.hudDivide(row[15],row[11])) #WtSD
tmp.append(self.hudDivide(row[22],row[9])) #W$wSF tmp.append(self.hudDivide(row[28],row[11])) #W$wSF
tmp.append(self.hudDivide(row[23],row[12])+" ("+str(row[12])+")") #W$@SD tmp.append(self.hudDivide(row[29],row[15])+" ("+str(row[15])+")") #W$@SD
arr.append(tmp) arr.append(tmp)
return arr return arr

2
pyfpdb/fpdb.py
View File

@ -370,7 +370,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.window.connect("delete_event", self.delete_event) self.window.connect("delete_event", self.delete_event)
self.window.connect("destroy", self.destroy) self.window.connect("destroy", self.destroy)
self.window.set_title("Free Poker DB - version: alpha1+, p50") self.window.set_title("Free Poker DB - version: alpha1+, p51")
self.window.set_border_width(1) self.window.set_border_width(1)
self.window.set_size_request(1020,400) self.window.set_size_request(1020,400)
self.window.set_resizable(True) self.window.set_resizable(True)

38
website/docs-git-instructions.php
View File

@ -14,23 +14,35 @@ require SITE_PATH.'sidebar.php';
<h1>Git Instructions</h1> <h1>Git Instructions</h1>
<p>Hi, welcome to my minimal git guide for fpdb devs!<br> <p>Hi, welcome to my minimal git guide for fpdb devs!<br>
I'll expand this on request, if you have any questions just send me a mail at steffen(at)sycamoretest.info.<br><br> You can use a git version just as user as well of course, but as there are generally hardly tested it is not advised.<br>
I'll expand this on request, if you have any questions just send me a mail at steffen(at)sycamoretest.info. There's also a bunch of instructions at http://www.assembla.com/spaces/fpdb/trac_git_tool</p>
How to make a local git commit<br> <h2>0. Getting it</h2>
==============================<br> <p>To get git for gentoo just do emerge git -av<br>
go to the root of your fpdb directory and type:<br> To get it for Windows go to http://code.google.com/p/msysgit/downloads/list and install it.
<h2>1. Cloning the fpdb git tree</h2>
<p>Just create a new directory (lets say ~/fpdb/ ), go into it and type:<br>
git clone git://git.assembla.com/fpdb.git</p>
<h2>2. Making your changes</h2>
<p>You can use whatever you want to do edit the files. I personally use nedit and occassionally Eclipse.</p>
<h2>3. Making a (local) commit</h2>
<p>Unlike in svn you don't need to be online to make your commits. First we need to tell git what to commit, so go to the root of your fpdb directory and type:<br>
git-add--interactive<br> git-add--interactive<br>
If you added any new files press a and Enter, then type the number of your new file and press Enter twice. If you made any changes to existing files press u and enter. If you want to commit all changes press * and Enter twice. Press q to leave git-add--interactive.<br> Now press u and enter. It will display a list of all changed files. If you want to commit all files just press * and enter twice to return to the main menu. If you want to commit only certain ones press the number of the file and enter and repeat until you have all the files. Then press enter again to return to the main menu.<br>
Then create a file for your commit message (I call it since_last_commit.txt) but don't add this to the repository. In the first line of this file put a summary of your changes. If you wish to you can also add in a revision number. My tree (the "central" or "official" repository) uses the format gitX where X is a running number, e.g. git91 is followed by git92. Then give some details of your changes, try to mention anything non-trivial and definitely any user-visible bug fixes. If the table design has been changed that has to be mentioned in the first line.<br> If you added any new files press a and Enter, then type the number of your new file and press Enter twice. Press q to leave git-add--interactive.<br>
Now create a file for your commit message (I call it since_last_commit.txt) but don't add this to the repository. In the first line of this file put a summary of your changes. Then give some details of your changes, try to mention anything non-trivial and definitely any user-visible bug fixes.<br>
Then run this:<br> Then run this:<br>
git-commit -F since_last_commit.txt <br> git-commit -F since_last_commit.txt <br>
<br> <h2>4a. Pushing the changes to your own public git tree</h2>
todo: how to pull/push changes to/from me<br> <p>Do this OR 4b, not both.<br>
todo: git-diff, git-rm, git-mv<br> todo</p>
<br> <h2>4b. Preparing changeset for emailing/uploading</h2>
License<br> <p>Do this OR 4a, not both.<br>
=======<br> todo</p>
Trademarks of third parties have been used under Fair Use or similar laws.<br> <h2>5. Pulling updates from the main tree</h2>
<p>todo</p>
<h2>License</h2>
<p>Trademarks of third parties have been used under Fair Use or similar laws.<br>
<br> <br>
Copyright 2008 Steffen Jobbagy-Felso<br> Copyright 2008 Steffen Jobbagy-Felso<br>
Permission is granted to copy, distribute and/or modify this<br> Permission is granted to copy, distribute and/or modify this<br>