Follow cl-graphviz changes

[cl-graph.git] / dev / graphviz / graphviz-support-optional.lisp

diff --git a/dev/graphviz/graphviz-support-optional.lisp b/dev/graphviz/graphviz-support-optional.lisp
index b1b2e07..2d65b62 100644 (file)
--- a/dev/graphviz/graphviz-support-optional.lisp
+++ b/dev/graphviz/graphviz-support-optional.lisp
@@ -13,7 +13,7 @@ loaded when cl-graphviz is available.
 
 |#
 
-(in-package metabang.graph)
+(in-package #:metabang.graph)
 
 ;; TODO these are hacks to be removed later,
 ;; the functionality should be provided by graph itself
@@ -30,8 +30,8 @@ loaded when cl-graphviz is available.
          (args (list dot
                      :graph-visitor
                      (lambda (dot-graph)
-                       (setf (dot-attribute :bb g)
-                             (graphviz:graph-bounding-box dot-graph)))
+                       (setf (dot-attribute-value :bb g)
+                               (graphviz:graph-bounding-box dot-graph)))
 
                      :node-visitor
                      (lambda (node)
@@ -44,9 +44,9 @@ loaded when cl-graphviz is available.
                          ;; TODO search-for-vertex is sloooow, use a hashtable or
                          ;; introduce an graph-find-element-by-id-mixin, or similar
                          (let ((vertex (find-vertex-by-id g (graphviz:node-name node))))
-                           (setf (dot-attribute :pos vertex) pos)
-                           (setf (dot-attribute :width vertex) width)
-                           (setf (dot-attribute :height vertex) height))))
+                           (setf (dot-attribute-value :pos vertex) pos
+                                 (dot-attribute-value :width vertex) width
+                                 (dot-attribute-value :height vertex) height))))
                      
                      :edge-visitor
                      (lambda (edge)
@@ -58,14 +58,15 @@ loaded when cl-graphviz is available.
                                 (to-vertex (find-vertex-by-id g (graphviz:node-name to)))
                                 (real-edge (find-edge-between-vertexes g from-vertex to-vertex))
                                 (bezier-points '()))
-                           (graphviz:edge-iterate-beziers
+                           (graphviz:iterate-edge-beziers
                             edge
                             (lambda (bezier)
                               ;;(format t "  Bezier: ~a~%"
                               ;;        (graphviz:bezier-points bezier))
                               (dolist (el (graphviz:bezier-points bezier))
                                 (push el bezier-points))))
-                           (setf (dot-attribute :pos real-edge) (nreverse bezier-points))))))))
+                           (setf (dot-attribute-value :pos real-edge)
+                                 (nreverse bezier-points))))))))
     (when algorithm-provided-p
       (nconc args (list :algorithm algorithm)))
     (apply 'graphviz:layout-dot-format args))