moved draw_route function out of draw_rr

Author: SamuelHo10

vpr/src/draw/draw.cpp

@@ -195,7 +195,11 @@ static void draw_main_canvas(ezgl::renderer* g) {
     } else { /* ROUTING on screen */
 
         if (draw_state->show_nets && draw_state->draw_nets == DRAW_ROUTED_NETS){
-            drawroute(ALL_NETS, g);
+            draw_route(ALL_NETS, g);
+
+            if(draw_state->highlight_fan_in_fan_out) {
+                draw_route(HIGHLIGHTED, g);
+            }
         }
 
         draw_rr(g);

vpr/src/draw/draw_basic.cpp

@@ -319,7 +319,7 @@ void draw_congestion(ezgl::renderer* g) {
             }
         }
         g->set_line_width(0);
-        drawroute(HIGHLIGHTED, g);
+        draw_route(HIGHLIGHTED, g);
 
         //Reset colors
         for (RRNodeId inode : congested_rr_nodes) {
@@ -533,7 +533,7 @@ void draw_x(float x, float y, float size, ezgl::renderer* g) {
 /* Draws the nets in the positions fixed by the router.  If draw_net_type is *
  * ALL_NETS, draw all the nets.  If it is HIGHLIGHTED, draw only the nets    *
  * that are not coloured black (useful for drawing over the rr_graph).       */
-void drawroute(enum e_draw_net_type draw_net_type, ezgl::renderer* g) {
+void draw_route(enum e_draw_net_type draw_net_type, ezgl::renderer* g) {
     /* Next free track in each channel segment if routing is GLOBAL */
 
     auto& cluster_ctx = g_vpr_ctx.clustering();
@@ -615,6 +615,7 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
 
         bool inter_cluster_node = is_inter_cluster_node(rr_graph, inode);
 
+        
         if(inter_cluster_node && !draw_state->draw_inter_cluster_nets){
             continue;
         }

vpr/src/draw/draw_basic.h

@@ -49,7 +49,7 @@ void draw_x(float x, float y, float size, ezgl::renderer* g);
 /* Draws the nets in the positions fixed by the router.  If draw_net_type is *
  * ALL_NETS, draw all the nets.  If it is HIGHLIGHTED, draw only the nets    *
  * that are not coloured black (useful for drawing over the rr_graph).       */
-void drawroute(enum e_draw_net_type draw_net_type, ezgl::renderer* g);
+void draw_route(enum e_draw_net_type draw_net_type, ezgl::renderer* g);
 
 void draw_routed_net(ParentNetId net, ezgl::renderer* g);
 

vpr/src/draw/draw_rr.cpp

@@ -46,9 +46,6 @@ void draw_rr(ezgl::renderer* g) {
     const auto& rr_graph = device_ctx.rr_graph;
 
     if (!draw_state->show_rr) {
-        g->set_line_width(3);
-        drawroute(HIGHLIGHTED, g);
-        g->set_line_width(0);
         return;
     }
 
@@ -95,7 +92,6 @@ void draw_rr(ezgl::renderer* g) {
         draw_rr_node(inode, draw_state->draw_rr_node[inode].color, g);
     }
 
-    drawroute(HIGHLIGHTED, g);
 }
 
 void draw_rr_chan(RRNodeId inode, const ezgl::color color, ezgl::renderer* g) {

vpr/src/draw/draw_rr.h

@@ -17,8 +17,10 @@
 
 #include "ezgl/graphics.hpp"
 
-/* Draws the routing resources that exist in the FPGA, if the user wants *
- * them drawn. */
+/** 
+ * @brief Draws the routing resources that exist in the FPGA, if the user wants
+ * them drawn. 
+ */
 void draw_rr(ezgl::renderer* g);
 
 /* Draws all the edges that the user wants shown between inode and what it