Changeset 282

Timestamp:

Sep 25, 2017, 8:17:52 PM (7 years ago)

Author:

g7moreau

Message:

• Better dot file

File:

• trunk/klask (modified) (8 diffs)

trunk/klask

@@ -2818 +2818 @@
    #print "splines=polyline;\n";
 
-   print "site [label = \"site\", color = black, fillcolor = gold, shape = invhouse, style = filled];\n";
-   print "internet [label = \"internet\", color = black, fillcolor = cyan, shape = house, style = filled];\n";
+   print "site [label=\"site\", color=black, fillcolor=gold, shape=invhouse, style=filled];\n";
+   print "internet [label=\"internet\", color=black, fillcolor=cyan, shape=house, style=filled];\n";
 
    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $timestamp;
@@ -2825 +2825 @@
    $mon++;
    my $date = sprintf '%04i-%02i-%02i %02i:%02i', $year, $mon, $mday, $hour, $min;
-   print "\"$date\" [ color = white, fillcolor = black, shape = polygon, sides=14, style = filled, fontcolor = white ]\n";
+   print "\"$date\" [color=white, fillcolor=black, shape=polygon, sides=14, style=filled, fontcolor=white];\n";
    print "site -> \"$date\" [color = white];\n";
 
@@ -2832 +2832 @@
       $b++;
 
-      print "\"building$b\" [label = \"$building\", color = black, fillcolor = gold, style = filled];\n";
-      print "site -> \"building$b\" [len = 2, color = firebrick];\n";
+      print "\"building$b\" [label=\"$building\", color=black, fillcolor=gold, style=filled];\n";
+      print "site -> \"building$b\" [len=2, color=firebrick];\n";
 
       my $l = 0;
@@ -2839 +2839 @@
          $l++;
 
-         print "\"location$b-$l\" [label = \"$building" . q{/} . join(q{\n}, split(m{ / }xms, $loc)) . "\", color = black, fillcolor = orange, style = filled];\n";
-#         print "\"location$b-$l\" [label = \"$building / $loc\", color = black, fillcolor = orange, style = filled];\n";
-         print "\"building$b\" -> \"location$b-$l\" [len = 2, color = firebrick]\n";
+         print "\"location$b-$l\" [label=\"$building" . q{/} . join(q{\n}, split(m{ / }xms, $loc)) . "\", color=black, fillcolor=orange, style=filled];\n";
+#         print "\"location$b-$l\" [label=\"$building / $loc\", color=black, fillcolor=orange, style=filled];\n";
+         print "\"building$b\" -> \"location$b-$l\" [len=2, color=firebrick]\n";
 
          for my $sw (keys %{$db_building{$building}->{$loc}}) {
@@ -2851 +2851 @@
                $color = "\"$color:invis:$color\"";
                }
-            print "\"$sw:$db_switch_output_port{$sw}\" [label = \"".format_aggregator4dot($db_switch_output_port{$sw})."\", color = black, fillcolor = lightblue,  peripheries = $peripheries, style = filled];\n";
+            print "\"$sw:$db_switch_output_port{$sw}\" [label=\"".format_aggregator4dot($db_switch_output_port{$sw})."\", color=black, fillcolor=lightblue, peripheries=$peripheries, style=filled];\n";
 
             my $swname  = $sw;
                $swname .= q{\n-\n} . "$db_switch_global{$sw}->{model}" if exists $db_switch_global{$sw} and exists $db_switch_global{$sw}->{model};
-            print "\"$sw\" [label = \"$swname\", color = black, fillcolor = palegreen, shape = rect, style = filled];\n";
-            print "\"location$b-$l\" -> \"$sw\" [len = 2, color = firebrick, arrowtail = dot]\n";
-            print "\"$sw\" -> \"$sw:$db_switch_output_port{$sw}\" [len=2, style=bold, color = $color, arrowhead = normal, arrowtail = invdot]\n";
+            print "\"$sw\" [label=\"$swname\", color=black, fillcolor=palegreen, shape=rect, style=filled];\n";
+            print "\"location$b-$l\" -> \"$sw\" [len=2, color=firebrick, arrowtail=dot];\n";
+            print "\"$sw\" -> \"$sw:$db_switch_output_port{$sw}\" [len=2, style=bold, color=$color, arrowhead=normal, arrowtail=invdot];\n";
 
 
@@ -2870 +2870 @@
                   $color = "\"$color:invis:$color\"";
                   }
-               print "\"$sw:$port_connect\" [label = \"".format_aggregator4dot($port_connect)."\", color = black, fillcolor = plum,  peripheries = $peripheries, style = filled];\n";
-               print "\"$sw:$port_connect\" -> \"$sw\" [len=2, style=bold, color = $color, arrowhead= normal, arrowtail = inv]\n";
+               print "\"$sw:$port_connect\" [label=\"".format_aggregator4dot($port_connect)."\", color=black, fillcolor=plum, peripheries=$peripheries, style=filled];\n";
+               print "\"$sw:$port_connect\" -> \"$sw\" [len=2, style=bold, color=$color, arrowhead=normal, arrowtail=inv];\n";
                
                $db_switch_line{$sw}++;
-               if ($db_switch_line{$sw} % 9 == 0) {
-                  # Create invisible node
-                  $invisible_node++;
-                  my $invisible = '__Invisible_' . $invisible_node;
-                  print "$invisible [shape=none, label=\"\"]\n";
-                  print "\"$sw:$port_connect\" -> $invisible [style=invis]\n";
-                  print "$invisible            -> \"$sw\"    [style=invis]\n";
-                  }
+               #if ($db_switch_line{$sw} % 9 == 0) {
+               #   # Create invisible node
+               #   $invisible_node++;
+               #   my $invisible = '__Invisible_' . $invisible_node;
+               #   print "$invisible [shape=none, label=\"\"]\n";
+               #   print "\"$sw:$port_connect\" -> $invisible [style=invis]\n";
+               #   print "$invisible            -> \"$sw\"    [style=invis]\n";
+               #   }
               }
             }
@@ -2900 +2900 @@
             $color = "\"$color:invis:$color\"";
             }
-         printf "   \"%s:%s\" -> internet [style=$style, color = $color]\n", $sw, $db_switch_output_port{$sw};
+         printf "   \"%s:%s\" -> internet [style=$style, color=$color];\n", $sw, $db_switch_output_port{$sw};
          }
       }
@@ -2917 +2917 @@
             }
          if (exists $db_switch_output_port{$sw}) {
-            printf "   \"%s:%s\" -> \"%s:%s\" [style=$style, color = $color]\n", $sw, $db_switch_output_port{$sw}, $sw_connect, $port_connect;
+            printf "   \"%s:%s\" -> \"%s:%s\" [style=$style, color=$color];\n", $sw, $db_switch_output_port{$sw}, $sw_connect, $port_connect;
+
+            if ($db_switch_line{$sw_connect} % 9 == 0) {
+               # Create invisible node
+               $invisible_node++;
+               my $invisible = '__Invisible_' . $invisible_node;
+               print  "   $invisible [shape=none, label=\"\"];\n";
+               printf "   \"%s:%s\"  -> $invisible [style=invis];\n", $sw, $db_switch_output_port{$sw};
+               printf "   $invisible -> \"%s:%s\"  [style=invis];\n", $sw_connect, $port_connect;
+               }
             }
          else {
-            printf "   \"%s\"   -> \"%s:%s\" [style=$style]\n", $sw, $sw_connect, $port_connect;
+            printf "   \"%s\"   -> \"%s:%s\" [style=$style];\n", $sw, $sw_connect, $port_connect;
             }
          }