Changeset 254

Timestamp:

Sep 8, 2017, 6:09:52 PM (7 years ago)

Author:

g7moreau

Message:

• Better dot result

File:

• trunk/klask (modified) (3 diffs)

trunk/klask

@@ -2768 +2768 @@
          for my $sw (keys %{$db_building{$building}->{$loc}}) {
 
-            print "\"$sw:$db_switch_output_port{$sw}\" [label = \"".format_aggregator4dot($db_switch_output_port{$sw})."\", color = black, fillcolor = lightblue,  peripheries = 2, style = filled];\n";
+            my $peripheries = 1;
+            $peripheries = 2 if $db_switch_output_port{$sw} =~ m/^(Trk|Br|Po)/;
+            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;
@@ -2781 +2783 @@
                next if not $sw_connect eq $sw;
                next if $port_connect eq $db_switch_output_port{$sw};
-               print "\"$sw:$port_connect\" [label = \"".format_aggregator4dot($port_connect)."\", color = black, fillcolor = plum,  peripheries = 1, style = filled];\n";
+               my $peripheries = 1;
+               $peripheries = 2 if $port_connect =~ m/^(Trk|Br|Po)/;
+               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, arrowhead= normal, arrowtail = inv]\n";
               }
@@ -2805 +2809 @@
       my ($sw_connect, $port_connect) = split m/ $SEP_SWITCH_PORT /xms, $swport, 2;
       for my $sw (keys %{$db_switch_connected_on_port{$swport}}) {
+         my $style = 'solid';
+         $style = 'bold' if $port_connect =~ m/^(Trk|Br|Po)/;
          if (exists $db_switch_output_port{$sw}) {
-            printf "   \"%s:%s\" -> \"%s:%s\" [color = navyblue]\n", $sw, $db_switch_output_port{$sw}, $sw_connect, $port_connect;
+            printf "   \"%s:%s\" -> \"%s:%s\" [style=$style, color = navyblue]\n", $sw, $db_switch_output_port{$sw}, $sw_connect, $port_connect;
             }
          else {
-            printf "   \"%s\"   -> \"%s%s\"\n", $sw, $sw_connect, $port_connect;
+            printf "   \"%s\"   -> \"%s:%s\" [style=$style]\n", $sw, $sw_connect, $port_connect;
             }
          }