Changeset 289

Timestamp:

Sep 26, 2017, 3:10:56 PM (7 years ago)

Author:

g7moreau

Message:

• Add shift option 1 or 2 when exportsw in dot format

File:

• trunk/klask (modified) (4 diffs)

trunk/klask

@@ -2731 +2731 @@
 
    my $format = 'txt';
-   my $modulo = 0;
+   my $graph_modulo = 0;
+   my $graph_shift  = 1;
 
    GetOptions(
       'format|f=s'  => \$format,
-      'modulo|m=i'  => \$modulo,
+      'modulo|m=i'  => \$graph_modulo,
+      'shift|s=i'   => \$graph_shift,
       );
 
@@ -2745 +2747 @@
    $format = 'txt' if not defined $possible_format{$format};
 
-   $possible_format{$format}->($modulo, @ARGV);
+   $possible_format{$format}->($graph_modulo, $graph_shift, @ARGV);
    return;
    }
@@ -2792 +2794 @@
 #---------------------------------------------------------------
 sub cmd_exportsw_dot {
-   my $modulo = shift;
+   my $graph_modulo = shift;
+   my $graph_shift  = shift;
 
    my $switch_connection = YAML::Syck::LoadFile("$KLASK_SW_FILE");
@@ -2922 +2925 @@
             printf "   \"%s:%s\" -> \"%s:%s\" [style=$style, color=$color];\n", $sw, $db_switch_output_port{$sw}, $sw_connect, $port_connect;
 
-            next if $modulo == 0; # No shift (invisible nodes) in graph
+            next if $graph_modulo == 0; # No shift (invisible nodes) in graph
             $db_switch_line{$sw_connect}++;
-            if ($db_switch_line{$sw_connect} % $modulo == 0) {
+            if ($db_switch_line{$sw_connect} % $graph_modulo == 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;
+               print  "   \"$invisible.a\" [shape=none, label=\"\"];\n";
+               printf "   \"%s:%s\"  -> \"$invisible.a\" [style=invis];\n", $sw, $db_switch_output_port{$sw};
+               if ($graph_shift == 2) {
+                  # Two invisible node
+                  print  "   \"$invisible.b\" [shape=none, label=\"\"];\n";
+                  print  "   \"$invisible.a\" -> \"$invisible.b\" [style=invis];\n";
+                  printf "   \"$invisible.b\" -> \"%s:%s\"  [style=invis];\n", $sw_connect, $port_connect;
+                  }
+               else {
+                  # One invisible node
+                  printf "   \"$invisible.a\" -> \"%s:%s\"  [style=invis];\n", $sw_connect, $port_connect;
+                  }
                }
             }