Merge branch 'carl'
This commit is contained in:
		
						commit
						ccb975d8e0
					
				|  | @ -534,6 +534,37 @@ class GUICashStats(list): | |||
| 
 | ||||
|                 self.append( [col_name, col_title, disp_all, disp_posn, field_format, field_type, xalignment] ) | ||||
| 
 | ||||
|     def get_defaults(self): | ||||
|         """I have no idea id this is functional""" | ||||
|         return self.append ( [   [u'game', u'Game', True, True, u'%s', u'str', 0.0], | ||||
|             [u'hand', u'Hand', False, False, u'%s', u'str', 0.0], | ||||
|             [u'plposition', u'Posn', False, False, u'%s', u'str', 1.0], | ||||
|             [u'pname', u'Name', False, False, u'%s', u'str', 0.0], | ||||
|             [u'n', u'Hds', True, True, u'%1.0f', u'str', 1.0], | ||||
|             [u'avgseats', u'Seats', False, False, u'%3.1f', u'str', 1.0], | ||||
|             [u'vpip', u'VPIP', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'pfr', u'PFR', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'pf3', u'PF3', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'aggfac', u'AggFac', True, True, u'%2.2f', u'str', 1.0], | ||||
|             [u'aggfrq', u'AggFreq', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'conbet', u'ContBet', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'rfi', u'RFI', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'steals', u'Steals', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'saw_f', u'Saw_F', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'sawsd', u'SawSD', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'wtsdwsf', u'WtSDwsF', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'wmsd', u'W$SD', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'flafq', u'FlAFq', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'tuafq', u'TuAFq', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'rvafq', u'RvAFq', True, True, u'%3.1f', u'str', 1.0], | ||||
|             [u'pofafq', u'PoFAFq', False, False, u'%3.1f', u'str', 1.0], | ||||
|             [u'net', u'Net($)', True, True, u'%6.2f', u'cash', 1.0], | ||||
|             [u'bbper100', u'bb/100', True, True, u'%4.2f', u'str', 1.0], | ||||
|             [u'rake', u'Rake($)', True, True, u'%6.2f', u'cash', 1.0], | ||||
|             [u'bb100xr', u'bbxr/100', True, True, u'%4.2f', u'str', 1.0], | ||||
|             [u'variance', u'Variance', True, True, u'%5.2f', u'str', 1.0] | ||||
|         ]) | ||||
| 
 | ||||
| #    def __str__(self): | ||||
| #        s = "" | ||||
| #        for l in self: | ||||
|  | @ -602,6 +633,7 @@ class Config: | |||
| 
 | ||||
|         for gcs_node in doc.getElementsByTagName("gui_cash_stats"): | ||||
|             self.gui_cash_stats.add_elements(node=gcs_node) # add/overwrite elements in self.gui_cash_stats | ||||
|             # TODO: gui_cash_stats.get_defaults if doc.getElementsByTagName("gui_cash_stats") is non-existant | ||||
| 
 | ||||
| #        s_sites = doc.getElementsByTagName("supported_sites") | ||||
|         for site_node in doc.getElementsByTagName("site"): | ||||
|  |  | |||
|  | @ -11,6 +11,36 @@ | |||
| 
 | ||||
|     <import callFpdbHud = "True" interval = "10"  fastStoreHudCache="False" hhArchiveBase="~/.fpdb/HandHistories/" saveActions="True"></import> | ||||
| 
 | ||||
|     <gui_cash_stats> | ||||
|         <col col_name="game"       disp_all="True"  disp_posn="True"  col_title="Game"     xalignment="0.0" field_format="%s"    field_type="str" xalignment="0.0" /> | ||||
|         <col col_name="hand"       disp_all="False" disp_posn="False" col_title="Hand"     xalignment="0.0" field_format="%s"    field_type="str" /> | ||||
|         <col col_name="plposition" disp_all="False" disp_posn="False" col_title="Posn"     xalignment="1.0" field_format="%s"    field_type="str" /> | ||||
|         <col col_name="pname"      disp_all="False" disp_posn="False" col_title="Name"     xalignment="0.0" field_format="%s"    field_type="str" /> | ||||
|         <col col_name="n"          disp_all="True"  disp_posn="True"  col_title="Hds"      xalignment="1.0" field_format="%1.0f" field_type="str" /> | ||||
|         <col col_name="avgseats"   disp_all="False" disp_posn="False" col_title="Seats"    xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="vpip"       disp_all="True"  disp_posn="True"  col_title="VPIP"     xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="pfr"        disp_all="True"  disp_posn="True"  col_title="PFR"      xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="pf3"        disp_all="True"  disp_posn="True"  col_title="PF3"      xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="aggfac"     disp_all="True"  disp_posn="True"  col_title="AggFac"   xalignment="1.0" field_format="%2.2f" field_type="str" /> | ||||
|         <col col_name="aggfrq"     disp_all="True"  disp_posn="True"  col_title="AggFreq"  xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="conbet"     disp_all="True"  disp_posn="True"  col_title="ContBet"  xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="rfi"        disp_all="True"  disp_posn="True"  col_title="RFI"      xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="steals"     disp_all="True"  disp_posn="True"  col_title="Steals"   xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="saw_f"      disp_all="True"  disp_posn="True"  col_title="Saw_F"    xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="sawsd"      disp_all="True"  disp_posn="True"  col_title="SawSD"    xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="wtsdwsf"    disp_all="True"  disp_posn="True"  col_title="WtSDwsF"  xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="wmsd"       disp_all="True"  disp_posn="True"  col_title="W$SD"     xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="flafq"      disp_all="True"  disp_posn="True"  col_title="FlAFq"    xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="tuafq"      disp_all="True"  disp_posn="True"  col_title="TuAFq"    xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="rvafq"      disp_all="True"  disp_posn="True"  col_title="RvAFq"    xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="pofafq"     disp_all="False" disp_posn="False" col_title="PoFAFq"   xalignment="1.0" field_format="%3.1f" field_type="str" /> | ||||
|         <col col_name="net"        disp_all="True"  disp_posn="True"  col_title="Net($)"   xalignment="1.0" field_format="%6.2f" field_type="cash" /> | ||||
|         <col col_name="bbper100"   disp_all="True"  disp_posn="True"  col_title="bb/100"   xalignment="1.0" field_format="%4.2f" field_type="str" /> | ||||
|         <col col_name="rake"       disp_all="True"  disp_posn="True"  col_title="Rake($)"  xalignment="1.0" field_format="%6.2f" field_type="cash" /> | ||||
|         <col col_name="bb100xr"    disp_all="True"  disp_posn="True"  col_title="bbxr/100" xalignment="1.0" field_format="%4.2f" field_type="str" /> | ||||
|         <col col_name="variance"   disp_all="True"  disp_posn="True"  col_title="Variance" xalignment="1.0" field_format="%5.2f" field_type="str" /> | ||||
|     </gui_cash_stats> | ||||
| 
 | ||||
| <!-- These values determine what stats are displayed in the HUD | ||||
| 
 | ||||
|     The following values define how opponents' stats are done, the first 2 determine | ||||
|  |  | |||
|  | @ -74,7 +74,7 @@ class PokerStars(HandHistoryConverter): | |||
|           # here's how I plan to use LS | ||||
|           (?P<BUYIN>(?P<BIAMT>[%(LS)s\d\.]+)?\+?(?P<BIRAKE>[%(LS)s\d\.]+)?\+?(?P<BOUNTY>[%(LS)s\d\.]+)?\s?(?P<TOUR_ISO>%(LEGAL_ISO)s)?|Freeroll)\s+)? | ||||
|           # close paren of tournament info | ||||
|           (?P<MIXED>HORSE|8\-Game|HOSE)?\s?\(? | ||||
|           (?P<MIXED>HORSE|8\-Game|HOSE|Mixed PLH/PLO)?\s?\(? | ||||
|           (?P<GAME>Hold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s | ||||
|           (?P<LIMIT>No\sLimit|Limit|LIMIT|Pot\sLimit)\)?,?\s | ||||
|           (-\s)? | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user