vpr: Clean-up Draw RR combo box options

Author: kmurray

vpr/src/draw/buttons.cpp

@@ -253,7 +253,8 @@ void button_for_toggle_rr() {
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "None");
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "Nodes");
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "Nodes SBox");
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "All but Buffers");
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "Nodes SBox CBox");
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "Nodes SBox CBox Internal");
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_rr_widget), "All");
     gtk_combo_box_set_active((GtkComboBox*)toggle_rr_widget, 0); // default set to None which has an index 0
     gtk_widget_set_name(toggle_rr_widget, "toggle_rr");

vpr/src/draw/draw.cpp

@@ -580,8 +580,10 @@ void toggle_rr(GtkWidget* /*widget*/, gint /*response_id*/, gpointer /*data*/) {
         new_state = DRAW_NODES_RR;
     else if (strcmp(combo_box_content, "Nodes SBox") == 0)
         new_state = DRAW_NODES_SBOX_RR;
-    else if (strcmp(combo_box_content, "All but Buffers") == 0)
-        new_state = DRAW_ALL_BUT_BUFFERS_RR;
+    else if (strcmp(combo_box_content, "Nodes SBox CBox") == 0)
+        new_state = DRAW_NODES_SBOX_CBOX_RR;
+    else if (strcmp(combo_box_content, "Nodes SBox CBox Internal") == 0)
+        new_state = DRAW_NODES_SBOX_CBOX_INTERNAL_RR;
     else // all rr
         new_state = DRAW_ALL_RR;
 
@@ -1542,7 +1544,8 @@ static void draw_rr_edges(int inode, ezgl::renderer* g) {
     from_type = device_ctx.rr_nodes[inode].type();
 
     if ((draw_state->draw_rr_toggle == DRAW_NODES_RR)
-        || (draw_state->draw_rr_toggle == DRAW_NODES_SBOX_RR && from_type == OPIN)) {
+        || (draw_state->draw_rr_toggle == DRAW_NODES_SBOX_RR && (from_type == OPIN || from_type == SOURCE || from_type == IPIN))
+        || (draw_state->draw_rr_toggle == DRAW_NODES_SBOX_CBOX_RR && (from_type == SOURCE || from_type == IPIN))) {
         return; /* Nothing to draw. */
     }
 

vpr/src/draw/draw_types.h

@@ -53,7 +53,8 @@ enum e_draw_rr_toggle {
     DRAW_NO_RR = 0,
     DRAW_NODES_RR,
     DRAW_NODES_SBOX_RR,
-    DRAW_ALL_BUT_BUFFERS_RR,
+    DRAW_NODES_SBOX_CBOX_RR,
+    DRAW_NODES_SBOX_CBOX_INTERNAL_RR,
     DRAW_ALL_RR,
 };