Commit Graph

547 Commits

Author SHA1 Message Date
Worros
438b6238e8 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-11 19:08:12 +09:00
Matt Turnbull
90b87c0d98 should be right? 2008-12-10 23:27:29 +00:00
sqlcoder
b62d1fb2a9 remove connection code from fpdb_import.py and use fpdb_db.py instead 2008-12-10 23:22:47 +00:00
Matt Turnbull
e90712c9a7 copied & pasted this back in, can't work out how to revert my reversion. 2008-12-10 23:16:29 +00:00
Matt Turnbull
489efc779b Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:

	pyfpdb/Hud.py

Hope I chose the right lines here.
2008-12-10 22:52:07 +00:00
Matt Turnbull
69f6769a6b Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-10 22:48:20 +00:00
Matt Turnbull
fd2cb9dc42 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-10 22:47:54 +00:00
Ray
95f5eab448 merge with eric's drag changes 2008-12-10 13:45:56 -05:00
eblade
efc3e591ea fix timeout callbacks for tracking table position 2008-12-10 13:35:15 -05:00
Matt Turnbull
092b1a1b83 Merge branch 'exp' 2008-12-10 18:08:46 +00:00
Matt Turnbull
f3afba129a Revert "Add start of graph export functionality"
This reverts commit 998ab6eac3.
2008-12-10 18:01:20 +00:00
Matt Turnbull
d1a8c445e2 for perusal of dispatcher 2008-12-10 17:56:16 +00:00
Matt Turnbull
dda88b76ba cosmetics, comments, some value checking
added mucked / folded / shown summary lines
2008-12-10 16:30:57 +00:00
Worros
9ca0574d78 Really basic check that username exists 2008-12-10 21:21:43 +09:00
Worros
dc33003ce4 Merge branch 'master' of git://git.assembla.com/fpdb 2008-12-10 20:14:44 +09:00
Worros
8258c19c8f Merge branch 'master' of git://git.assembla.com/fpdb-sql 2008-12-10 19:39:37 +09:00
Worros
5a568527b8 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-10 19:39:27 +09:00
Ray
fff1e53eb9 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/Hud.py
2008-12-10 00:02:50 -05:00
steffen123
c8d12cfe61 p144 - updated table design after comments on draw tables 2008-12-10 03:55:12 +00:00
Matt Turnbull
3ff2ec2106 removed read board cards from markStreets 2008-12-10 00:58:10 +00:00
Worros
390519c549 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-10 09:50:42 +09:00
Matt Turnbull
91105824bd wasn't printing bets
and fixed last fix
2008-12-10 00:48:45 +00:00
Matt Turnbull
215d5a74b2 If the small blind is dead and it's folded round to big blind, no one collects a pot. Warning if we do not see 'collected' line. 2008-12-10 00:05:12 +00:00
Matt Turnbull
c9cb2ea7dd takes care of weirdness with everleaf saying:
player folds
but also
player: bets

takes care of double spaces and other junk where stack size is usually reported.
2008-12-09 23:58:38 +00:00
sqlcoder
1a43ccf2da remove redundant unique keyword in create table statements 2008-12-09 23:38:40 +00:00
Matt Turnbull
e8810839f9 bit less mess 2008-12-09 23:38:16 +00:00
Matt Turnbull
6b0dcc37d4 I set it up with Speed_Kuala_full.txt and now it's time to go through them all fixing the bugs. 2008-12-09 23:30:58 +00:00
Matt Turnbull
7ac433fede 2 decimal places for rake 2008-12-09 15:35:16 +00:00
Matt Turnbull
2d6412c8a7 pseudo stars! 2008-12-09 15:32:37 +00:00
Worros
f607b3ff63 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2008-12-09 23:50:35 +09:00
Worros
7b05adea80 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-09 23:49:25 +09:00
Worros
49f1f6bda0 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-09 23:48:28 +09:00
eblade
5e23b55361 specify right function name to timer, duh 2008-12-09 08:35:19 -05:00
eblade
7516d17a40 add 0.5 sec auto-timer to auto-run update_table_position 2008-12-09 08:21:50 -05:00
eblade
9dd6f36df6 add Hud::update_table_position(), tracks table.x and table.y, repositions all stat_windows within. triggered each update(), and when the Reposition Stats menu option is selected.
fix windows code to use same gdkhandle variables as unix code
2008-12-09 07:51:41 -05:00
eblade
7d4bded3d5 make sure we close each handle opened by ProcessOpen in the win32 calls 2008-12-09 01:43:13 -05:00
sqlcoder
71a587faca mods to use insert_id() instead of repeated selects and get postgres working 2008-12-09 00:29:39 +00:00
Ray
7d75e4af91 Add winner and pot to Mucked list list box + intfac imp. 2008-12-08 14:10:45 -05:00
Matt Turnbull
4f44eff3da getting somewhere, very messy, using pokereval, not sure if this is right direction, comments please 2008-12-08 06:23:50 +00:00
sqlcoder
30e61901d6 use spaces not tabs and get first part of insert_id() code working again 2008-12-08 01:38:06 +00:00
sqlcoder
3ea95acb0c add db param to allow insert_id() matching fpdb_parse_logic.py 2008-12-08 00:55:03 +00:00
Worros
a73a9d446c Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-12-08 09:43:42 +09:00
sqlcoder
4dc15bfd94 pulled and merged from fpdboz 2008-12-07 23:38:33 +00:00
sqlcoder
ec01f7ae40 move code closer to carl's repo 2008-12-07 17:23:38 +00:00
Worros
ba944c2d7c Merge branch 'master' of git://git.assembla.com/free_poker_tools
Conflicts:

	pyfpdb/fpdb_simple.py
2008-12-07 18:07:00 +09:00
Worros
edd3d3ec07 White space churn to RegressionTester 2008-12-07 17:35:37 +09:00
Worros
977e954574 Fixups to GuiPlayerStats
Now sets up and obeys the radio buttons more correctly.

Also reads the names from the text box, and replaces <player_test> in
the sql query.
2008-12-07 17:06:01 +09:00
Worros
425997d66a Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2008-12-07 14:17:05 +09:00
Worros
b1a9109190 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-07 14:04:00 +09:00
Mika Bostrom
90e348946f First step at fixing the bulk importer with postgres 2008-12-06 21:59:58 +02:00
Mika Bostrom
415eb4a3c6 Retab/whitespace demangly fpdb_import.py 2008-12-06 21:50:40 +02:00
Mika Bostrom
19c0328955 Change syntax for CREATE INDEX... for postgresql 2008-12-06 21:14:39 +02:00
Matt Turnbull
72addde510 whitespace 2008-12-06 14:15:41 +00:00
Matt Turnbull
95f43dfd74 pot total and rake 2008-12-06 14:13:38 +00:00
Mika Bostrom
6070066f8a obtain_global_lock() is a method, not top-level function 2008-12-06 15:16:55 +02:00
Mika Bostrom
dfb8a06686 Allow to connect to local PostgreSQL via domain socket 2008-12-06 15:07:37 +02:00
Mika Bostrom
7ecfac5437 Retab/whitespace demangle fpdb_db.py 2008-12-06 14:40:04 +02:00
Mika Bostrom
c9700fc1a7 Some debugs 2008-12-06 14:34:44 +02:00
Mika Bostrom
0f05d0886e Modify local HUD_config.xml, clean some places and change DB type to
postgresql
2008-12-06 14:10:50 +02:00
Worros
998ab6eac3 Add start of graph export functionality
No function yet - just adds callback
2008-12-06 20:51:36 +09:00
Worros
88075bc4f2 Colorise the stats rows, add refresh button
Refresh button destroys table at the moment.
2008-12-06 20:50:06 +09:00
Mika Bostrom
3eb1a1dd0b Start to clean up psycopg2.connect() and surroundings 2008-12-06 13:41:39 +02:00
Worros
1576387d61 Add GuiPlayerStats to menu 2008-12-06 19:09:18 +09:00
Worros
803491e6fd Add new GUI insterface for players stats
First pass at displaying player stats. Only works if your player id is
3, and you play nl
2008-12-06 19:08:07 +09:00
Ray
1e9263f202 Fix width of left column. 2008-12-05 12:51:19 -05:00
Worros
d17e353509 Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-05 22:50:22 +09:00
Worros
51ce6fc191 Index mods '+0' from sqlcoder on mailing list
Have been tested and provide a significant improvement on import.

"""
Along with new indexes, I think some of the sql in fpdb_simple can be
altered to make it use existing indexes more effectively. Generally
these mods affect statements where the db has a choice of 2 indexes to
use and I think it is choosing badly, e.g. it is using tourneyTypeId
which could match the whole table when it could use the new
siteTourneyNo index which will return very few rows.

To stop the db from using an index I'm just adding zero to the field, so
something like
   playerId = %s
changes to
   playerId+0 = %s
We humans can tell this is no real change at all, but the db sees this
as a change from <field> = <value> to <expression> = <value>, and it can
only use the index if the <field> the index is on is being tested.
(Nowadays you can index expressions in some databases but we'll ignore
that!)
"""
2008-12-05 17:18:13 +09:00
Matt Turnbull
47e2fd053a unimplemented is more meaningful warning 2008-12-05 02:42:13 +00:00
Matt Turnbull
862502cdc0 Hand class keeping track of pot total / bet amounts
Began to turn hand.printHand into the writeHand method but this may not be necessary after all
2008-12-05 02:40:04 +00:00
Ray
22111e6d3f Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-12-04 12:57:05 -05:00
Ray
3cfea4eb30 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:

	pyfpdb/fpdb_simple.py
2008-12-04 12:56:27 -05:00
Worros
afea3315fc Merge branch 'exp' of git://git.assembla.com/mctfpdb 2008-12-04 18:47:42 +09:00
Worros
42381eaabc Merge branch 'master' of git://git.assembla.com/mctfpdb
Conflicts:

	pyfpdb/fpdb_simple.py
2008-12-04 18:46:55 +09:00
Worros
fefbcfca65 Whitespace churn on Graph viewer 2008-12-04 16:15:38 +09:00
Worros
a1ed9603f3 Revert debug changes made while working with Eric 2008-12-04 15:52:24 +09:00
Matt Turnbull
92656ae6a0 hole cards / community cards extracted and added to printout 2008-12-03 23:57:20 +00:00
sqlcoder
160db08689 calc totalprofit for hud 2008-12-03 23:14:03 +00:00
eblade
0186145065 remove no-longer-needed "topify_window" for Stat_Window, removed some lines that were commented out due to no longer being needed, etc. Seems to fix the windows randomly re-attaching in Win32. 2008-12-03 13:35:19 -05:00
Ray
7063e03d6e futile attempt to fix mystery crash 2008-12-03 12:48:04 -05:00
Ray
3be6453b42 Minor bug in import parameters. 2008-12-03 12:01:37 -05:00
Worros
1f7f3f7187 Fix MySQL 'ADD INDEX' syntax, add functions to create_tables 2008-12-03 18:18:20 +09:00
Worros
165ca5bf19 Oops - fix last commit 2008-12-03 17:41:20 +09:00
Worros
f25e524c06 Add sqlcoders indexes to query file 2008-12-03 17:37:31 +09:00
eblade
cd858d6ade add "debug stat windows" to hud menu .. doesn't do anything useful yet, as i'm trying to figure out what part to actually debug 2008-12-03 03:25:49 -05:00
eblade
703c2a1d12 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2008-12-03 03:25:02 -05:00
Worros
bac92f7b6e playerStats query from sqlcoder - massive whitepsace churn - Apologies 2008-12-03 17:00:11 +09:00
Worros
e7650427b0 Initial placement of playerStatsByPosition
Doesn't do much thats useful yet - hard coded to nl and playerid=3
2008-12-03 16:36:49 +09:00
sqlcoder
567d585a54 script to update index choices 2008-12-02 23:28:06 +00:00
eblade
3f86c54b17 add "NA" to fold to steal stats for 0/0's 2008-12-02 10:14:38 -05:00
sqlcoder
a824814c0a sqlcoder initial updates 2008-12-02 00:15:50 +00:00
Matt Turnbull
85f64b42fb Merge branch 'master' of git://git.assembla.com/fpdboz 2008-12-01 14:34:39 +00:00
Worros
8820a691e8 Update bulk import codepath to output total import time. 2008-12-01 20:07:38 +09:00
eblade
401bcc15cd remove debug code i accidently committed last time
account for dead seats between blinds
fix some improper position handling when BB in seat 2, with dead hand in seat 1, and SB on last seat
2008-11-27 11:27:23 -05:00
Worros
762ae46afb Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/GuiGraphViewer.py
2008-11-27 22:50:58 +09:00
eblade
1de34462e3 remove spurious window realize from popup_window as well
printEmailErrorMessage also writes a traceback to the stderr, so we can more easily figure out -what part- it failed in
parsePositions will ignore a small blind if it appears to be coming from the same place as the big (does this mess with dead blinds? who knows)
2008-11-27 08:35:17 -05:00
Worros
fed3374901 Start output of action lines for Super class 2008-11-27 21:29:19 +09:00
Worros
b495387d94 Move Everleaf updates - action now parsed 2008-11-27 20:54:42 +09:00
eblade
274cecdc58 stat windows no longer call realize() as that is done automatically by gtk when needed
importer dumps bad hands to hand-errors.txt after printing the normal email message
parse_logic should ignore lines where small blind is found to be "$0", however, it's still causing errors
2008-11-27 05:12:07 -05:00
eblade
6e116f4b02 don't bother doing show_all on each stat_window, then hide, just hide first. (probably shouldn't need to even hide them first, but they seem to sometimes start hidden sometimes not) 2008-11-27 02:31:52 -05:00
Worros
7cc8ce7757 Clean up profit graph function 2008-11-27 10:29:41 +09:00
Worros
6c4c450f07 Fix for postgres graph query - Remove column names to fix syntax error 2008-11-27 10:28:19 +09:00
eblade
49390940e3 add middle-click on stat_window to hide it (since we don't currently have a way to hide it when someone leaves) 2008-11-25 08:52:59 -05:00
eblade
2c00422f34 clean up some stat descriptions 2008-11-25 07:33:20 -05:00
eblade
53a95ccc80 stat windows are hidden by default, and only brought forward when there's a player in a seat that has recorded a hand 2008-11-25 07:03:33 -05:00
eblade
f8749fe7fb Add "hudcolor" attribute to all <stat> definitions, drop font size to Sans 7, since i can't fit my stats in comfortably anymore 2008-11-25 06:47:58 -05:00
eblade
c815edaa9b Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-22 18:16:55 -05:00
eblade
5642f4bafc Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-22 18:16:46 -05:00
Ray
2155c12587 Fixed error detecting FTP tables on NT 2008-11-22 17:28:12 -05:00
Worros
bffbc18ff4 : 2008-11-18 14:27:30 +09:00
eblade
50938c4912 Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-17 14:38:01 -05:00
Ray
17ad796917 More changes to support mucked/aux windows. 2008-11-16 17:53:31 -05:00
Worros
55332d4983 More Everleaf updates, may have a functional regex for action in NLHE 2008-11-16 13:44:16 +09:00
Worros
7aa0cff8d8 Make ftp kinda work 2008-11-16 13:43:24 +09:00
Worros
dfbcf8efc7 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2008-11-16 11:49:37 +09:00
eblade
284955350a Merge branch 'master' of git://git.assembla.com/fpdboz.git 2008-11-14 15:46:02 -05:00
eblade
1ed20a5f70 Merge branch 'master' of git://git.assembla.com/fpdboz.git
Conflicts:
	pyfpdb/GuiGraphViewer.py
2008-11-14 15:45:56 -05:00
Ray
37cd869209 fix reading of mucked cards for stud games 2008-11-14 13:10:17 -05:00
Worros
0059d20f8e Add callback for test entry so player name is changable. Still buggy but partially functional 2008-11-14 22:41:37 +10:00
Worros
ba52cb93d1 Actually implement sqlcoders query as intended.
Query running in about 30% of the time.
2008-11-14 19:27:37 +10:00
Worros
e4021b0525 Fix comment re: stars time format 2008-11-14 15:02:38 +10:00
Worros
115c5d920d Text was annoying me. Turned into multiline string. 2008-11-14 14:58:35 +10:00
Worros
86ba757080 Major update to the layout of GuiGraphViewer.
Changes the structure to a left a left options pane and a right graph pane.

Starting to create the options dynamically, and use callbacks sanely.
2008-11-14 14:54:34 +10:00
eblade
05f3f5eee2 fix indentation typo 2008-11-13 19:42:35 -05:00
eblade
077cb70c79 Merge Carl's changes from sqlcoder to GuiGraph to mine from earlier 2008-11-13 19:41:20 -05:00
Worros
34e374a55e Patch from sqlcoder to make the query for the profit graph smarter/faster 2008-11-14 08:15:28 +10:00
Ray
d90fa208de Smooth wrinkles in mucked card display. 2008-11-13 17:07:24 -05:00
Ray
806744bf34 Mucked window enabled. 2008-11-12 23:02:51 -05:00
Ray
ca960cad96 Support for the mucked cards window. Still a bug in the card storing. 2008-11-12 22:45:09 -05:00
Ray
b35e6c5570 fix bug in saving layouts when fav_seat != 0 2008-11-12 10:28:48 -05:00
Worros
c2475db712 Bugfix - fixes new stars format import, also fixes bug in bulk import (that i introduced a few commits ago) 2008-11-12 22:40:29 +10:00
eblade
5903988e38 merge with ray/carl
GuiGraphViewer: configure matplotlib to use GTK properly, add in error handling for graphing across a database with hands the player you've requested wasn't involved in. please see # todo note on that.
2008-11-12 06:30:49 -05:00
Worros
6e182831ac Everleaf update - Holecards read 2008-11-12 14:12:18 +10:00
Ray
29a04f639d Merge branch 'master' of git://git.assembla.com/fpdboz 2008-11-11 14:28:50 -05:00
Ray
f5b39068cf Added a query to get stats aggregated for all stakes. 2008-11-11 14:27:35 -05:00
Ray
461c870690 Fine tuning tournament support. 2008-11-11 14:25:56 -05:00
Ray
9923e6e8ca Merge branch 'master' of git://git.assembla.com/fpdb-eric
Conflicts:

	pyfpdb/Configuration.py
2008-11-11 09:55:41 -05:00
Ray
036729b8c2 Support tournaments 2008-11-11 09:50:20 -05:00
Ray
43f64dda3d Merge branch 'master' of git://trac-git.assembla.com/fpdb 2008-11-11 09:49:04 -05:00
Ray
15d7ea70dc Support tournament detection = major refactor of Tables.py 2008-11-11 09:40:31 -05:00
eblade
863c5be428 change text in hud main windows (smaller, indicates presence of menu and moveability), add opacity and move support (does not yet save it's position) 2008-11-11 04:36:44 -05:00
Worros
2bdc7f5057 Everleaf converter update - blinds posting 2008-11-11 18:54:24 +10:00
Worros
4bbd18d935 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-11-11 16:24:07 +10:00
eblade
32b1d7fa86 add opacity to p4e/everleaf config example 2008-11-10 22:42:51 -05:00
Worros
45b2b4b212 Fix sb/bb - no need to convert 2008-11-11 08:22:33 +10:00
Worros
d112c39c1c More Everleaf updates - parse player stacks and seats 2008-11-11 00:19:45 +10:00
Worros
da83795e5a Fix 'duh' error and grab button position 2008-11-10 23:29:49 +10:00
Worros
816a9e3b58 More Everleaf converter updates, now parsing some hand info 2008-11-10 23:02:56 +10:00
Worros
6de1ac1c82 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2008-11-10 22:55:24 +10:00
eblade
2074d755aa Hud.py: fix typos in definitions of reposition_windows and kill_hud, eliminating errors when those functions are called
move pop-up window to button 3 when clicked on a stat window, added move/resize functionality to button 1 (hold shift to resize, or just click/drag to move)
restore opacity in windows (new window movement works with opacity set)
fix error in popup_window initilization referring to window instead of main_window, oops
2008-11-10 05:58:55 -05:00
eblade
e713a9c654 fix weird error on windows? possibly just with p4e? trapping if we read 0 lines from history file 2008-11-10 03:46:37 -05:00