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
Eratosthenes
c1f599d555
Merge branch 'master' of git://git.assembla.com/fpdboz
...
Conflicts:
pyfpdb/Configuration.py
pyfpdb/HUD_main.py
2009-11-23 19:41:47 -05:00
Eratosthenes
ad91c0a526
Changes for logging.
2009-11-23 19:34:40 -05:00
Eratosthenes
bdc3248597
Changes for new logging scheme.
2009-11-23 19:32:19 -05:00
Eratosthenes
2da6e44a75
Changes for improved logging.
2009-11-23 19:29:56 -05: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
e10db69a9c
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-16 19:49:12 -05: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
d888b7d463
Party hhc: cleand, added getTableTitleRe
2009-11-08 23:09:14 +03: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
unknown
0759ded78f
fix typo
2009-11-03 14:43:12 -05:00
unknown
a6b7292943
mostly None checkings fixed (== to is != to is not)
2009-11-03 14:30:52 -05:00
unknown
7667a39ded
cleanup
2009-11-03 14:04:22 -05:00
unknown
6bf1824ee7
clarify where some logged or printed messages were coming from exactly
2009-11-03 13:56:26 -05:00
unknown
0e6254ce0d
basic cleanup
2009-11-03 13:49:16 -05:00
fpdb-mme
9063d9749c
removed all occurences of db_type/db-type
2009-11-03 19:18:51 +01:00
unknown
9ec1eb48e1
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-11-03 11:08:57 -05:00
fpdb-mme
92f98e9f51
added an application wide exception handler
2009-11-03 16:09:58 +01:00
fpdb-mme
944d48d7ef
refactored logging setup
...
removed fallback to '/usr/share/python-fpdb/logging.conf' if
'logging.conf' could not be found in the current directory.
1. this looked redundant, 2. usually only root has write access
to /usr/share/*
ok or not?
2009-11-03 15:35:20 +01:00
fpdb-mme
50bafadcb1
we throw an exception now if the user supplies an unsupported database backend
...
note: checked all refences. i think we can raise savely without breaking stuff. it is only
used in Database.py on get_backend_name(), raising an exception anyways if the backend
is unknown
2009-11-03 15:17:48 +01:00
fpdb-mme
62c915928d
- added a global const to config to point to "database" directory
...
- adjusted fpdb_db.py to make use use of this const
2009-11-03 10:50:13 +01:00
Worros
f276ad4dfa
Merge branch 'master' of git://git.assembla.com/fpdb-mme
...
Conflicts:
pyfpdb/Configuration.py
2009-11-03 17:25:54 +08:00
sqlcoder
c02e6365e7
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-11-02 20:52:55 +00:00
fpdb-mme
a18091161a
added a note and some thoughts for review
2009-11-02 10:29:10 +01:00
unknown
2589d2ecd3
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-11-02 04:28:24 -05:00
Worros
28ca49d592
Fix GuiSessionStats.py for sqlite
...
Fix based on solution from Eleatic Stranger on 2+2
2009-11-02 17:23:50 +08:00
fpdb-mme
9e94f44fa7
started defining some application wide consts. these consts (more to come
...
if my approach is accepted) are used all over the fpdb and should always be
taken from one place
2009-11-02 10:06:54 +01:00
fpdb-mme
34bbc45cb8
whitespace
2009-11-02 09:55:08 +01:00
fpdb-mme
fb76540df6
added a TODO:
...
if the user may passes '' (empty string) as database name via command line, his choice is ignored
when we parse the xml we allow for ''. there has to be a decission if to allow '' or not
2009-11-02 09:54:16 +01:00
fpdb-mme
d3eeeef2e8
fpdb can not handle the case where no database is defined in xml, so throw a ValueError for now
2009-11-02 09:45:53 +01:00
fpdb-mme
612d6607a1
fix: FpdbError is not defined, use ValueError instead
2009-11-02 09:40:16 +01:00
fpdb-mme
3a7d159d52
sorry, whitespace was messed up, have to find a better way to convert
2009-11-02 09:38:27 +01:00
fpdb-mme
8f2a2c20cc
tried my best to write a clearer comment + simplified finding out of what the selected database is
2009-11-02 09:29:58 +01:00
fpdb-mme
cb16dde365
typo
2009-11-02 09:16:18 +01:00
fpdb-mme
10343c0ef4
fixed Database.db_selected attribute. it was always be boolean True if the attribute was not set in the <database> tag
...
+ it is more readable using keyword arguments explicitely
2009-11-02 09:14:57 +01:00
fpdb-mme
75b8c4943a
rewrote fix_tf() helper function to string_to_bool(). this represents better is what it actually does.
...
comments stated that the function was some kind of fix for xml.dom, but XML is unaware
of python types by intention ;-)
2009-11-02 09:09:23 +01:00
fpdb-mme
d59f1eb720
added a comment what Config.supported_databases holds for readability
2009-11-02 08:52:46 +01:00
fpdb-mme
d9a120a2c6
removed superfluous try ..except clause. Database.__init__() was not doing any sanity checks,
...
so the try ..except clause was only covering exceptions we are actually interested in
2009-11-02 08:48:07 +01:00
fpdb-mme
01b56919ca
we take all <database> tags from xml instead of taking all <database> tags contained in <supported_databases>
...
added a note on this
2009-11-02 08:40:34 +01:00
fpdb-mme
62ee67c071
under certain circumstances attribute Config.db_selected could end up being undefined.
...
this could cause later code relying on it failing in strange ways.
2009-11-02 08:30:24 +01:00
Worros
f4aa5f1fe1
First fix for sqlite in PlayerStats
...
Fix courtesy of Eleatic Stranger on 2+2 - Page still does not work, need to find an sqlite equivalent to to_char() and variance()
2009-11-02 13:38:36 +08:00
fpdb-mme
0225987826
added basic support to add databases present in *.xml to our manager
...
notes:
- i dont do too much error checking on input, guess this should be done in Configuration.py
2009-11-01 20:07:41 +01:00
fpdb-mme
f5d2f5a2dc
fix: according to doctests os_independend_kill() is supposed to return None
2009-11-01 09:58:14 +01:00
fpdb-mme
6fcf81e566
bugfix: InterProcessLock.locked() was broken cause InterProcessLock.aquire() no longer raises SingleInstanceError
...
- fixed InterProcessLock.locked()
- fixed doctests
notes:
- doctests run ok on linux with InterProcessLockFcntl and InterprocessLockSocket
- doctests fail on linux/wine with InterprocessLockWin32 when trying to aquire the lock held by the process created on the fly.
just a guess ..maybe the mutex is not released automatically when terminating the process. does native win32 guarantee
this?
2009-11-01 09:51:00 +01:00
fpdb-mme
bcbafc160d
millions of changes, highlights:
...
- started validating user input on create/add database
- implemented fuctionality to create sqlite databases
- never worked with sqlite,, you can not create multiple dbs in one file, so removed db attr again
- a nice todo list
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-11-01 07:36:18 +01:00
unknown
cb0c7430e6
add comment at point in Configuration where we would need to add support for saving new table layouts.
2009-11-01 01:54:59 -04:00
unknown
cdc310dcb6
if HUD is told to create for a layout that doesn't exist in the config file, it will pick a 9 or 10 max layout and use it's positions, which you can then move the windows around, and save, and it should be saved in the right spot.
2009-11-01 01:23:07 -04:00
unknown
64ee502239
here's the HHC patch i forgot to add on last commit
2009-10-31 21:25:27 -04:00
unknown
868a0b5bf0
getting stud tourney to not crash import:
...
fix call to storeHudCache in Database to use handStartTime rather than the undefined hand_start_time; stub out store_hands_players_stud_tourney as it looks like it was never updated to use current database setup. result: hud works, no longer crashes import, presumably does not store any hand info though.
HHC base guessMaxSeats returns existing value of maxseats if some prior code has set it somewhere already
2009-10-31 21:25:13 -04:00
unknown
2bb35fc802
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-10-31 20:19:19 -04:00
unknown
a944ba7cd3
comments edit
2009-10-31 20:06:16 -04:00
grindi
97d2052cbe
Party hhc tiny fixes
2009-10-31 17:53:31 +03:00
grindi
5e6899a29e
Print out actual exception when import fails. Python 2.5 compatible
2009-10-31 17:48:48 +03:00
grindi
19b46e8444
Revert "Revert "Print out actual exception when import fails""
...
This reverts commit ce0e2c139b
.
2009-10-31 17:46:11 +03:00
grindi
066cf12eb6
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-31 17:44:28 +03:00
fpdb-mme
2ae58f8947
databases can now be activated by user
...
++ refactoring
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-10-31 12:12:17 +01:00
Worros
d5604e0e73
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-10-31 08:57:04 +08:00
Worros
ae7e721ede
Merge branch 'master' of git://git.assembla.com/fpdb-mme
2009-10-31 08:56:36 +08:00
Worros
ce0e2c139b
Revert "Print out actual exception when import fails"
...
This reverts commit 626ff49eb4
.
Turns out this commit is python 2.6 syntax
2009-10-31 08:55:54 +08:00
fpdb-mme
604395b868
bit of refactoring + sqlite needs database too
...
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-10-30 16:48:51 +01:00
fpdb-mme
a3a72712ac
again, many many changes + still ugly code
...
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-10-30 14:23:27 +01:00
Worros
c56f9c28fd
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2009-10-30 14:37:05 +08:00
Worros
3f09bf3d65
Merge branch 'master' of git://git.assembla.com/fpdb-mme
2009-10-30 14:36:42 +08:00
Worros
636727ebb6
Start of Partouche support, shift NEWIMPORT functions
2009-10-30 14:35:45 +08:00
fpdb-mme
2a878d0a83
many changes
...
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-10-29 19:32:41 +01:00
grindi
d05f0480a4
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-10-29 11:49:52 +03:00
grindi
faa95ca26e
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-29 11:49:09 +03:00
Worros
a872769b2b
Fix cli to Everleaf
2009-10-29 16:37:33 +08:00
Worros
626ff49eb4
Print out actual exception when import fails
2009-10-29 13:17:17 +08:00
Worros
d80360b3bb
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-10-29 12:28:48 +08:00
Ray
645be07667
Make DS.py friendlier to stud and draw.
2009-10-28 22:00:05 -04:00
unknown
02e8154710
remove error trap on read_stdin() - please fix bugs instead of relying on error trap
...
some reformatting in Tables.py, as well as some new debug prints to deal with some potential issues. Add code to deal with potential problems in Win x64, that are biting me at random. Not finished, but the problems stopped happening so can't continue.
2009-10-28 19:53:31 -04:00
unknown
37af499bc6
Merge branch 'master' of git://git.assembla.com/fpdb-sql.git
2009-10-28 17:41:35 -04:00
unknown
83051d1f4a
Merge branch 'master' of git://git.assembla.com/free_poker_tools.git
2009-10-28 17:41:27 -04:00
unknown
dcbc7d7203
fix format of line
2009-10-28 17:40:25 -04:00
sqlcoder
16eb0b1e1f
small changes for sqlite
2009-10-28 20:12:03 +00:00
grindi
c7410d6fc8
Fix config's default values for hud colors
...
00000 -> #000000
FFFFF -> #FFFFFF
2009-10-28 19:03:04 +03:00
grindi
5a972ad292
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-10-28 18:48:46 +03:00
grindi
65e1e33c88
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-28 18:48:35 +03:00
grindi
e18a1f2f93
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-28 18:48:20 +03:00
Worros
159c39245f
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2009-10-28 10:14:19 +08:00
Mika Bostrom
677ec5551c
Merge branch 'master' into good
2009-10-27 19:48:00 +02:00
Mika Bostrom
9886b61840
Tray icon click toggles window visibility
...
Many of the tools that place an icon in systray allow to toggle the
application visibility by left-clicking on the icon. Why not follow
suit?
2009-10-27 19:45:52 +02:00
Worros
57f05ba2fb
Merge branch 'master' of git://git.assembla.com/fpdb-mme
2009-10-28 00:21:13 +08:00
Worros
6cb16df055
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-10-28 00:20:44 +08:00
Ray
e829ec56ef
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-27 11:43:55 -04:00
unknown
269bc0b7a3
Merge branch 'master' of git://git.assembla.com/fpdboz.git
2009-10-27 11:05:31 -04:00
unknown
7bd7b5b053
add todo to remind me
2009-10-27 11:01:45 -04:00
Mika Bostrom
fe53e8c8a7
Merge branch 'master' into good
2009-10-27 15:28:40 +02:00
Mika Bostrom
15980877dd
Typofix in status icon load
2009-10-27 15:28:11 +02:00
Mika Bostrom
e25e4cf9b3
Use custom tray icon instead of GTK stock
...
Use the "Anonymous Cards" image from openclipart.org
(http://openclipart.org/media/files/Anonymous/12230 )
This same image is used in other new FPDB icons, but the combinations
with looking-glass don't look good in systray. This icon is plain enough
to work properly even when scaled really small.
2009-10-27 15:24:49 +02:00
fpdb-mme
e732b74956
too many changes to remember
...
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-10-27 11:04:24 +01:00
sqlcoder
998c80b7d0
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-27 08:45:58 +00:00
fpdb-mme
30103c5cb2
second try...
...
Signed-off-by: fpdb-mme <jUrner@arcor.de>
2009-10-27 09:01:06 +01:00
Mika Bostrom
879506cee4
Merge branch 'master' into good
2009-10-27 06:26:25 +02:00
Mika Bostrom
cba416e27a
Merge branch 'master' of git://git.assembla.com/free_poker_tools
2009-10-27 06:26:04 +02:00
Mika Bostrom
ca8182c37d
Merge branch 'master' into good
2009-10-27 06:08:19 +02:00
Mika Bostrom
fcaa1030b6
Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql
2009-10-27 05:53:47 +02:00
Worros
9144c7ae68
Revert "Merge branch 'master' of git://git.assembla.com/fpdb-mme"
...
This reverts commit 1f07fa9a14
.
2009-10-27 11:28:27 +08:00
sqlcoder
d2cf8e9bc9
attempt at making system tray icon go away when quitting
2009-10-26 22:26:22 +00:00
sqlcoder
fabec1604a
stop warnings when importing from fpdb.py
2009-10-26 21:59:41 +00:00
sqlcoder
6b280d7db9
stop warning message from set_cell_data_func
2009-10-26 21:38:04 +00:00
sqlcoder
da64e336d7
allow sorts on both grids
2009-10-26 21:12:57 +00:00
Ray
0ac559a2db
Add a comment to a comment.
2009-10-26 16:50:17 -04:00
Ray
fd31ecc0bf
Minor problem with rogue merge info in HHC.py.
2009-10-26 11:19:44 -04:00
Mika Bostrom
7b6581de7d
Merge branch 'master' into good
2009-10-26 17:09:06 +02:00
Worros
6b7b46754c
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2009-10-26 23:00:08 +08:00
Mika Bostrom
35b24fa002
Remove a stray conflict marker
2009-10-26 16:53:18 +02:00
Ray
14115b759e
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-10-26 10:10:05 -04:00
Ray
9d42b46459
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-26 10:09:57 -04:00
Mika Bostrom
27fa27f370
GTK signal handlers need to return True/False
...
Since we deal with minimize/expose/show/hide routines ourselves, we
don't want these signals passed any further.
NOTE: if no return type is specified, it is automatically None which
usually is translated to False. That might trigger some weird behaviour,
up to and including rare and hard to reproduce GTK crashes.
2009-10-26 13:29:32 +02:00
Mika Bostrom
bb6b2ab9a2
Fix session timestamp range
...
PostgreSQL does automatic argument conversion/formatting when dealing
with timestamps. This simplification allows the session stats to be
generated with PostgreSQL as db backend.
2009-10-26 12:55:23 +02:00
Mika Bostrom
73262e808c
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-26 12:18:37 +02:00
Mika Bostrom
70426a70a0
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-10-26 12:12:56 +02:00
Worros
9360bd6894
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-26 17:27:29 +08:00
unknown
22b3d5de7f
should minimize to tray in windows. windows 7's tray doesn't like it much, but it'll get over it for now
2009-10-26 05:03:25 -04:00
Worros
115c44e7b1
Move session stats query into SQL.py
2009-10-26 16:39:37 +08:00
sqlcoder
a87bcbb43a
allow sort on all cols, tidy up some more details
2009-10-26 08:38:45 +00:00
Worros
e0c193b77d
Merge branch 'master' of git://git.assembla.com/fpdb-eric
2009-10-26 14:41:11 +08:00
Worros
1f07fa9a14
Merge branch 'master' of git://git.assembla.com/fpdb-mme
...
Conflicts:
docs/tabledesign.html
pyfpdb/CarbonToFpdb.py
pyfpdb/Configuration.py
pyfpdb/Database.py
pyfpdb/EverleafToFpdb.py
pyfpdb/FpdbSQLQueries.py
pyfpdb/GuiAutoImport.py
pyfpdb/GuiBulkImport.py
pyfpdb/GuiGraphViewer.py
pyfpdb/GuiPlayerStats.py
pyfpdb/GuiTableViewer.py
pyfpdb/HUD_config.xml.example
pyfpdb/HUD_main.py
pyfpdb/HandHistoryConverter.py
pyfpdb/Hud.py
pyfpdb/Mucked.py
pyfpdb/SQL.py
pyfpdb/Stats.py
pyfpdb/Tables.py
pyfpdb/fpdb.py
pyfpdb/fpdb_db.py
pyfpdb/fpdb_import.py
pyfpdb/fpdb_parse_logic.py
pyfpdb/fpdb_simple.py
pyfpdb/upd_indexes.sql
2009-10-26 14:40:11 +08:00
unknown
f15bb627c0
add trayicon, minimize to tray by default (doesn't work quite right on windows)
2009-10-26 01:36:29 -04:00
Worros
71eb683a3d
Make cash cols sortable.
...
After sqlcoders effort this appears to work
2009-10-26 12:16:20 +08:00
sqlcoder
69b3c5a339
improve sorting but still not quite working right
2009-10-26 00:33:33 +00:00
Mika Bostrom
1dda03fda0
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-25 21:40:55 +02:00
Worros
0b049a128b
Make green in PlayerStats darker
2009-10-25 20:51:46 +08:00
Worros
73e8544117
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-25 20:49:39 +08:00
unknown
0a084d1110
remove try..finally block in HUD_update idle_func function, move return to after the threads_leave() call, HUD now works in Win 7
2009-10-25 08:27:55 -04:00
unknown
3b54fab9e0
remove the exception handler in kill_hud() i think sqlcoder put it in - it doesn't help because the exception isn't a python exception, it's a GTK exception. (looks like a bug in GTK.. not that they'll ever acknowledge anything)
2009-10-25 07:34:07 -04:00
grindi
aff69287ff
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-25 14:23:08 +03:00
grindi
b4200f9f51
Tiny fix
2009-10-25 14:22:49 +03:00
fpdb-mme
1efdd7fc68
add DatabaseManager
2009-10-25 10:22:06 +01:00
fpdb-mme
0b0312d1ee
Signed-off-by: fpdb-mme <jUrner@arcor.de>
...
initial commit
2009-10-25 00:13:35 +02:00
sqlcoder
b1d65dbadd
default all values in hud_params when not passed into get_stats_from_hand
2009-10-24 20:01:24 +01:00
sqlcoder
d39a34686e
tidy up main() output
2009-10-24 12:41:51 +01:00
sqlcoder
11f50765c9
fix main
2009-10-24 12:16:26 +01:00
Worros
914f930c5b
GuiSessionViewer update.
...
Getting closer - added player and date tests. Not convinced the data coming back is koshur though - got a $3600 day in the middle of my data
2009-10-23 15:01:02 +08:00
Worros
a2309f704c
More GuiSessionViewer updates
...
Getting closer to a decent layout
2009-10-23 13:50:06 +08:00
Worros
397f654789
GuiSession viewer update.
...
Still broken, got the math right in preparation for candlestick graph
2009-10-22 14:09:36 +08:00
Mika Bostrom
6ec309a685
Provide extra path for mucked cards image
...
Modified:
* Mucked.py
When running from outside source tree, the image containing mucked
cards' faces could not be loaded. Provide an extra path to load from.
2009-10-22 08:44:45 +03:00
Mika Bostrom
616c07a4eb
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-21 20:29:44 +03:00
Mika Bostrom
b8f19741e0
Fix packaging issues
...
Affected files:
* Configuration.py
* Database.py
* HandHistoryConverter.py
* fpdb_import.py
and setup.py to a lesser extent.
Logging requires a configuration file when initialising the class. If we
are executing from outside the source tree, this file is not present.
Catch config parser's error and try to provide the logging config file
from debian package path.
Update symlink target to match python-support from latest Debian and the
oncoming Ubuntu versions.
2009-10-21 20:24:46 +03:00
Worros
58707d2022
Update GuiSessionViewer.
...
Still horribly broken, but on its way
2009-10-21 17:22:47 +08:00
Worros
4f754fa881
Add some prep work for sorting the stats page
2009-10-20 12:06:29 +08:00
Worros
b39f766941
Color cash columns in red and green
2009-10-19 19:39:46 +08:00
sqlcoder
6a029ccfa7
comment out debug statement
2009-10-19 00:36:31 +01:00
sqlcoder
2c7a853b3f
keep heading on screen when scrolling stats windows
2009-10-19 00:36:08 +01:00
sqlcoder
35cc1b1314
fix mysql code for new stats options
2009-10-19 00:15:11 +01:00
sqlcoder
4b7aadd325
fix starting hand order
2009-10-18 23:19:26 +01:00
sqlcoder
c1a998b7d8
add all player (and min hands) ability to stats window
2009-10-18 22:56:10 +01:00
sqlcoder
6453154ef6
prepare for all players display
2009-10-18 17:18:07 +01:00
sqlcoder
0ccc204c89
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-18 12:19:42 +01:00
sqlcoder
5beb033547
debug session stats
2009-10-18 12:19:22 +01:00
Worros
cfc854ab50
Fix some bugs in BetfairToFpdb.
...
As reported by tchaz on 2+2:
http://forumserver.twoplustwo.com/showpost.php?p=13870274&postcount=1960
Using the only sample file I have for Betfair, it appears there is still and accounting error
2009-10-18 07:56:34 +08:00
Worros
639036871b
HUD_config.xml.example update
...
Added Betfair to default config - copied Party.
Also went through and cleaned up whitespace in that file at the same time - tabs to spaces, cleaned trailing spaces.
2009-10-18 07:54:41 +08:00
sqlcoder
7bd388613d
Merge branch 'master' of git://git.assembla.com/fpdboz
2009-10-15 23:02:57 +01:00
sqlcoder
ac50cf85ca
update comments on aggregation
2009-10-15 23:02:50 +01:00
Worros
ceaa78bdc8
Add usage message to GuiBulkImport cli
...
I keep forgetting the format for Full Tilt cli import
2009-10-15 15:23:47 +08:00
Worros
c3bc165a90
Add comment to DerivedStats
2009-10-15 15:13:09 +08:00
Worros
7a9237b707
GuiBulkImport - make cli version print out import stats
2009-10-15 15:12:08 +08:00
Worros
2e2531c0e4
Merge branch 'master' of git://repo.or.cz/fpbd-bostik
2009-10-15 14:55:21 +08:00
Mika Bostrom
019440a71b
Merge branch 'master' into good
...
Conflicts:
pyfpdb/Configuration.py
pyfpdb/HUD_config.xml.example
2009-10-15 09:06:31 +03:00
Worros
2d9b92af90
Make GuiBulkImport allow multi-file select
2009-10-15 11:57:42 +08:00
Mika Bostrom
54d309f797
Minor fixes to hud setup code
2009-10-14 19:33:19 +03:00
Worros
16d1f43c7e
[NEWIMPORT] HandsPlayers.streetXAggr insert.
2009-10-14 23:55:51 +08:00
Mika Bostrom
a232a94eb1
Try to make hud more configurable
...
Modified files:
* Configuration.py
* HUD_config.xml.example
* HUD_main.py
Instead of tweaking aggregation settings directly in code, make the
values configurable through HUD_config.xml; use the newly created
<hud_ui> element for this. Retain coding convention and key-value
names as they are.
2009-10-14 16:04:09 +03:00
Worros
7b2c1fa243
[NEWIMPORT] Minor update, use DerivedStats.getStats()
2009-10-14 20:28:07 +08:00
Worros
2350474d38
[NEWIMPORT] Start of HandsPlayers insert
2009-10-14 20:20:17 +08:00
Worros
f0f2bcda14
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-14 12:06:01 +08:00
Worros
1fc015b09f
[NEWIMPORT] Move db insert into SQL.py (store_hand)
2009-10-14 12:05:17 +08:00
sqlcoder
4d92e3d2a0
update graph viewer to work with enhanced filter
2009-10-13 23:06:09 +01:00
sqlcoder
4b0a399ffd
stop fpdb.py accessing fpdb_db directly
2009-10-13 21:53:51 +01:00
sqlcoder
785e3d63a2
add 'is db running' printed message when pg db connect fails
2009-10-13 21:52:13 +01:00
Worros
843bd754f6
[NEWIMPORT] Prep insert functions
...
Cleaned up storeHandsPlayers and added storeHudCacheNew
Haven't decided on the data structures to be passed in as yet so the functions only insert the bare minimum and have a list of commented out variables
2009-10-13 17:42:02 +08:00
Worros
4d04a4b1db
[NEWIMPORT] Take a copy of generateHudCache for DerivedStats
...
Commented out, should give a good basis for generating the stats from Hand class
2009-10-13 17:30:49 +08:00
Worros
f4887235a0
[NEWIMPORT] Fix Hand import so it runs
...
Also comment out some debug
2009-10-13 15:58:05 +08:00
Worros
00a8593631
Fix table re-create bug in fillDefaultData
2009-10-13 14:12:25 +08:00
Worros
1d0177f6d4
[NEWIMPORT] Finish up Hand import
...
Decided to leave streetXRaisesN alone for the moment
2009-10-13 14:04:19 +08:00
Worros
e7a7229dc0
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-13 13:22:08 +08:00
sqlcoder
aaba84de19
Add ring/tourney radio button to filter
2009-10-12 23:02:20 +01:00
Worros
035b71b018
Merge branch 'master' of git://git.assembla.com/fpdb-sql
2009-10-12 10:20:22 +08:00
sqlcoder
181294ddf4
tidy up Filters and PlayerStats layout a bit
2009-10-11 23:36:26 +01:00
sqlcoder
b14fd2553c
add some debug for session stats - I think there is a bug in here somewhere that makes it include too many hands sometimes ...
2009-10-11 23:34:05 +01:00
sqlcoder
b8be20f551
show nl and fl limits separately in filter
2009-10-11 22:44:52 +01:00
Eric Blade
d4cbed121d
fix indentation errors
2009-10-09 07:39:05 -04:00
Eric Blade
8eeac34fce
Merge branch 'master' of git://git.assembla.com/fpdb-sql.git
2009-10-09 07:35:12 -04:00
Eric Blade
05ccca63ad
Merge branch 'master' of git://git.assembla.com/fpdboz.git
...
Conflicts:
pyfpdb/fpdb.py
2009-10-09 07:34:13 -04:00
Eric Blade
ee864033ee
Add exception for not being able to connect to MySQL, make use of it to pop up an error box
2009-10-09 07:31:25 -04:00
Worros
6d0ec5d831
[NEWIMPORT] Add playersAtStreetX to insert
2009-10-08 18:13:13 +08:00
Worros
cf6c3c8ad0
[NEWIMPOR] Fix playersVpi from last patch
...
Oops - forgot to add the argument
2009-10-08 18:07:54 +08:00
Worros
31f48c4932
[NEWIMPORT] Calculate playersAtStreetX
...
Untested code.
Still missing playersAtShowdown, haven't looked to see if hand.actionStreets contains showdown.
2009-10-08 18:01:49 +08:00
sqlcoder
7d708a327c
try to fix aggBBmultItemAll error
2009-10-07 23:45:59 +01:00
Worros
024618235f
Clean up variables in DerivedStats
...
Doesn't look like they are going to be used like that
2009-10-07 14:15:12 +08:00