Merge pull request #2102 from verilog-to-routing/Seb_Search

Search Update + NoC GUI Update

Author: vaughnbetz

vpr/main.ui

@@ -28,42 +28,6 @@ gint label_left_start_col = 0;
 gint box_left_start_col = 0;
 gint button_row = 2; // 2 is the row num of the window button in main.ui, add buttons starting from this row
 
-void button_for_displaying_noc() {
-    GObject* main_window = application.get_object(application.get_main_window_id().c_str());
-    GObject* main_window_grid = application.get_object("InnerGrid");
-    t_draw_state* draw_state = get_draw_state_vars();
-
-    // if the user did not turn on the "noc" option then we don't give the option to display the noc to the user
-    if (!draw_state->show_noc_button) {
-        return;
-    }
-
-    // if we are here then the user turned the "noc" option on, so create a button to allow the user to display the noc
-
-    //combo box for toggle_noc_display
-    GtkWidget* toggle_noc_display_widget = gtk_combo_box_text_new();
-    GtkWidget* toggle_noc_display_label = gtk_label_new("Toggle NoC Display:");
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_noc_display_widget), "None");
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_noc_display_widget), "NoC Links");
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(toggle_noc_display_widget), "NoC Link Usage");
-
-    gtk_combo_box_set_active((GtkComboBox*)toggle_noc_display_widget, 0); // default set to None which has an index 0
-    gtk_widget_set_name(toggle_noc_display_widget, "toggle_noc_display");
-
-    //attach to the grid
-    gtk_grid_attach((GtkGrid*)main_window_grid, toggle_noc_display_label, label_left_start_col, button_row++, box_width, box_height);
-    gtk_grid_attach((GtkGrid*)main_window_grid, toggle_noc_display_widget, box_left_start_col, button_row++, box_width, box_height);
-
-    // show the newy added check box
-    gtk_widget_show_all((GtkWidget*)main_window);
-
-    //connect signals
-    g_signal_connect_swapped(GTK_COMBO_BOX_TEXT(toggle_noc_display_widget),
-                             "changed",
-                             G_CALLBACK(toggle_noc_display),
-                             toggle_noc_display_widget);
-}
-
 void delete_button(const char* button_name) {
     GObject* main_window_grid = application.get_object("InnerGrid");
     GList* list_of_widgets = gtk_container_get_children(GTK_CONTAINER(main_window_grid));

vpr/src/draw/buttons.cpp

@@ -9,8 +9,6 @@
 #    include "ezgl/application.hpp"
 #    include "ezgl/graphics.hpp"
 
-void button_for_displaying_noc();
-
 void delete_button(const char* button_name);
 GtkWidget* find_button(const char* button_name);
 #endif /* NO_GRAPHICS */

vpr/src/draw/buttons.h

@@ -20,6 +20,7 @@
 #include <sstream>
 #include <array>
 #include <iostream>
+#include <time.h>
 
 #include "vtr_assert.h"
 #include "vtr_ndoffsetmatrix.h"
@@ -282,6 +283,7 @@ static void default_setup(ezgl::application* app) {
     basic_button_setup(app);
     net_button_setup(app);
     block_button_setup(app);
+    search_setup(app);
 }
 
 /* function below intializes the interface window with a set of buttons and links 
@@ -301,7 +303,6 @@ static void initial_setup_NO_PICTURE_to_PLACEMENT(ezgl::application* app,
     //Hiding unused functionality
     hide_widget("RoutingMenuButton", app);
     hide_crit_path_button(app);
-    button_for_displaying_noc();
 }
 
 /* function below intializes the interface window with a set of buttons and links 
@@ -356,7 +357,6 @@ static void initial_setup_NO_PICTURE_to_ROUTING(ezgl::application* app,
     default_setup(app);
     routing_button_setup(app);
     hide_crit_path_button(app);
-    button_for_displaying_noc();
 }
 
 /* function below intializes the interface window with a set of buttons and links 
@@ -670,19 +670,33 @@ bool draw_if_net_highlighted(ClusterNetId inet) {
     if (draw_state->net_color[inet] != DEFAULT_RR_NODE_COLOR) {
         return true;
     }
-
     return false;
 }
 
-#    if defined(X11) && !defined(__MINGW32__)
-void act_on_key_press(ezgl::application* /*app*/, GdkEventKey* /*event*/, char* key_name) {
-    //VTR_LOG("Key press %c (%d)\n", key_pressed, keysym);
+/**
+ * @brief cbk function for key press
+ * 
+ * At the moment, only does something if user is currently typing in searchBar and
+ * hits enter, at which point it runs autocomplete
+ */
+void act_on_key_press(ezgl::application* app, GdkEventKey* /*event*/, char* key_name) {
     std::string key(key_name);
+    GtkWidget* searchBar = GTK_WIDGET(app->get_object("TextInput"));
+    std::string text(gtk_entry_get_text(GTK_ENTRY(searchBar)));
+    t_draw_state* draw_state = get_draw_state_vars();
+    if (gtk_widget_is_focus(searchBar)) {
+        if (key == "Return") {
+            enable_autocomplete(app);
+            gtk_editable_set_position(GTK_EDITABLE(searchBar), text.length());
+            return;
+        }
+    }
+    if (draw_state->justEnabled) {
+        draw_state->justEnabled = false;
+    } else {
+        gtk_entry_set_completion(GTK_ENTRY(searchBar), nullptr);
+    }
 }
-#    else
-void act_on_key_press(ezgl::application* /*app*/, GdkEventKey* /*event*/, char* /*key_name*/) {
-}
-#    endif
 
 void act_on_mouse_press(ezgl::application* app, GdkEventButton* event, double x, double y) {
     //  std::cout << "User clicked the ";

vpr/src/draw/draw.cpp

@@ -406,15 +406,18 @@ void toggle_expansion_cost_cbk(GtkComboBoxText* self, ezgl::application* app) {
     app->refresh_drawing();
 }
 
-void toggle_noc_display(GtkWidget* /*widget*/, gint /*response_id*/, gpointer /*data*/) {
-    /* this is the callback function for runtime created toggle_noc_display button
-     * which is written in button.cpp                                         */
+/**
+ * @brief cbk fn to toggle Network-On-Chip (Noc) visibility
+ * alters draw_state->draw_noc to reflect new state
+ * Reacts to main.ui created combo box, setup in ui_setup.cpp
+ * 
+ * @param self ptr to combo box
+ * @param app ezgl application
+ */
+void toggle_noc_cbk(GtkComboBoxText* self, ezgl::application* app) {
     t_draw_state* draw_state = get_draw_state_vars();
-    std::string button_name = "toggle_noc_display";
-    auto toggle_crit_path = find_button(button_name.c_str());
 
-    gchar* combo_box_content = gtk_combo_box_text_get_active_text(
-        GTK_COMBO_BOX_TEXT(toggle_crit_path));
+    gchar* combo_box_content = gtk_combo_box_text_get_active_text(self);
     if (strcmp(combo_box_content, "None") == 0) {
         draw_state->draw_noc = DRAW_NO_NOC;
     } else if (strcmp(combo_box_content, "NoC Links") == 0)
@@ -423,7 +426,7 @@ void toggle_noc_display(GtkWidget* /*widget*/, gint /*response_id*/, gpointer /*
         draw_state->draw_noc = DRAW_NOC_LINK_USAGE;
 
     g_free(combo_box_content);
-    application.refresh_drawing();
+    app->refresh_drawing();
 }
 
 /**

vpr/src/draw/draw_toggle_functions.cpp

@@ -107,11 +107,10 @@ void toggle_crit_path_cbk(GtkComboBoxText* self, ezgl::application* app);
  * Draws different router expansion costs based on user input. Changes value of draw_state->show_router_expansion_cost. */
 void toggle_expansion_cost_cbk(GtkComboBoxText* self, ezgl::application* app);
 
-/* Callback function for runtime created toggle_noc_display 
- * in button.cpp.
+/* Callback function for main.ui created ToggleNocBox in ui_setup.cpp
  * Controls if the NoC on chip should be visualized and whether the link usage
  * in the NoC should be visualized. Changes value of draw_state->draw_noc */
-void toggle_noc_display(GtkWidget* widget, gint /*response_id*/, gpointer /*data*/);
+void toggle_noc_cbk(GtkComboBoxText* self, ezgl::application* app);
 
 /* Callback function for main.ui created netMaxFanout widget in button.cpp.
  * Sets draw_state->draw_net_max_fanout to its corresponding value in the UI. */

vpr/src/draw/draw_toggle_functions.h

@@ -217,6 +217,7 @@ struct t_draw_state {
     bool show_noc_button = false;
     e_draw_noc draw_noc = DRAW_NO_NOC;
     std::shared_ptr<const vtr::ColorMap> noc_usage_color_map = nullptr; // color map used to display noc link bandwidth usage
+    bool justEnabled = false;                                           //Whether auto-complete was just enabled
 
     std::vector<Breakpoint> list_of_breakpoints;