[ap draw] post rebase changes

Author: robluo

vpr/src/analytical_place/ap_draw_manager.cpp

@@ -41,7 +41,7 @@ void APDrawManager::update_graphics(unsigned int iteration, enum APDrawType draw
     } else {
         msg = "Analytical Placement";
     }
-    update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), ANALYTICAL_PLACEMENT, nullptr);
+    update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), e_pic_type::ANALYTICAL_PLACEMENT, nullptr);
 #else
     (void)iteration;
     (void)draw_type;

vpr/src/analytical_place/global_placer.cpp

@@ -461,21 +461,6 @@ PartialPlacement SimPLGlobalPlacer::place() {
                           *density_manager_,
                           pre_cluster_timing_manager_);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    update_screen(ScreenUpdatePriority::MAJOR, "Global Placement Complete", e_pic_type::ANALYTICAL_PLACEMENT, nullptr);
-=======
-
-#ifndef NO_GRAPHICS
-    // Final display of the last iteration's placement
-    get_draw_state_vars()->set_ap_partial_placement_ref(p_placement);
-    update_screen(ScreenUpdatePriority::MAJOR, "Global Placement Complete", ANALYTICAL_PLACEMENT, nullptr);
-    get_draw_state_vars()->clear_ap_partial_placement_ref();
-#endif
->>>>>>> dc6e76ac9 ([draw ap] ap draw working with the rest of the draw)
-=======
-    
->>>>>>> 5b2a7c445 ([ap draw] drawing manager)
     // Return the placement from the final iteration.
     return best_p_placement;
 }

vpr/src/draw/draw.cpp

@@ -313,7 +313,7 @@ void update_screen(ScreenUpdatePriority priority,
         state_change = true;
 
         if (draw_state->show_graphics) {
-            if (pic_on_screen_val == ANALYTICAL_PLACEMENT) {
+            if (pic_on_screen_val == e_pic_type::ANALYTICAL_PLACEMENT) {
                 set_initial_world_ap();
             } else {
                 set_initial_world();
@@ -672,7 +672,7 @@ void act_on_mouse_press(ezgl::application* app, GdkEventButton* event, double x,
              * fanins and fanouts are highlighted when you click on a block      *
              * attached to them.                                                 */
 
-            if (get_draw_state_vars()->pic_on_screen == ANALYTICAL_PLACEMENT) {
+            if (get_draw_state_vars()->pic_on_screen == e_pic_type::ANALYTICAL_PLACEMENT) {
                 // No selection in analytical placement mode yet
                 return;
             }