]> granicus.if.org Git - graphviz/commitdiff
tcldot bindrec fixes, and add .gitignore
authorJohn Ellson <ellson@research.att.com>
Wed, 12 Jun 2013 17:09:27 +0000 (13:09 -0400)
committerJohn Ellson <ellson@research.att.com>
Wed, 12 Jun 2013 17:09:27 +0000 (13:09 -0400)
.gitignore [new file with mode: 0644]
tclpkg/tcldot/tcldot-graphcmd.c
tclpkg/tcldot/tcldot-nodecmd.c
tclpkg/tcldot/tcldot.c

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..ea22987
--- /dev/null
@@ -0,0 +1,192 @@
+syntax: glob
+*~
+*.o
+*.a
+graphviz*.tar.gz
+*.la
+*.lai
+*.lo
+*.Po
+*.Plo
+*.so
+*.so.*
+*.soT
+*.pc
+.libs
+.deps
+libtool
+libltdl
+m4
+configure
+config.*
+Makefile
+Makefile.in
+autom4te.cache
+COPYING
+Doxyfile
+doxygen
+INSTALL
+aclocal.m4
+ast_common.h
+builddate.h
+stamp-h1
+FEATURE
+pkgIndex.tcl
+SWIGTYPE*
+tclpkg/*/gv.3*
+y.*
+
+
+cmd/dot/dot
+cmd/dot/dot_static
+cmd/dot/dot.1.pdf
+cmd/dot/dot_builtins
+cmd/dot/osage.1.pdf
+cmd/dot/patchwork.1.pdf
+cmd/dotty/dotty
+cmd/dotty/dotty.1.pdf
+cmd/gvedit/attrs.txt
+cmd/gvedit/gvedit
+cmd/gvedit/gvedit.1.pdf
+cmd/gvedit/gvedit.pro
+cmd/gvedit/moc_csettings.cpp
+cmd/gvedit/moc_imageviewer.cpp
+cmd/gvedit/moc_mainwindow.cpp
+cmd/gvedit/moc_mdichild.cpp
+cmd/gvedit/qMakefile
+cmd/gvedit/qrc_mdi.cpp
+cmd/gvmap/cluster
+cmd/gvmap/cluster.1.pdf
+cmd/gvmap/gvmap
+cmd/gvmap/gvmap.1.pdf
+cmd/gvmap/gvmap.sh.1.pdf
+cmd/gvpr/gvpr
+cmd/gvpr/gvpr_static
+cmd/gvpr/gvpr.1.pdf
+cmd/lefty/dot2l/dotparse.c
+cmd/lefty/dot2l/dotparse.h
+cmd/lefty/lefty
+cmd/lefty/lefty.1.pdf
+cmd/lneato/lneato
+cmd/lneato/lneato.1.pdf
+cmd/smyrna/smyrna
+cmd/smyrna/smyrna.1.pdf
+cmd/tools/acyclic
+cmd/tools/acyclic.1.pdf
+cmd/tools/bcomps
+cmd/tools/bcomps.1.pdf
+cmd/tools/ccomps
+cmd/tools/ccomps.1.pdf
+cmd/tools/dijkstra
+cmd/tools/dijkstra.1.pdf
+cmd/tools/gc
+cmd/tools/gc.1.pdf
+cmd/tools/gml2gv
+cmd/tools/gml2gv.1.pdf
+cmd/tools/gmlparse.c
+cmd/tools/gmlparse.h
+cmd/tools/gmlscan.c
+cmd/tools/graphml2gv
+cmd/tools/graphml2gv.1.pdf
+cmd/tools/gv2gml
+cmd/tools/gvcolor
+cmd/tools/gvcolor.1.pdf
+cmd/tools/gvgen
+cmd/tools/gvgen.1.pdf
+cmd/tools/gvpack
+cmd/tools/gvpack.1.pdf
+cmd/tools/gxl2gv
+cmd/tools/gxl2gv.1.pdf
+cmd/tools/mm2gv
+cmd/tools/mm2gv.1.pdf
+cmd/tools/nop
+cmd/tools/nop.1.pdf
+cmd/tools/sccmap
+cmd/tools/sccmap.1.pdf
+cmd/tools/tred
+cmd/tools/tred.1.pdf
+cmd/tools/unflatten
+cmd/tools/unflatten.1.pdf
+config/compile
+config/depcomp
+config/install-sh
+config/ltmain.sh
+config/missing
+config/ylwrap
+contrib/diffimg/diffimg
+contrib/diffimg/diffimg.1.pdf
+contrib/prune/prune
+contrib/prune/prune.pdf
+debian/changelog
+graphviz.spec
+graphviz_version.h
+lib/cdt/cdt.3.pdf
+lib/cgraph/cgraph.3.pdf
+lib/cgraph/grammar.c
+lib/cgraph/grammar.h
+lib/cgraph/scan.c
+lib/common/brewer_lib
+lib/common/color_lib
+lib/common/colortbl.h
+lib/common/htmlparse.c
+lib/common/htmlparse.h
+lib/common/ps_font_equiv.h
+lib/common/svgcolor_lib
+lib/expr/exop.h
+lib/expr/exparse.c
+lib/expr/exparse.h
+lib/expr/expr.3.pdf
+lib/gd/gd.html
+lib/graph/graph.3.pdf
+lib/graph/parser.c
+lib/graph/parser.h
+lib/gvc/gvc.3.pdf
+lib/gvpr/gdefs.h
+lib/gvpr/mkdefs
+lib/pack/pack.3.pdf
+lib/pathplan/pathplan.3.pdf
+lib/xdot/xdot.3.pdf
+macosx/Info.plist
+macosx/build/graphviz.pmdoc/01local.xml
+macosx/build/graphviz.pmdoc/02graphviz.xml
+plugin/core/ps.h
+plugin/lasi/ps.h
+plugin/xlib/vimdot
+plugin/xlib/vimdot.1.pdf
+tclpkg/gdtclft/gdtclft.3tcl.pdf
+tclpkg/gv/META.gv
+tclpkg/gv/gv.R
+tclpkg/gv/gv.cma
+tclpkg/gv/gv.cmi
+tclpkg/gv/gv.cmo
+tclpkg/gv/gv.cmx
+tclpkg/gv/gv.cmxa
+tclpkg/gv/gv.cs
+tclpkg/gv/gv.java
+tclpkg/gv/gv.ml
+tclpkg/gv/gv.mli
+tclpkg/gv/gv.php
+tclpkg/gv/gv.pm
+tclpkg/gv/gv.py
+tclpkg/gv/gvJNI.java
+tclpkg/gv/gvPINVOKE.cs
+tclpkg/gv/gv_R.cpp
+tclpkg/gv/gv_guile.cpp
+tclpkg/gv/gv_java.cpp
+tclpkg/gv/gv_lua.cpp
+tclpkg/gv/gv_ocaml.cpp
+tclpkg/gv/gv_perl.cpp
+tclpkg/gv/gv_php.cpp
+tclpkg/gv/gv_python.cpp
+tclpkg/gv/gv_ruby.cpp
+tclpkg/gv/gv_sharp.cpp
+tclpkg/gv/gv_tcl.cpp
+tclpkg/gv/php_gv.h
+tclpkg/gv/swig.cmi
+tclpkg/gv/swig.cmo
+tclpkg/gv/swig.ml
+tclpkg/gv/swig.mli
+tclpkg/tcldot/tcldot.3tcl.pdf
+tclpkg/tkspline/tkspline.3tk.pdf
+windows/Properties/AssemblyInfo.cs
+windows/build/graphviz.wxs
index 60fc8323bde529036336c75a9993f1e02a73d61b..e54371120b94b8327c3c42985c006b19058ec7ef 100644 (file)
@@ -119,7 +119,6 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
        e = agedge(g, tail, head);
 #else
        e = agedge(g, tail, head, NULL, 1);
-       agbindrec(e, "Agedgeinfo_t", sizeof(Agedgeinfo_t), TRUE);
        Tcl_AppendResult(interp, obj2cmd(e), NULL);
 #endif
 #ifndef WITH_CGRAPH
@@ -147,7 +146,6 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
            /* if odd number of args then argv[2] is name */
 #ifdef WITH_CGRAPH
            n = agnode(g, argv[2], 1);
-           agbindrec(n, "Agnodeinfo_t", sizeof(Agnodeinfo_t), TRUE);
 #else
            n = agnode(g, argv[2]);
            if (!(np = (Agnode_t **) tclhandleXlateIndex(ictx->nodeTblPtr, AGID(n))) || *np != n) {
@@ -169,7 +167,6 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
        } else {
 #ifdef WITH_CGRAPH
            n = agnode(g, NULL, 1);  /* anon node */
-           agbindrec(n, "Agnodeinfo_t", sizeof(Agnodeinfo_t), TRUE);
 #else
            /* else use handle as name */
            np = (Agnode_t **) tclhandleAlloc(ictx->nodeTblPtr, Tcl_GetStringResult(interp), &id);
@@ -318,14 +315,22 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
     } else if ((c == 'l')
               && (strncmp(argv[1], "layoutedges", length) == 0)) {
        g = agroot(g);
+#ifndef WITH_CGRAPH
        if (!GD_drawing(g))
+#else
+       if (!aggetrec (g, "Agraphinfo_t",0))
+#endif
            tcldot_layout(gvc, g, (argc > 2) ? argv[2] : NULL);
        return TCL_OK;
 
     } else if ((c == 'l')
               && (strncmp(argv[1], "layoutnodes", length) == 0)) {
        g = agroot(g);
+#ifndef WITH_CGRAPH
        if (!GD_drawing(g))
+#else
+       if (!aggetrec (g, "Agraphinfo_t",0))
+#endif
            tcldot_layout(gvc, g, (argc > 2) ? argv[2] : NULL);
        return TCL_OK;
 
@@ -579,7 +584,11 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
 
        /* make sure that layout is done */
        g = agroot(g);
+#ifndef WITH_CGRAPH
        if (!GD_drawing(g) || argc > 3)
+#else
+       if (!aggetrec (g, "Agraphinfo_t",0) || argc > 3)
+#endif
            tcldot_layout (gvc, g, (argc > 3) ? argv[3] : NULL);
 
        /* render graph TK canvas commands */
@@ -616,7 +625,11 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
 
        /* make sure that layout is done */
        g = agroot(g);
+#ifndef WITH_CGRAPH
        if (!GD_drawing(g) || argc > 4)
+#else
+       if (!aggetrec (g, "Agraphinfo_t",0) || argc > 4)
+#endif
            tcldot_layout(gvc, g, (argc > 4) ? argv[4] : NULL);
        
        gvc->common.viewNum = 0;
@@ -786,9 +799,12 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
        job->output_filename = NULL;
 
        /* make sure that layout is done  - unless canonical output */
-       if ((!GD_drawing(g) || argc > 4) && !(job->flags & LAYOUT_NOT_REQUIRED)) {
+#ifndef WITH_CGRAPH
+       if ((!GD_drawing(g) || argc > 4) && !(job->flags & LAYOUT_NOT_REQUIRED))
+#else
+       if ((!aggetrec (g, "Agraphinfo_t",0) || argc > 4) && !(job->flags & LAYOUT_NOT_REQUIRED))
+#endif
            tcldot_layout(gvc, g, (argc > 4) ? argv[4] : NULL);
-       }
 
        gvc->common.viewNum = 0;
        gvRenderJobs(gvc, g);
index aa9820f9c73fc134d388cb8ab6a95002d076698a..0199d95f61a28eed2a3ed27a5e8df3589637c37c 100644 (file)
@@ -91,7 +91,6 @@ int nodecmd(ClientData clientData, Tcl_Interp * interp,
        }
 #ifdef WITH_CGRAPH
        e = agedge(g, n, head, NULL, 1);
-       agbindrec(e, "Agedgeinfo_t", sizeof(Agedgeinfo_t), TRUE);
         Tcl_AppendResult(interp, obj2cmd(e), NULL);
 #else
        e = agedge(g, n, head);
index 71ed89236d6d8e6fc35d6d2eeda5520536a05cd5..ac2407b66b683b92cb3f4c8fbe2e40510ef36d6c 100644 (file)
@@ -93,9 +93,6 @@ static int dotnew(ClientData clientData, Tcl_Interp * interp,
 #endif
        i = 2;
     }
-#ifdef WITH_CGRAPH
-    agbindrec(g, "Agraphinfo_t", sizeof(Agraphinfo_t), TRUE);
-#endif
     if (!g) {
        Tcl_AppendResult(interp, "\nFailure to open graph.", NULL);
        return TCL_ERROR;
@@ -112,11 +109,12 @@ static int dotnew(ClientData clientData, Tcl_Interp * interp,
 #endif                         /* TCLOBJ */
 #endif
     setgraphattributes(g, &argv[i], argc - i);
+
+#ifndef WITH_CGRAPH
     /* we use GD_drawing(g) as a flag that layout has been done.
      * so we make sure that it is initialized to "not done" */
     GD_drawing(g) = NULL;
-
-#ifdef WITH_CGRAPH
+#else
     Tcl_AppendResult(interp, obj2cmd(g), NULL);
 #endif
 
@@ -240,18 +238,14 @@ static int dotread(ClientData clientData, Tcl_Interp * interp,
        }
        return TCL_ERROR;
     }
-#ifdef WITH_CGRAPH
-    agbindrec(g, "Agraphinfo_t", sizeof(Agraphinfo_t), TRUE);
-#endif
     if (agerrors()) {
        Tcl_AppendResult(interp, "\nSyntax errors in file \"", argv[1], " \"", NULL);
        return TCL_ERROR;
     }
+#ifndef WITH_CGRAPH
     /* we use GD_drawing(g) as a flag that layout has been done.
      * so we make sure that it is initialized to "not done" */
     GD_drawing(g) = NULL;
-
-#ifndef WITH_CGRAPH
     return (tcldot_fixup((ictx_t *)clientData, g));
 #else
     Tcl_AppendResult(interp, obj2cmd(g), NULL);
@@ -295,18 +289,14 @@ static int dotstring(ClientData clientData, Tcl_Interp * interp,
        }
        return TCL_ERROR;
     }
-#ifdef WITH_CGRAPH
-    agbindrec(g, "Agraphinfo_t", sizeof(Agraphinfo_t), TRUE);
-#endif
     if (agerrors()) {
        Tcl_AppendResult(interp, "\nSyntax errors in string \"", argv[1], " \"", NULL);
        return TCL_ERROR;
     }
+#ifndef WITH_CGRAPH
     /* we use GD_drawing(g) as a flag that layout has been done.
      * so we make sure that it is initialized to "not done" */
     GD_drawing(g) = NULL;
-
-#ifndef WITH_CGRAPH
     return (tcldot_fixup((ictx_t *)clientData, g));
 #else
     Tcl_AppendResult(interp, obj2cmd(g), NULL);