Modify demo files to work with libcgraph

diff --git a/dot.demo/demo.c b/dot.demo/demo.c
index 6f6326bb4234b1e99a8ea12483b65818bfdd08f1..60369b67c055a12102d10f5477e3aa5207ebd113 100644 (file)
--- a/dot.demo/demo.c
+++ b/dot.demo/demo.c
@@ -34,10 +34,17 @@ int main(int argc, char **argv)
     gvParseArgs(gvc, argc, argv);
 
     /* Create a simple digraph */
+#ifdef WITH_CGRAPH
+    g = agopen("g", Agdirected, 0);
+    n = agnode(g, "n", 1);
+    m = agnode(g, "m", 1);
+    e = agedge(g, n, m, 0, 1);
+#else
     g = agopen("g", AGDIGRAPH);
     n = agnode(g, "n");
     m = agnode(g, "m");
     e = agedge(g, n, m);
+#endif
 
     /* Set an attribute - in this case one that affects the visible rendering */
     agsafeset(n, "color", "red", "");

diff --git a/dot.demo/example.c b/dot.demo/example.c
index 11a711f2b753165ffaba9b0cbc4bc50deaaafa82..bd07299ca5af41fca209f7685dc8cebabf0d70f0 100644 (file)
--- a/dot.demo/example.c
+++ b/dot.demo/example.c
@@ -7,10 +7,11 @@ int main(int argc, char **argv)
     Agraph_t *g;
     Agnode_t *n, *m;
     Agedge_t *e;
-    Agsym_t *a;
 
 #ifdef NO_LAYOUT_OR_RENDERING
+#ifndef WITH_CGRAPH
     aginit();
+#endif
 #else
     /* set up a graphviz context - but only once even for multiple graphs */
     static GVC_t *gvc;
@@ -20,10 +21,17 @@ int main(int argc, char **argv)
 #endif
 
     /* Create a simple digraph */
+#ifdef WITH_CGRAPH
+    g = agopen("g", Agdirected, 0);
+    n = agnode(g, "n", 1);
+    m = agnode(g, "m", 1);
+    e = agedge(g, n, m, 0, 1);
+#else
     g = agopen("g", AGDIGRAPH);
     n = agnode(g, "n");
     m = agnode(g, "m");
     e = agedge(g, n, m);
+#endif
 
     /* Set an attribute - in this case one that affects the visible rendering */
     agsafeset(n, "color", "red", "");

diff --git a/dot.demo/neatopack.c b/dot.demo/neatopack.c
index 62b9190e7a3f68f0240ad1da55f9e726b8b81106..e844885573abf43c8fe52a87f66cfddc39a2ced3 100644 (file)
--- a/dot.demo/neatopack.c
+++ b/dot.demo/neatopack.c
@@ -28,7 +28,11 @@ int main (int argc, char* argv[])
         fp = fopen(argv[1], "r");
     else
         fp = stdin;
+#ifdef WITH_CGRAPH
+    g = agread(fp, 0);
+#else
     g = agread(fp);
+#endif
 
     cc = ccomps(g, &ncc, (char*)0);
 

diff --git a/dot.demo/simple.c b/dot.demo/simple.c
index 1000f457402f362ef7c5b19affcb67f731f160d0..1517c6ef9d4b9df50b3e7afdc3b1762656de59ff 100644 (file)
--- a/dot.demo/simple.c
+++ b/dot.demo/simple.c
@@ -25,7 +25,11 @@ int main(int argc, char **argv)
        fp = fopen(argv[1], "r");
     else
        fp = stdin;
+#ifdef WITH_CGRAPH
+    g = agread(fp, 0);
+#else
     g = agread(fp);
+#endif
 
     gvLayout(gvc, g, "dot");