vaious fixes for rendering to gtk or xlig from a script. modgraph.tcl demo

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index 8fb37fe12bfbad9f9c064e9d1ec1cc884a7da4f1..b4f7de6fd21dedba7e88f752ec4ee80b706300f2 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -105,6 +105,8 @@ int gvRender(GVC_t *gvc, graph_t *g, char *format, FILE *out)
     }
     job->output_file = out;
     gvRenderJobs(gvc, g);
+    if (gvc->active_jobs)
+       gvdevice_finalize(gvc);
     gvrender_delete_jobs(gvc);
 
     return 0;
@@ -133,6 +135,8 @@ int gvRenderFilename(GVC_t *gvc, graph_t *g, char *format, char *filename)
     }
     gvrender_output_filename_job(gvc, filename);
     gvRenderJobs(gvc, g);
+    if (gvc->active_jobs)
+       gvdevice_finalize(gvc);
     gvrender_delete_jobs(gvc);
 
     return 0;

diff --git a/tclpkg/gv/gv.cpp b/tclpkg/gv/gv.cpp
index f540e2bd2217e7c18772d24e3e9aded963ad4d16..3e6f3bb6ac1e141e31ff76d2cf9e8f434bdfc09e 100644 (file)
--- a/tclpkg/gv/gv.cpp
+++ b/tclpkg/gv/gv.cpp
@@ -958,15 +958,20 @@ void render(Agraph_t *g, char *format, char *filename)
     int err;
 
     err = gvRenderFilename(gvc, g, format, filename);
+
 }
+void render(Agraph_t *g, char *format)
+{
+    int err;
 
+    err = gvRender(gvc, g, format, stdout);
+}
 void render(Agraph_t *g, char *format, FILE *f)
 {
     int err;
 
     err = gvRender(gvc, g, format, f);
 }
-
 void render(Agraph_t *g, char *format, void **data)
 {
 //    FIXME

diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i
index 995e9215ae5dc91b15fa33b4298a9bcda5321dd6..0c3f9229bf913f0b2032fb59e383c4c83df25973 100644 (file)
--- a/tclpkg/gv/gv.i
+++ b/tclpkg/gv/gv.i
@@ -142,6 +142,7 @@ extern void rm(Agedge_t *e);
 
 extern void layout(Agraph_t *g, char *engine);
 
+extern void render(Agraph_t *g, char *format);
 extern void render(Agraph_t *g, char *format, char *filename);
 extern void render(Agraph_t *g, char *format, FILE *f);
 extern void render(Agraph_t *g, char *format, void **data);