From 6eb42cd05ebc211b7070e4ca702f36b2a8c7eb4f Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 18 Aug 2008 03:56:59 +0100 Subject: [PATCH] p51 - added to git instructions updated tv to use new HudCache --- docs/git-instructions.txt | 27 ------------ docs/known-bugs-and-planned-features.txt | 7 ++-- pyfpdb/GuiTableViewer.py | 52 ++++++++++++------------ pyfpdb/fpdb.py | 2 +- website/docs-git-instructions.php | 38 +++++++++++------ 5 files changed, 55 insertions(+), 71 deletions(-) delete mode 100644 docs/git-instructions.txt diff --git a/docs/git-instructions.txt b/docs/git-instructions.txt deleted file mode 100644 index 1d455453..00000000 --- a/docs/git-instructions.txt +++ /dev/null @@ -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 diff --git a/docs/known-bugs-and-planned-features.txt b/docs/known-bugs-and-planned-features.txt index 2aa4e4f2..ecb4ead3 100644 --- a/docs/known-bugs-and-planned-features.txt +++ b/docs/known-bugs-and-planned-features.txt @@ -3,20 +3,19 @@ Everything is subject to change and especially the order will often change. Patc alpha2 (release by 17Aug) ====== -add maxSeats to hands +change config file to windows line endings add sf.net logo to webpage change tabledesign VALIGN seperate and improve instructions for update -split install instructions into OS-specific and OS-independent section expand instructions for profile file 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 -add minimal instructions for developing to git-instructions re-run existing regression tests alpha3 ====== +finish updating filelist +finish todos in git instructions make sure totalProfit shows actual profit rather than winnings. update abbreviations.txt (steffen) finish bringing back tourney diff --git a/pyfpdb/GuiTableViewer.py b/pyfpdb/GuiTableViewer.py index 75be8426..0fb29a28 100644 --- a/pyfpdb/GuiTableViewer.py +++ b/pyfpdb/GuiTableViewer.py @@ -102,7 +102,7 @@ class GuiTableViewer (threading.Thread): else: 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() row=[] @@ -120,45 +120,45 @@ class GuiTableViewer (threading.Thread): #print "in prep data, row_no:",row_no,"field_no:",field_no row[field_no]+=rows[row_no][field_no] - tmp.append(str(row[4]))#Hands - tmp.append(self.hudDivide(row[5],row[4])) #VPIP - tmp.append(self.hudDivide(row[6],row[4])) #PFR - tmp.append(self.hudDivide(row[8],row[7])+" ("+str(row[7])+")") #PF3B4B + tmp.append(str(row[6]))#Hands + tmp.append(self.hudDivide(row[7],row[6])) #VPIP + tmp.append(self.hudDivide(row[8],row[6])) #PFR + 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']: - 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: - tmp.append(self.hudDivide(row[29],row[28])+" ("+str(row[28])+")") #FS - tmp.append(self.hudDivide(row[27],row[26])+" ("+str(row[26])+")") #FB + tmp.append(self.hudDivide(row[35],row[34])+" ("+str(row[34])+")") #FS + 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']: - 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: - tmp.append(self.hudDivide(row[33],row[32])+" ("+str(row[32])+")") #2B - tmp.append(self.hudDivide(row[35],row[34])+" ("+str(row[34])+")") #3B + tmp.append(self.hudDivide(row[39],row[38])+" ("+str(row[38])+")") #2B + tmp.append(self.hudDivide(row[41],row[40])+" ("+str(row[40])+")") #3B if self.settings['tv-combinedPostflop']: - aggCount=row[13]+row[14]+row[15] - handCount=row[9]+row[10]+row[11] - foldCount=row[17]+row[19]+row[21] - otherRaiseCount=row[16]+row[18]+row[20] + aggCount=row[16]+row[17]+row[18] + handCount=row[11]+row[12]+row[13] + foldCount=row[24]+row[25]+row[26] + otherRaiseCount=row[20]+row[21]+row[22] tmp.append(self.hudDivide(aggCount,handCount)+" ("+str(handCount)+")") #Agg tmp.append(self.hudDivide(foldCount,otherRaiseCount)+" ("+str(otherRaiseCount)+")") #FF else: - tmp.append(self.hudDivide(row[13],row[9])+" ("+str(row[9])+")") #AF - tmp.append(self.hudDivide(row[17],row[16])+" ("+str(row[16])+")") #FF - tmp.append(self.hudDivide(row[14],row[10])+" ("+str(row[10])+")") #AT - tmp.append(self.hudDivide(row[19],row[18])+" ("+str(row[18])+")") #FT - tmp.append(self.hudDivide(row[15],row[11])+" ("+str(row[11])+")") #AR - tmp.append(self.hudDivide(row[21],row[20])+" ("+str(row[20])+")") #FR + tmp.append(self.hudDivide(row[16],row[11])+" ("+str(row[11])+")") #AF + tmp.append(self.hudDivide(row[24],row[20])+" ("+str(row[20])+")") #FF + tmp.append(self.hudDivide(row[17],row[12])+" ("+str(row[12])+")") #AT + tmp.append(self.hudDivide(row[25],row[21])+" ("+str(row[21])+")") #FT + tmp.append(self.hudDivide(row[18],row[13])+" ("+str(row[13])+")") #AR + 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[22],row[9])) #W$wSF - tmp.append(self.hudDivide(row[23],row[12])+" ("+str(row[12])+")") #W$@SD + tmp.append(self.hudDivide(row[15],row[11])) #WtSD + tmp.append(self.hudDivide(row[28],row[11])) #W$wSF + tmp.append(self.hudDivide(row[29],row[15])+" ("+str(row[15])+")") #W$@SD arr.append(tmp) return arr diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index b2a52c5d..fa9bc510 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -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.connect("delete_event", self.delete_event) 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_size_request(1020,400) self.window.set_resizable(True) diff --git a/website/docs-git-instructions.php b/website/docs-git-instructions.php index 3f4e3074..9975f808 100644 --- a/website/docs-git-instructions.php +++ b/website/docs-git-instructions.php @@ -14,23 +14,35 @@ require SITE_PATH.'sidebar.php';

Git Instructions

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(at)sycamoretest.info.

+You can use a git version just as user as well of course, but as there are generally hardly tested it is not advised.
+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

-How to make a local git commit
-==============================
-go to the root of your fpdb directory and type:
+

0. Getting it

+

To get git for gentoo just do emerge git -av
+To get it for Windows go to http://code.google.com/p/msysgit/downloads/list and install it. +

1. Cloning the fpdb git tree

+

Just create a new directory (lets say ~/fpdb/ ), go into it and type:
+git clone git://git.assembla.com/fpdb.git

+

2. Making your changes

+

You can use whatever you want to do edit the files. I personally use nedit and occassionally Eclipse.

+

3. Making a (local) commit

+

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:
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.
+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.
+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.
+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.
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.
+

4a. Pushing the changes to your own public git tree

+

Do this OR 4b, not both.
+todo

+

4b. Preparing changeset for emailing/uploading

+

Do this OR 4a, not both.
+todo

+

5. Pulling updates from the main tree

+

todo

+

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