From 23ab92bdf70245e2cb3219de1b87b1ddec47d7da Mon Sep 17 00:00:00 2001
From: nik gaffney <nik@fo.am>
Date: Sun, 26 Nov 2006 18:19:12 +0100
Subject: [PATCH] similar shadows reshaping of the shadow(two)pi layout, closer
 to a similar semblence, yet still in need of small furthers

---
 punctiform-convergence/layout.scm | 69 ++++++++++++++++---------------
 qfwfq.scm                         |  1 +
 xaueneuax.scm                     |  2 +-
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/punctiform-convergence/layout.scm b/punctiform-convergence/layout.scm
index 6c2e54e..0d7819c 100644
--- a/punctiform-convergence/layout.scm
+++ b/punctiform-convergence/layout.scm
@@ -41,7 +41,8 @@
   (provide wobble-tree
            shuffle-tree
            relax-tree
-           shadowpi-tree)
+           shadowpi-tree
+           shadowtwopi-tree)
 
   
   ;;;;;; ; ; ;;    ;;;; ;;    ;  ;; 
@@ -184,48 +185,50 @@
   ;; for interactive graph visualization and animation" by Andrew Pavlo,
   ;; Christopher Homan & Jonathan Schull
   ;;
-  ;; - since each node may have any number of parents, yet only a single child,
-  ;; thi sinterpretation of the algorithm is essentially the same, if 'children'
-  ;; is read as 'parents'
-  ;; 
   ;;;;; ;  ;;;     ;     ;
   
   (define twopi (* 2 pi))
 
-  
-  (define (shadowpi-tree node pb x y t1 t2 r)
-    ;; node from whcih to draw the layout, centred at x,y on the containment arc
-    ;; given by t1->t2 with radius, r
+  (define (shadowpi-tree node pb theta r)
+    ;; given a node from which to draw the layout, angle theta, radius, r
     (let* ([parents (send node get-parents)]
-           [n (length parents)]
+           [e  (length parents)]
            [xi (snip-x node)] 
            [yi (snip-y node)]
-           (phi 0.75))
-      
+           (b  (/ pi (if (eq? e 0) 1 e)))
+           (a  (- (+ theta (/ pi 2)) (/ b 2)))
+           (r1 (* 2 r (sin (/ b 2)))))
+
       ;; distribute parents of given node evenly along a containment circle
       ;; centered on the node.
-      
-      (dotimes (k n)
-               (let ((parent (list-ref parents k))
-                     (x1 (* r (cos (* (+ t1 (- t2 t1)) (/ k n)))))
-                     (y1 (* r (sin (* (+ t1 (- t2 t1)) (/ k n))))))
-                 (send pb move-to parent
-                       (+ xi x1) (+ yi y1))
-               
-                 ;; draw circles around the node’s parents and evenly distribute their
-                 ;; parents along containment arcs. 
+      (for-each (lambda (parent)
+                  (let ((x1 (+ xi (* r (cos a))))
+                        (y1 (+ yi (* r (sin a)))))
+                    (send pb move-to parent x1 y1)
+                    (shadowpi-tree parent pb a r1)
+                    (set! a (- a b))))
+                parents)))
 
-                 (shadowpi-tree parent pb
-                                (+ xi x1) (+ yi y1) ;; centred on
-                                
-                                (- (atan (/ (- yi (+ yi y1)) (- xi (+ xi x1)))) (/ pi 2))
-                                (+ (/ pi n) (atan (/ (- yi y1) (- xi x1))))
-                                 
-                                (* r phi)) ;; radius
-              
-                 ;; this proceeds recursively, so that successively distant descendants of
-                 ;; the goven node are positioned on successively smaller containment arcs.
+  
+  (define (shadowtwopi-tree node pb theta r)
+    ;; given a node from which to draw the layout, angle theta, radius, r
+    (let* ([parents (send node get-parents)]
+           [e  (length parents)]
+           [xi (snip-x node)] 
+           [yi (snip-y node)]
+           (b  (/ twopi  (if (eq? e 0) 1 e)))
+           (a  (- (+ theta (/ pi 2)) (/ b 2)))
+           (r1 (* 2 r (sin (/ b 2)))))
+
+      ;; distribute parents of given node evenly along a containment circle
+      ;; centered on the node.
+      (for-each (lambda (parent)
+                  (let ((x1 (+ xi (* r (cos a))))
+                        (y1 (+ yi (* r (sin a)))))
+                    (send pb move-to parent x1 y1)
+                    (shadowpi-tree parent pb a r1)
+                    (set! a (- a b))))
+                parents)))
 
-                 ))))
   
   ) ;; end of module
diff --git a/qfwfq.scm b/qfwfq.scm
index 5c9b1b2..19757ea 100644
--- a/qfwfq.scm
+++ b/qfwfq.scm
@@ -59,6 +59,7 @@
            relax-tree
            eval-tree
            shadowpi-tree
+           shadowtwopi-tree
            
            tree->sexp
            to-string
diff --git a/xaueneuax.scm b/xaueneuax.scm
index d717212..08155f5 100644
--- a/xaueneuax.scm
+++ b/xaueneuax.scm
@@ -118,7 +118,7 @@
             [(#\z) ;; C-z re.colour
              (colour-tree selected-snip p)]
             [(#\l) ;; C-x re.lapse
-             (shadowpi-tree selected-snip p 10 10 0 (* 2 pi) 120)]
+             (shadowtwopi-tree selected-snip p 0 80)]
             [(#\=) ;; C-= zoom->out
              (send p zoom 1.1)]
             [(#\-) ;; C-- zoom->in