From 989d06548e46eb211548b864a8f1163fe055aa13 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 14 Feb 2011 01:26:10 +0800 Subject: [PATCH 1/3] Example config: Add 10 seat OnGame layout --- pyfpdb/HUD_config.xml.example | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index 85e6f443..b62d6db1 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -528,6 +528,18 @@ Left-Drag to Move" + + + + + + + + + + + + From 9376f3d8b5393071b9d72220819c65370a8413b4 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 15 Feb 2011 15:02:15 +0800 Subject: [PATCH 2/3] Grapher: Allow CAP (cn) games to be graphed. --- pyfpdb/GuiGraphViewer.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py index 443d65aa..019d5085 100644 --- a/pyfpdb/GuiGraphViewer.py +++ b/pyfpdb/GuiGraphViewer.py @@ -291,6 +291,7 @@ class GuiGraphViewer (threading.Thread): lims = [int(x) for x in limits if x.isdigit()] potlims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'pl'] nolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'nl'] + capnolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'cn'] limittest = "and ( (gt.limitType = 'fl' and gt.bigBlind in " # and ( (limit and bb in()) or (nolimit and bb in ()) ) if lims: @@ -313,6 +314,14 @@ class GuiGraphViewer (threading.Thread): blindtest = str(tuple(nolims)) blindtest = blindtest.replace("L", "") blindtest = blindtest.replace(",)",")") + limittest = limittest + blindtest + ' ) ' + else: + limittest = limittest + '(-1) ) ' + limittest = limittest + " or (gt.limitType = 'cn' and gt.bigBlind in " + if capnolims: + blindtest = str(tuple(capnolims)) + blindtest = blindtest.replace("L", "") + blindtest = blindtest.replace(",)",")") limittest = limittest + blindtest + ' ) )' else: limittest = limittest + '(-1) ) )' From 9fe42f66de35024b9d817ec1168bf7084d38c0c7 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 15 Feb 2011 15:33:18 +0800 Subject: [PATCH 3/3] Ring Stats: Allow CAP (cn) games to be displayed --- pyfpdb/GuiRingPlayerStats.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pyfpdb/GuiRingPlayerStats.py b/pyfpdb/GuiRingPlayerStats.py index 4d214767..b42e6f50 100644 --- a/pyfpdb/GuiRingPlayerStats.py +++ b/pyfpdb/GuiRingPlayerStats.py @@ -623,6 +623,7 @@ class GuiRingPlayerStats (GuiPlayerStats.GuiPlayerStats): lims = [int(x) for x in limits if x.isdigit()] potlims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'pl'] nolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'nl'] + capnolims = [int(x[0:-2]) for x in limits if len(x) > 2 and x[-2:] == 'cn'] bbtest = "and ( (gt.limitType = 'fl' and gt.bigBlind in " # and ( (limit and bb in()) or (nolimit and bb in ()) ) if lims: @@ -645,6 +646,14 @@ class GuiRingPlayerStats (GuiPlayerStats.GuiPlayerStats): blindtest = str(tuple(nolims)) blindtest = blindtest.replace("L", "") blindtest = blindtest.replace(",)",")") + bbtest = bbtest + blindtest + ' ) ' + else: + bbtest = bbtest + '(-1) ) ' + bbtest = bbtest + " or (gt.limitType = 'cn' and gt.bigBlind in " + if capnolims: + blindtest = str(tuple(capnolims)) + blindtest = blindtest.replace("L", "") + blindtest = blindtest.replace(",)",")") bbtest = bbtest + blindtest + ' ) )' else: bbtest = bbtest + '(-1) ) )'