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) ) )' 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) ) )' 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" + + + + + + + + + + + +