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

Merge branch 'eric'

Browse Source
This commit is contained in:
steffen123 2010-08-08 20:13:07 +02:00
commit 6ac8f410f6
4 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pyfpdb/HUD_config.xml.example
View File

@ -252,48 +252,45 @@ Left-Drag to Move"
</layout> </layout>
</site> </site>
<site enabled="False" <site HH_path="C:\Users\WindowsUserName\Documents\EverleafSiteName\HandHistory\PlayerName"
site_name="Everleaf" bgcolor="#000000"
table_finder="Everleaf.exe"
screen_name="YOUR SCREEN NAME HERE"
site_path=""
HH_path=""
decoder="everleaf_decode_table"
converter="EverleafToFpdb" converter="EverleafToFpdb"
supported_games="holdem"> decoder="everleaf_decode_table"
<layout fav_seat="0" height="547" max="8" width="794"> enabled="False"
<location seat="1" x="640" y="64"> </location> fgcolor="#EEEEEE"
<location seat="2" x="650" y="230"> </location> hudopacity="0.75"
<location seat="3" x="650" y="385"> </location> screen_name="PlayerName"
<location seat="4" x="588" y="425"> </location> site_name="Everleaf"
<location seat="5" x="92" y="425"> </location> site_path="C:\Users\WindowsUserName\AppData\Roaming\EverleafSiteName\"
<location seat="6" x="0" y="373"> </location> supported_games="holdem,omahahi,omahahilo"
<location seat="7" x="0" y="223"> </location> table_finder="Poker.exe">
<location seat="8" x="25" y="50"> </location> <layout fav_seat="0" height="546" max="6" width="792">
<location seat="0" x="0" y="0"> </location>
<location seat="1" x="586" y="109"> </location>
<location seat="2" x="605" y="283"> </location>
<location seat="3" x="544" y="383"> </location>
<location seat="4" x="67" y="383"> </location>
<location seat="5" x="5" y="284"> </location>
<location seat="6" x="61" y="111"> </location>
</layout> </layout>
<layout fav_seat="0" height="547" max="6" width="794"> <layout fav_seat="0" height="546" max="10" width="792">
<location seat="1" x="640" y="58"> </location> <location seat="0" x="182" y="69"> </location>
<location seat="2" x="654" y="288"> </location> <location seat="1" x="456" y="74"> </location>
<location seat="3" x="615" y="424"> </location> <location seat="2" x="630" y="81"> </location>
<location seat="4" x="70" y="421"> </location> <location seat="3" x="637" y="208"> </location>
<location seat="5" x="0" y="280"> </location> <location seat="4" x="629" y="347"> </location>
<location seat="6" x="70" y="58"> </location> <location seat="5" x="412" y="377"> </location>
<location seat="6" x="232" y="377"> </location>
<location seat="7" x="21" y="349"> </location>
<location seat="8" x="4" y="208"> </location>
<location seat="9" x="7" y="88"> </location>
<location seat="10" x="196" y="69"> </location>
</layout> </layout>
<layout fav_seat="0" height="547" max="2" width="794"> <layout fav_seat="0" height="546" max="2" width="792">
<location seat="1" x="651" y="288"> </location> <location seat="1" x="651" y="288"> </location>
<location seat="2" x="10" y="288"> </location> <location seat="2" x="10" y="288"> </location>
</layout> </layout>
<layout fav_seat="0" height="547" max="9" width="794">
<location seat="1" x="634" y="38"> </location>
<location seat="2" x="667" y="184"> </location>
<location seat="3" x="667" y="321"> </location>
<location seat="4" x="667" y="445"> </location>
<location seat="5" x="337" y="459"> </location>
<location seat="6" x="0" y="400"> </location>
<location seat="7" x="0" y="322"> </location>
<location seat="8" x="0" y="181"> </location>
<location seat="9" x="70" y="53"> </location>
</layout>
</site> </site>
<site enabled="False" <site enabled="False"
@ -589,6 +586,8 @@ Left-Drag to Move"
<pu_stat pu_stat_name="playername"> </pu_stat> <pu_stat pu_stat_name="playername"> </pu_stat>
<pu_stat pu_stat_name="totalprofit"> </pu_stat> <pu_stat pu_stat_name="totalprofit"> </pu_stat>
<pu_stat pu_stat_name="profit100"> </pu_stat> <pu_stat pu_stat_name="profit100"> </pu_stat>
<pu_stat pu_stat_name="bbper100"> </pu_stat>
<pu_stat pu_stat_name="BBper100"> </pu_stat>
<pu_stat pu_stat_name="n"> </pu_stat> <pu_stat pu_stat_name="n"> </pu_stat>
<pu_stat pu_stat_name="vpip"> </pu_stat> <pu_stat pu_stat_name="vpip"> </pu_stat>
<pu_stat pu_stat_name="pfr"> </pu_stat> <pu_stat pu_stat_name="pfr"> </pu_stat>

8
pyfpdb/Hand.py
View File

@ -683,9 +683,15 @@ class HoldemOmahaHand(Hand):
hhc.readPlayerStacks(self) hhc.readPlayerStacks(self)
hhc.compilePlayerRegexs(self) hhc.compilePlayerRegexs(self)
hhc.markStreets(self) hhc.markStreets(self)
if self.cancelled: if self.cancelled:
return return
hhc.readBlinds(self)
try: hhc.readBlinds(self)
except:
print "*** Parse error reading blinds (check compilePlayerRegexs as a likely culprit)", self
return
hhc.readAntes(self) hhc.readAntes(self)
hhc.readButton(self) hhc.readButton(self)
hhc.readHeroCards(self) hhc.readHeroCards(self)

1
pyfpdb/HandHistoryConverter.py
View File

@ -441,6 +441,7 @@ or None if we fail to get the info """
pass pass
else: else:
print "unable to read file with any codec in list!", self.in_path print "unable to read file with any codec in list!", self.in_path
self.obs = ""
elif self.filetype == "xml": elif self.filetype == "xml":
doc = xml.dom.minidom.parse(filename) doc = xml.dom.minidom.parse(filename)
self.doc = doc self.doc = doc

8
pyfpdb/Stats.py
View File

@ -770,10 +770,10 @@ def ffreq1(stat_dict, player):
) )
except: except:
return (stat, return (stat,
'%3.1f' % (0) + '%', 'NA',
'ff1=%3.1f' % (0) + '%', 'ff1=NA',
'ff_1=%3.1f' % (0) + '%', 'ff_1=NA',
'(%d/%d)' % (0, 0), '(0/0)',
'% fold frequency flop/4th' '% fold frequency flop/4th'
) )