Worros
395f19b5fb
Add showdown/non-showdown winnings to Grapher
2009-12-02 14:02:06 +08:00
Eric Blade
abf132c719
Merge branch 'master' of git://git.assembla.com/fpdb-sql.git
...
Conflicts:
pyfpdb/Database.py
2009-12-01 08:03:25 -05:00
Eric Blade
bec343abfd
argh at whitespace churn, do i have my editor settings screwey?
...
trap error 2003 on mysql connect (same as 2002, but for tcp)
2009-12-01 06:58:33 -05:00
sqlcoder
f7ed06d071
improve rebuild hudcache and indexes dialogs
2009-11-30 21:43:29 +00:00
Eric Blade
9953e76c9e
trap IOError on hud pipe write when hud closed without autoimport stopping, turn off hud
2009-11-30 09:51:47 -05:00
Eric Blade
8c8fdba7c8
ttime = float with us to ms resolution
2009-11-30 09:08:30 -05:00
Eric Blade
284b0c1f38
fix return tuple in import_file_dict, fix text from autoimport to actually show up in autoimport window
2009-11-30 08:14:03 -05:00
Worros
fc20330f2b
[NEWIMPORT] Don't actually writeHand on NEWIMPORT
2009-11-30 15:11:00 +08:00
Worros
f30b3a6117
Oops - actually add NEWIMPORT const to Configuration
2009-11-30 14:41:07 +08:00
Worros
36dda2174b
Move NEWIMPORT into config
...
Fix test_PokerStars test to catch exception when importing with the legacy importer
2009-11-30 14:33:32 +08:00
Worros
152933ed49
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-11-30 14:23:37 +08:00
Worros
71c2fea1ca
Add query object to test
2009-11-30 14:22:58 +08:00
Worros
bb38d7e1dd
[NEWIMPORT] Clean up HandsPlayers.cardX fetching
2009-11-30 14:20:48 +08:00
Eric Blade
67beb4bd9f
add textview to autoimport window for dropping status/info messages on, just call it's AddText func to get it there
2009-11-29 23:52:36 -05:00
Eric Blade
3439523de8
Merge branch 'master' of git://git.assembla.com/fpdb-sql.git
2009-11-29 22:02:49 -05:00
Worros
db5e321fe0
Fix obvious typo
2009-11-30 10:53:15 +08:00
Worros
aed892139d
Add -i option for input file
2009-11-30 10:52:28 +08:00
sqlcoder
00c85aa62d
add rebuild indexes option to Database menu (can we put tooltips over these menu options?)
2009-11-29 23:02:45 +00:00
sqlcoder
8221e86757
turn off hud seats restriction as default
2009-11-29 18:14:04 +00:00
sqlcoder
78004a2e76
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-29 17:37:19 +00:00
sqlcoder
65b372570f
add some comments
2009-11-29 17:36:37 +00:00
sqlcoder
432a39b172
better icon for tab close buttons
2009-11-29 17:36:22 +00:00
Eric Blade
bab3ad6ca9
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-11-29 12:28:14 -05:00
Eric Blade
3f140ab157
exception traceback in idle_func in create_hud
2009-11-29 12:25:02 -05:00
Worros
a667fe37be
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
...
Conflicts:
pyfpdb/HUD_main.py
2009-11-29 18:08:47 +08:00
Worros
8d10cbcd5e
test_PokerStars - Add test for 5 card draw
2009-11-29 17:10:14 +08:00
Worros
a6a3217bbc
Fix draw parsing finally?
2009-11-29 16:54:15 +08:00
Worros
39f27bc781
test_PokerStars: Add 2-7 Lowball test
2009-11-29 15:28:32 +08:00
Worros
9071640182
Fix Draw parsing
2009-11-29 15:22:46 +08:00
Worros
f5d8f153b5
Start of fixes to draw parsing
2009-11-29 14:40:32 +08:00
Worros
e93412f12d
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-11-29 11:44:26 +08:00
sqlcoder
c77ae39077
add close buttons to tabs
2009-11-28 23:36:54 +00:00
sqlcoder
db3371a202
use notebook widget to show proper tabs
2009-11-28 22:00:44 +00:00
sqlcoder
cce1545024
add gui stuff to test, stop crash if xml.dom.ext not present
2009-11-28 21:11:52 +00:00
sqlcoder
7f40d9dd3a
change default for min_seats to 0 in case hc.activeSeats is zero
2009-11-28 11:48:06 +00:00
Mika Bostrom
2f742e371b
Use wider try-except block
...
The 'temp_key' table name in hud_dict can vanish between DB roundtrips.
Enclose all three lines within try-block.
2009-11-28 10:59:44 +02:00
Mika Bostrom
6dec7f38f3
Fix a stupid syntax error
...
Use python's format-string syntax.
2009-11-27 22:21:45 +02:00
Worros
a13ae41134
Fix MySQL startup error: 2002
...
2002, "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)"
2009-11-27 20:19:43 +08:00
Eric Blade
41c963baa9
look at all that whitespace churn.. sorry my git just acts weird. it's gitty.
2009-11-27 02:09:06 -05:00
sqlcoder
b60895a89f
merge from carl
2009-11-26 22:35:50 +00:00
sqlcoder
6037f17fb9
added seats options to hud menu
2009-11-26 22:24:24 +00:00
sqlcoder
65fe163379
add ability to display hud stats by number of seats at table (All / Custom / Exact)
2009-11-26 21:28:05 +00:00
Mika Bostrom
df6d9a0a56
Fix missing checks before .set_active()
...
Some validity tests were still missing. Also, typofix:
self.cbFl -> self.cbFL
2009-11-26 23:07:58 +02:00
Worros
0368992289
Add test config used by py.test
2009-11-27 00:19:31 +08:00
Worros
8371ed244a
test_PokerStars - add test Stud files and import
...
Also add commented out tests for Draw games
2009-11-27 00:12:57 +08:00
Worros
411d4ac792
test_PokerStars - Add NLHE-USD-MTT-5r-200710.txt
...
Commented out for the moment, it has never parsed in old or new code.
2009-11-26 22:52:27 +08:00
Worros
5b5216bbe2
Fix test_PokerStars.py
2009-11-26 22:41:42 +08:00
Worros
b794d20f6d
Make sqlite :memory: work again
2009-11-26 22:02:48 +08:00
Worros
9e7e22ffa1
Start of in tree HH archive
2009-11-26 17:00:22 +08:00
Worros
ac96d88a8c
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-11-26 10:01:53 +08:00
Worros
c9901c3106
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-11-26 10:01:39 +08:00
sqlcoder
9d754e5e4b
make sure db locks are released
2009-11-25 20:55:58 +00:00
Mika Bostrom
cb9e2cb6e7
Try to fix two HUD main hangs
...
The main HUD process can hang due to unhandled exceptions, which
occurred in two separate situations:
1. Table window is closed and HUD instance killed before auto-importer
knows about it
2. Sometimes the threading can jam
These changes attempt to counter the effect of race-conditions. The
dictionary key (table name) is properly tested at the beginning of
update/create block, *but* there are two short round-trips to database
before the key is used. While these occur, the HUD instance can vanish
and thus get its key removed from the dictionary.
Also, when Tables.Table() is created, it will be populated on-demand,
and have child attributes only when such are found from the system. The
new table code pulls in data from actual windows. Again, there is a
query involved and while it runs, the table may have vanished. This
ended up as an error in this call:
foo = gtk.gdk.window_foreign_new(table.number)
The object 'table' is valid (not None) but it has been populated only
after actual table window was killed. Therefore it may not have .number
attribute, which raised an AttributeError. Now the presence of
table.number attribute is tested before the object can be sent to
create_HUD().
2009-11-25 20:31:02 +02:00
Eric Blade
0b4f5acec1
some weird whitespace churning, and again comment out "sending hand to hud" message
2009-11-25 08:22:14 -05:00
Mika Bostrom
5435c164f9
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-25 14:40:50 +02:00
Worros
aee9a7339c
[NEWIMPORT] Stop duplicate hands from crashing import
2009-11-25 16:29:30 +08:00
Worros
83f06c35cc
[NEWIMPORT] HandsPlayers.CBet stats
2009-11-25 14:59:29 +08:00
Mika Bostrom
8d64a720c4
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-25 08:50:08 +02:00
Worros
30332d2132
Remove forced assert
2009-11-25 10:27:54 +08:00
Worros
1b2a45b77e
Prefs: Fix display when a comment node exists in config
2009-11-25 09:06:01 +08:00
sqlcoder
339a0133a9
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-24 19:51:21 +00:00
sqlcoder
02fd6d6bd0
add Preferences option on File menu
2009-11-24 19:50:48 +00:00
sqlcoder
c856824145
fix bug in save() and simplify it. Add get_doc() method
2009-11-24 19:46:57 +00:00
Mika Bostrom
48930e1679
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-24 19:42:39 +02:00
Worros
a87a145c28
[NEWIMPORT] HandsPlayers.streetXCalls and streetXBets
...
Pretty sure the bets stat is wrong
2009-11-25 00:57:14 +08:00
Worros
3bb1656603
[NEWIMPORT] Add HandsPlayers.wonAtSD
2009-11-24 23:23:21 +08:00
Worros
9203e0b0d8
[NEWIMPORT] HandsPlayers.sawShowdown added
2009-11-24 23:14:43 +08:00
Worros
dc1b0d2e38
[NEWIMPORT] Calculate wonWhenSeenStreet1
...
Won is defined as 'collected money from the pot'
Seen street 1 does not require vpip on street 0
2009-11-24 21:58:27 +08:00
Eric Blade
9bf5017ff1
re-enable exception handling in idle_func() now that i know what we could expect to trap reasonably. Deal in update() with what might happen if update_table_position() fails
2009-11-24 06:08:43 -05:00
Worros
e9a858e4cd
Make DEBUG = False in DerivedStats
2009-11-24 17:55:00 +08:00
Worros
48c395565e
[NEWIMPORT] Add HandsPlayers.totalProfit
...
Grapher now works after import yay
2009-11-24 17:29:54 +08:00
Worros
d65ee55b64
[NEWIMPORT] Calculate rake, make card calculation holdem only
...
Stud card fetching still terminally broken
2009-11-24 16:44:46 +08:00
Worros
d617f1c4e0
[NEWIMPORT] Update Database.storeHandsPlayers
2009-11-24 16:39:59 +08:00
Worros
ef9abd2948
Force all output from HHCs to by utf8
2009-11-24 11:21:55 +08:00
Eric Blade
a735ab67b2
stuck an error print in wintables if self.window doesn't exist
2009-11-23 10:24:38 -05:00
Eric Blade
32e7a28d2c
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-11-22 16:44:22 -05:00
Eric Blade
3e7a0ef53c
remove all occurences of assigning sys.argv
2009-11-22 16:40:56 -05:00
Worros
34e7fb0459
[NEWIMPORT] Fix HandsPlayers.cardX init
2009-11-23 00:20:51 +08:00
Worros
943e188a4d
[NEWIMPORT] Hole card data for flop games
...
Take some code from Grindi to calculate playersAtStreetX and streetXRaises
2009-11-23 00:05:23 +08:00
Worros
1650b76ea5
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-11-22 13:07:49 +08:00
Eric Blade
64d9a3582b
No longer mess with sys.argv (messing with system variables is a bad thing, right), use argv to determine pathname of executeable as sys.path[0] is just the first component of the path. also all database errors except MySQL reporting "Access Denied" should now crash FPDB, so someone can fill those into Exceptions, and into the fpdb_db and the fpdb files.
...
Process: get crash info, add exception info to Exceptions.py, catch generic database exception in fpdb_db.py (around the connect line), throw correct Fpdb exception, then catch it in fpdb.py and do the appropriate thing on the GUI end.
2009-11-22 00:00:23 -05:00
Worros
d08e9a1ea3
Add support for UTF-8 HH type.
...
Able to parse and import an EUR hh file
2009-11-22 12:34:11 +08:00
Mika Bostrom
d2c25b6d28
Fix simple error in filter code
...
Other parts test that the object is valid before calling
.set_active(); follow convention to eliminate needless errors
2009-11-21 23:51:18 +02:00
Worros
14ccde73a2
Fix Playerstats for Pot Limit
...
Still broken for cap games. Need a more flexible mechanism for this
2009-11-21 11:16:08 +08:00
Worros
8d2b315fc8
Fix PL in Graph viewer
...
Grapher still doesn't support the cap games, that code could use some cleanout.
2009-11-21 11:11:31 +08:00
Worros
348420f30d
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2009-11-20 21:28:05 +08:00
Worros
4d4387bd94
Removing second layer of try:
...
Killing until we figure out what it was supposed to catch
2009-11-20 15:11:58 +08:00
Mika Bostrom
615d1ea8a6
Add default style keys
...
It seems there is some weird way for stylekeys to remain unset. Catch
the special case and have a way to see why this happens.
2009-11-20 08:48:49 +02:00
Worros
eedffdf472
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-11-20 09:11:46 +08:00
sqlcoder
6eba4a5544
fix a merge problem and replace to_char() for sqlite, player stats now working in sqlite :-)
2009-11-19 22:19:41 +00:00
Worros
5ba4dbb0e7
Clean DerivedStats.py
2009-11-19 17:54:00 +08:00
Worros
ea323d0d22
Fix mod() test for sqlite
2009-11-19 17:33:12 +08:00
Worros
33592fbc4e
Add math function for sqlite - may still be broken
2009-11-19 17:24:22 +08:00
Worros
eadd7c045c
Adding broken mod() test
2009-11-19 17:22:53 +08:00
Worros
571cbe07a0
Add test functions for SQLite
...
Added test for VARIANCE()
Added test for floor()
2009-11-19 15:28:48 +08:00
Worros
29d135da1b
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-11-18 13:52:41 +08:00
sqlcoder
04c09af7b2
tidy up aggregation code, NOTE: renamed some aggregation config to try and make meaning clearer, updated aggregation description in .example
2009-11-17 21:47:43 +00:00
sqlcoder
289922e43a
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-17 20:48:06 +00:00
Worros
36fe5d2617
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-11-18 00:14:21 +08:00
Eratosthenes
812998704d
Yet another try to fix missing X windows. Using xwininfo.
2009-11-16 15:35:58 -05:00
Eratosthenes
55f1ebedd9
Another possible fix to missing windows.
2009-11-16 13:04:25 -05:00
Eratosthenes
4abfc0093f
test print
2009-11-16 11:48:31 -05:00
Eratosthenes
d592e85375
Possible fix of not finding windows in X.
2009-11-16 11:20:44 -05:00
Eratosthenes
3ef23852a6
Update Tables_Demo to work with new XTables/TableWindow format.
2009-11-16 10:00:26 -05:00
Worros
5b02153b43
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-11-16 15:34:23 +08:00
Worros
c9b9c848be
Add aggregate function VARIANCE() for sqlite
2009-11-16 15:19:24 +08:00
Eratosthenes
4e78dd8d93
Merge branch 'master' of git://github.com/grindi/fpdb-grindi
2009-11-13 22:02:16 -05:00
Eratosthenes
85f488e9cb
Fix pretty print test.
2009-11-11 16:25:31 -05:00
Eratosthenes
a5b0de5ed2
Fix problem with .example overiding HUD_config.
2009-11-11 16:20:43 -05:00
Eratosthenes
65393492cf
Get logging.conf and matplotlib datafiles.
2009-11-09 22:02:50 -05:00
Eratosthenes
1b980e7cad
Fix merge gone wrong.
2009-11-09 19:31:32 -05:00
Eratosthenes
5021cae297
Clean up logging changes.
2009-11-09 19:30:23 -05:00
Eratosthenes
b637247871
Fix for logging changes.
2009-11-09 19:24:46 -05:00
sqlcoder
9bbca552ea
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-09 20:44:05 +00:00
Eratosthenes
c8b7608bc1
Delete intermediate prints. Small fix to make py2exe happy.
2009-11-08 23:16:56 -05:00
Eratosthenes
e6b71d86bb
Should be HUD_config.xml.example, not HUD_config.xml
2009-11-08 23:00:15 -05:00
Eratosthenes
0bbbc7222b
First go at rationalizing config paths and logging defaults.
2009-11-08 22:53:10 -05:00
Eratosthenes
b33fd03754
Added Configuration.py exe and HowTo use.
2009-11-08 22:51:15 -05:00
Eratosthenes
efb0768b97
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/SQL.py
2009-11-08 22:50:47 -05:00
grindi
dbaf4dbdbc
Make msgs about parse errors more verbose
...
+ fix small bug in FpdbParseError
2009-11-07 22:01:30 +03:00
grindi
9dd600702a
Moved window title re to HHC classes
...
Just redefine function getTableTitleRe in coresponding hhc for custom re
2009-11-07 20:30:47 +03:00
grindi
f99c4baa8b
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-11-07 15:35:21 +03:00
Worros
15ea852d76
Extend the tablename field in sql to 22 characters
2009-11-07 10:17:28 +08:00
Eratosthenes
99e4211e5d
Integrate new table handling code.
2009-11-06 17:34:42 -05:00
grindi
fd085ecb4d
Fixed another aux bug
2009-11-07 00:46:50 +03:00
grindi
c4d3789657
Fixed: aux save layout doesn't work
...
Bug maker, look at
http://docs.python.org/tutorial/classes.html#generator-expressions
(...for...) returns generator rather than tuple
2009-11-06 23:47:31 +03:00
Worros
5c7cce090e
[NEWIMPORT] Added street0VPI to HandsPlayers
...
Also fixed last patch for streetXSeen
2009-11-06 19:30:50 +08:00
Worros
006d7164ea
[NEWIMPORT] Insert streetXSeen col into HandsPlayers
2009-11-06 19:13:52 +08:00
Worros
5aef7b6054
[NEWIMPORT] Insert winnings column into HandsPlayers
2009-11-06 18:39:59 +08:00
Eratosthenes
2d890be3c8
Get the tableName right for tournaments.
2009-11-05 11:27:33 -05:00
Worros
bea6bf2d6b
Merge branch 'master' of git://git.assembla.com/fpdb-mme
...
Conflicts:
pyfpdb/Configuration.py
2009-11-05 12:22:05 +08:00
Worros
5d6138e2a8
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-11-05 12:16:32 +08:00
fpdb-mme
4a6213e32e
now sample code it works as expected
...
grrr, soewhere down the line the exception got swallowed. this is evil!!!
-x must die
2009-11-05 01:26:32 +01:00
fpdb-mme
2199d165f1
removed unconditional exception handling + kwarg max should be int
2009-11-05 01:21:32 +01:00
fpdb-mme
14200c5a50
simplified code a bit
2009-11-05 00:39:42 +01:00
fpdb-mme
7a602846ff
combed over Config.get_tv_parameters()
...
there was a bit much of unconditional exception handling
note: some parts of the application call Config.get_tv_parameters()
but afaics the actual parameters are never used anywhere. so maybe
its leftover code. someone drop a note if or not to remove tv related
stuff
2009-11-05 00:34:02 +01:00
fpdb-mme
5a8f794057
simplified Config.get_supported_sites()
2009-11-05 00:11:43 +01:00
fpdb-mme
7e8ed08a28
simplified Config.get_aux_windows()
2009-11-04 23:58:48 +01:00
fpdb-mme
5c656625fd
combed a bit over Config.get_default_font()
2009-11-04 23:41:09 +01:00
fpdb-mme
efefae4941
fix: db_type is actually db_server
2009-11-04 19:01:12 +01:00
fpdb-mme
c60dfda64c
put in former logging setup again, removed excepthook
2009-11-04 18:58:01 +01:00
fpdb-mme
6d54da1c49
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/Configuration.py
pyfpdb/SQL.py
note:hopefully got the merge right
2009-11-04 18:34:28 +01:00
unknown
ab1c37ead2
IndexError -> KeyError .. doh.
2009-11-04 10:46:36 -05:00
unknown
98981059cd
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-11-04 02:58:13 -05:00
Worros
cc89433ba8
Merge branch 'master' of git://git.assembla.com/fpdb-eric
...
Conflicts:
pyfpdb/Configuration.py
2009-11-04 14:44:25 +08:00
Eratosthenes
3265766c77
Cleanup of HUD_main prior to integrating newTables code.
2009-11-03 21:52:40 -05:00
Eratosthenes
0a563cad53
Added get_table_info method.
2009-11-03 21:51:10 -05:00
unknown
51da6fb687
cleaner
2009-11-03 15:29:05 -05:00
unknown
a5de7c9b6b
cleanup
2009-11-03 15:14:20 -05:00
unknown
d008eceaef
mostly formatting cleanups
2009-11-03 15:06:48 -05:00