fixed function which calculates max depth

Author: SamuelHo10

vpr/src/draw/draw_basic.cpp

@@ -613,29 +613,17 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
     auto& device_ctx = g_vpr_ctx.device();
     const auto& rr_graph = device_ctx.rr_graph;
 
-    static vtr::OffsetMatrix<int> chanx_track; /* [1..device_ctx.grid.width() - 2][0..device_ctx.grid.height() - 2] */
-    static vtr::OffsetMatrix<int> chany_track; /* [0..device_ctx.grid.width() - 2][1..device_ctx.grid.height() - 2] */
-    if (draw_state->draw_route_type == GLOBAL) {
-        /* Allocate some temporary storage if it's not already available. */
-        int width = (int)device_ctx.grid.width();
-        int height = (int)device_ctx.grid.height();
-        if (chanx_track.empty()) {
-            chanx_track = vtr::OffsetMatrix<int>({{{1, width - 1}, {0, height - 1}}});
-        }
-
-        if (chany_track.empty()) {
-            chany_track = vtr::OffsetMatrix<int>({{{0, width - 1}, {1, height - 1}}});
-        }
+    // Draw Pins
+    for (RRNodeId inode : rr_nodes_to_draw) {
+        
+        bool is_inode_inter_cluster = is_inter_cluster_node(rr_graph, inode);
 
-        for (int i = 1; i < width - 1; i++)
-            for (int j = 0; j < height - 1; j++)
-                chanx_track[i][j] = (-1);
 
-        for (int i = 0; i < width - 1; i++)
-            for (int j = 1; j < height - 1; j++)
-                chany_track[i][j] = (-1);
     }
 
+
+
+    // Draw Edges
     for (size_t i = 1; i < rr_nodes_to_draw.size(); ++i) {
         RRNodeId inode = rr_nodes_to_draw[i];
         auto rr_type = rr_graph.node_type(inode);
@@ -724,9 +712,6 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
                 break;
             }
             case e_rr_type::CHANX: {
-                if (draw_state->draw_route_type == GLOBAL)
-                    chanx_track[rr_graph.node_xlow(inode)][rr_graph.node_ylow(inode)]++;
-
                 draw_rr_chan(inode, color, g);
                 if (edge_visibility.visible) {
                     g->set_color(color, edge_visibility.alpha);
@@ -754,9 +739,6 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
                 break;
             }
             case e_rr_type::CHANY: {
-                if (draw_state->draw_route_type == GLOBAL)
-                    chany_track[rr_graph.node_xlow(inode)][rr_graph.node_ylow(inode)]++;
-
                 draw_rr_chan(inode, color, g);
 
                 if (edge_visibility.visible) {

vpr/src/draw/draw_toggle_functions.cpp

@@ -235,7 +235,7 @@ void toggle_blk_internal_cbk(GtkSpinButton* self, ezgl::application* app) {
     if (new_value < 0)
         draw_state->show_blk_internal = 0;
     else if (new_value >= draw_state->max_sub_blk_lvl)
-        draw_state->show_blk_internal = draw_state->max_sub_blk_lvl - 1;
+        draw_state->show_blk_internal = draw_state->max_sub_blk_lvl;
     else
         draw_state->show_blk_internal = new_value;
     app->refresh_drawing();

vpr/src/draw/intra_logic_block.cpp

@@ -198,7 +198,7 @@ void draw_internal_draw_subblk(ezgl::renderer* g) {
 static int draw_internal_find_max_lvl(const t_pb_type& pb_type) {
     int i, j;
     t_mode mode;
-    int max_levels = 1;
+    int max_levels = 0;
 
     /* If pb_type is a primitive, we have reached the end of pb_graph */
     if (pb_type.is_primitive())

vpr/src/draw/ui_setup.cpp

@@ -82,7 +82,7 @@ void block_button_setup(ezgl::application* app) {
     GtkSpinButton* blk_internals_button = GTK_SPIN_BUTTON(app->get_object("ToggleBlkInternals"));
     g_signal_connect(blk_internals_button, "value-changed", G_CALLBACK(toggle_blk_internal_cbk), app);
     gtk_spin_button_set_increments(blk_internals_button, 1, 1);
-    gtk_spin_button_set_range(blk_internals_button, 0., (double)(draw_state->max_sub_blk_lvl - 1));
+    gtk_spin_button_set_range(blk_internals_button, 0., (double)(draw_state->max_sub_blk_lvl));
 
     //Toggle Block Pin Util
     GtkComboBoxText* blk_pin_util = GTK_COMBO_BOX_TEXT(app->get_object("ToggleBlkPinUtil"));