Changed the manual move toggle button in layout

Author: Paula

vpr/main.ui

@@ -192,7 +192,7 @@
             <property name="height">1</property>
           </packing>
         </child>
-        <child>
+         <child>
           <object class="GtkGrid" id="checkboxes">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -247,7 +247,6 @@
                 <property name="height">1</property>
               </packing>
             </child>
-      <!-- Newly added code for manual moves -->
             <child>
               <object class="GtkCheckButton" id="manualMove">
                 <property name="label" translatable="yes">Manual Move</property>
@@ -263,7 +262,7 @@
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
-            </child>
+            </child>   
 
           </object>
           <packing>

vpr/src/draw/manual_moves.cpp

@@ -20,6 +20,7 @@ void draw_manual_moves_window(std::string block_id) {
 		manual_moves_global.manual_move_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		gtk_window_set_position((GtkWindow*) manual_moves_global.manual_move_window, GTK_WIN_POS_CENTER);
 		gtk_window_set_title((GtkWindow*) manual_moves_global.manual_move_window, "Manual Moves Generator");
+		gtk_widget_set_name(manual_moves_global.manual_move_window, "manual_move_window");
 
 		GtkWidget *grid = gtk_grid_new();
 		GtkWidget *block_entry = gtk_entry_new();
@@ -29,16 +30,16 @@ void draw_manual_moves_window(std::string block_id) {
 			manual_moves_global.user_highlighted_block = false;
 		}
 
-		GtkWidget *x_position_entry = gtk_entry_new();
-		GtkWidget *y_position_entry = gtk_entry_new();
-		GtkWidget *subtile_position_entry = gtk_entry_new();
-		GtkWidget *block_label = gtk_label_new("Block ID/Block Name:");
-		GtkWidget *to_label = gtk_label_new("To Location:");
-		GtkWidget *x = gtk_label_new("x:");
-		GtkWidget *y = gtk_label_new("y:");
-		GtkWidget *subtile = gtk_label_new("Subtile:");
+		GtkWidget* x_position_entry = gtk_entry_new();
+		GtkWidget* y_position_entry = gtk_entry_new();
+		GtkWidget* subtile_position_entry = gtk_entry_new();
+		GtkWidget* block_label = gtk_label_new("Block ID/Block Name:");
+		GtkWidget* to_label = gtk_label_new("To Location:");
+		GtkWidget* x = gtk_label_new("x:");
+		GtkWidget* y = gtk_label_new("y:");
+		GtkWidget* subtile = gtk_label_new("Subtile:");
 
-		GtkWidget *calculate_cost_button = gtk_button_new_with_label("Calculate Costs");
+		GtkWidget* calculate_cost_button = gtk_button_new_with_label("Calculate Costs");
 
 		//Add all to grid
 		gtk_grid_attach((GtkGrid*)grid, block_label, 0, 0, 1, 1);
@@ -65,8 +66,9 @@ void draw_manual_moves_window(std::string block_id) {
 		gtk_widget_set_halign(calculate_cost_button, GTK_ALIGN_CENTER);
 
 		//connect signals
-		g_signal_connect(G_OBJECT(manual_moves_global.manual_move_window), "destroy", G_CALLBACK(close_manual_moves_window), NULL);
 		g_signal_connect(calculate_cost_button, "clicked", G_CALLBACK(calculate_cost_callback), grid);
+		g_signal_connect(G_OBJECT(manual_moves_global.manual_move_window), "destroy", G_CALLBACK(close_manual_moves_window), NULL);
+
 
 		gtk_container_add(GTK_CONTAINER(manual_moves_global.manual_move_window), grid);
 		gtk_widget_show_all(manual_moves_global.manual_move_window);
@@ -202,12 +204,6 @@ e_create_move ManualMoveGenerator::propose_move(
 		return e_create_move::ABORT;
 	}
 
-	/*std::cout << "The to subtile: " << to.sub_tile << std::endl;
-	for(auto itr = compatible_subtiles.begin(); itr != compatible_subtiles.end(); itr++) {
-		std::cout << *itr << std::endl;
-	}*/
-
-
 	e_create_move create_move = ::create_move(blocks_affected, b_from, to);
 	return create_move;
 

vpr/src/place/move_utils.cpp

@@ -450,12 +450,15 @@ bool is_legal_swap_to_location(ClusterBlockId blk, t_pl_loc to) {
     auto& device_ctx = g_vpr_ctx.device();
     auto& cluster_ctx = g_vpr_ctx.clustering();
     auto& place_ctx = g_vpr_ctx.placement();
+
+    //For manual moves feature
     GObject* manual_move_toggle = application.get_object("manualMove");
+    bool activated = gtk_toggle_button_get_active((GtkToggleButton*)manual_move_toggle);
 
 
     if (to.x < 0 || to.x >= int(device_ctx.grid.width())
         || to.y < 0 || to.y >= int(device_ctx.grid.height())) {
-    	if(gtk_toggle_button_get_active((GtkToggleButton*)manual_move_toggle)) {
+    	if(activated) {
     		invalid_breakpoint_entry_window("Dimensions are out of bounds");
     	}
         return false;
@@ -466,7 +469,7 @@ bool is_legal_swap_to_location(ClusterBlockId blk, t_pl_loc to) {
 
     if (to.sub_tile < 0 || to.sub_tile >= physical_tile->capacity
         || !is_sub_tile_compatible(physical_tile, logical_block, to.sub_tile)) {
-    	if(gtk_toggle_button_get_active((GtkToggleButton*)manual_move_toggle)) {
+    	if(activated) {
     		invalid_breakpoint_entry_window("Blocks are not compatible");
     	}
         return false;
@@ -475,6 +478,9 @@ bool is_legal_swap_to_location(ClusterBlockId blk, t_pl_loc to) {
     auto b_to = place_ctx.grid_blocks[to.x][to.y].blocks[to.sub_tile];
     if (b_to != INVALID_BLOCK_ID && b_to != EMPTY_BLOCK_ID) {
         if (place_ctx.block_locs[b_to].is_fixed) {
+        	if(activated) {
+        		invalid_breakpoint_entry_window("Block is fixed");
+        	}
             return false;
         }
     }