slightly improved GraphViz

src/main/jastadd/Graphviz.jrag

@@ -3,15 +3,15 @@ aspect Graphviz {
 
     StringBuffer b = new StringBuffer();
 
-    b.append("digraph G {\n")
+    b.append("digraph \"").append(name()).append("\" {\n")
         .append("  rankdir=LR;\n")
         .append("  center=true; margin=1;\n")
         .append("\n")
-        .append("subgraph place {\n")
+        .append("  subgraph places {\n")
         .append("    node [shape=circle,fixedsize=true,label=\"\", height=.3,width=.3];\n");
 
     for (Place place : allPlaces()) {
-      b.append(place.dotId()).append(" [");
+      b.append("    ").append(place.dotId()).append(" [");
       if (place.hasName()) b.append("xlabel=\"").append(place.name()).append("\", ");
       b.append("label=\"").append("0").append("\"];\n");
     }
@@ -21,7 +21,7 @@ aspect Graphviz {
     b.append("  subgraph transitions {\n")
         .append("    node [shape=rect,height=0.4,width=.4];\n");
     for (Transition transition : allTransitions()) {
-      b.append(transition.dotId()).append(" [");
+      b.append("    ").append(transition.dotId()).append(" [");
       if (transition.hasName()) b.append("label=\"").append(transition.name()).append("\"");
       b.append("]\n");
     }
@@ -29,13 +29,14 @@ aspect Graphviz {
     b.append("  }\n\n");
 
     for (Arc arc : allArcs()) {
-      b.append(arc.getSource().dotId()).append("->").append(arc.getTarget().dotId()).append(";\n");
+      b.append("  ").append(arc.getSource().dotId()).append("->").append(arc.getTarget().dotId()).append(";\n");
     }
     b.append("}\n");
 
     return b.toString();
   }
 
+  syn String PetriNet.dotId() = "\"" + getId().replaceAll("\"", "\\\"") + "\"";
   syn String PnObject.dotId() = "\"" + getId().replaceAll("\"", "\\\"") + "\"";
 
 }