disabled extra flyline drawing function. drawing nets over rrgraph.

Author: SamuelHo10

vpr/src/draw/draw.cpp

@@ -180,11 +180,9 @@ static void draw_main_canvas(ezgl::renderer* g) {
     drawplace(g);
     draw_internal_draw_subblk(g);
 
-    if (draw_state->pic_on_screen == PLACEMENT) {
-        if (draw_state->draw_nets == DRAW_FLYLINES && draw_state->show_nets) {
-            draw_flylines_placement(g);
-        }
-    } else { // ROUTING on screen
+    if(draw_state->pic_on_screen == ROUTING) { // ROUTING on screen
+
+        draw_rr(g);
 
         if (draw_state->show_nets && draw_state->draw_nets == DRAW_ROUTED_NETS) {
             draw_route(ALL_NETS, g);
@@ -194,8 +192,6 @@ static void draw_main_canvas(ezgl::renderer* g) {
             }
         }
 
-        draw_rr(g);
-
         draw_congestion(g);
 
         draw_routing_costs(g);

vpr/src/draw/draw_basic.cpp

@@ -582,9 +582,7 @@ void draw_routed_net(ParentNetId net_id, ezgl::renderer* g) {
             draw_state->draw_rr_node[inode].node_highlighted = true;
         } else {
             // If not highlighted, draw the node in default color.
-            if (!draw_state->draw_rr_node[inode].node_highlighted) {
-                draw_state->draw_rr_node[inode].color = DEFAULT_RR_NODE_COLOR;
-            }
+            draw_state->draw_rr_node[inode].color = DEFAULT_RR_NODE_COLOR;
         }
 
         // When drawing a new branch, add the parent node to the vector to ensure that the conenction is drawn.

vpr/src/draw/draw_basic.h

@@ -29,9 +29,10 @@
  * Blocks are drawn in layer order (so that semi-transparent blocks/grids render well)*/
 void drawplace(ezgl::renderer* g);
 
-/* This routine draws the nets on the placement.  The nets have not *
- * yet been routed, so we just draw a chain showing a possible path *
- * for each net.  This gives some idea of future congestion.        */
+/** This routine draws the nets on the placement.  The nets have not
+ * yet been routed, so we just draw a chain showing a possible path
+ * for each net.  This gives some idea of future congestion. 
+ * This function may be deprecated. draw_logical_connections() is preferred. */
 void draw_flylines_placement(ezgl::renderer* g);
 
 /* Draws all the overused routing resources (i.e. congestion) in various contrasting colors showing congestion ratio.  */

vpr/src/draw/draw_rr.cpp

@@ -336,10 +336,10 @@ void draw_rr_edges(RRNodeId inode, ezgl::renderer* g) {
         // Need to check both highlighting and hit nodes since when the user clicks off a node, the node is de-highlighted but still in the hit nodes.
         if (draw_state->highlight_rr_edges) {
             if (draw_state->draw_rr_node[inode].node_highlighted && draw_state->hit_nodes.find(inode) != draw_state->hit_nodes.end()) {
-                color = draw_state->draw_rr_node[to_node].color;
+                color = ezgl::RED;
                 draw_edge = true;
             } else if (draw_state->draw_rr_node[to_node].node_highlighted && draw_state->hit_nodes.find(to_node) != draw_state->hit_nodes.end()) {
-                color = draw_state->draw_rr_node[inode].color;
+                color = ezgl::BLUE;
                 draw_edge = true;
             }
         }