visdebug: support caller-specified colour tuples

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/moedebug.py b/moedebug.py
index f9f85618d50f6a1c1a7f17b165a9bad6df0ff573..8c80c004bdb0a50f1467670bb3efc5f19eaaeaa7 100644 (file)
--- a/moedebug.py
+++ b/moedebug.py
@@ -19,10 +19,10 @@ def dbg(*args):
     f.flush()
 
 class BaseVisdebug():
-  def line(vd, p0, p1):
-    vd.curve(lambda t: p0 + t * (p1-p0))
-  def arrow(vd, p, d):
-    vd.line(p, p+d)
+  def line(vd, p0, p1, **kw):
+    vd.curve(lambda t: p0 + t * (p1-p0), **kw)
+  def arrow(vd, p, d, **kw):
+    vd.line(p, p+d, **kw)
 
 class NullVisdebug():
   def curve(*a, **kw): pass
@@ -34,8 +34,8 @@ class MatrixVisdebug(BaseVisdebug):
   def __init__(m, base, matrix):
     m._b = base
     m._matrix = matrix
-  def curve(m, fn):
-    m._b.curve(lambda t: moenp.augmatmultiply(m._matrix, fn(t)))
+  def curve(m, fn, **kw):
+    m._b.curve(lambda t: moenp.augmatmultiply(m._matrix, fn(t)), **kw)
   def crashing(m, *a, **kw): m._b.crashing(*a, **kw)
 
 _nullvis = NullVisdebug()

diff --git a/visual b/visual
index dcb57e1a573ef3da001f9ee2cedcd2b30d0cdfcd..667ce6ab7894930366d33542118280a01c4ed856 100755 (executable)
--- a/visual
+++ b/visual
@@ -17,11 +17,11 @@ nv = 40
 nw = 40
 
 class Visdebug(BaseVisdebug):
-  def curve(vd, fn):
+  def curve(vd, fn, colour=color.yellow):
     # fn(t) => 3-tuple, 3-list, or similar, for t \elem [0,1]
     ps = [ fn(t) for t in np.linspace(0,1,11) ]
     #dbg('Visdebug', ps)
-    curve(pos = ps, color=color.yellow)
+    curve(pos = ps, color=colour)
   def crashing(vd, msg):
     print("CRASHING - VISDEBUG", msg, file=sys.stderr)
     rate(1E-8)