pcbnew: Separating connectivity to subdir

common/CMakeLists.txt

@@ -439,8 +439,8 @@ set( PCB_COMMON_SRCS
     ../pcbnew/class_track.cpp
     ../pcbnew/class_zone.cpp
     ../pcbnew/collectors.cpp
-    ../pcbnew/connectivity_algo.cpp
-    ../pcbnew/connectivity_data.cpp
+    ../pcbnew/connectivity/connectivity_algo.cpp
+    ../pcbnew/connectivity/connectivity_data.cpp
     ../pcbnew/convert_drawsegment_list_to_polygon.cpp
     ../pcbnew/drc_item.cpp
     ../pcbnew/eagle_plugin.cpp

pcbnew/CMakeLists.txt

@@ -10,6 +10,8 @@ endif()
 
 add_definitions( -DPCBNEW )
 
+add_subdirectory(connectivity)
+
 add_subdirectory(router)
 
 # psnrouter depends on make_lexer outputs in common (bug # 1285878 )
@@ -677,6 +679,7 @@ set( PCBNEW_KIFACE_LIBRARIES
     idf3
     legacy_wx
     3d-viewer
+    connectivity
     pcbcommon
     pnsrouter
     pcad2kicadpcb

pcbnew/autorouter/ar_autoplacer.cpp

@@ -42,7 +42,7 @@
 
 #include <board_commit.h>
 
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <ratsnest_data.h>
 
 #include <widgets/progress_reporter.h>

pcbnew/autorouter/ar_autoplacer.h

@@ -35,7 +35,7 @@
 #include <class_board.h>
 #include <class_module.h>
 
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 #include <view/view_overlay.h>
 

pcbnew/block.cpp

@@ -50,7 +50,7 @@
 #include <pcbnew.h>
 #include <protos.h>
 
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 #define BLOCK_OUTLINE_COLOR YELLOW
 

pcbnew/board_commit.cpp

@@ -26,12 +26,11 @@
 #include <class_module.h>
 #include <pcb_edit_frame.h>
 #include <tool/tool_manager.h>
-#include <ratsnest_data.h>
 #include <view/view.h>
 #include <board_commit.h>
 #include <tools/pcb_tool.h>
 #include <tools/pcb_actions.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 #include <functional>
 using namespace std::placeholders;

pcbnew/board_connected_item.cpp

@@ -34,7 +34,7 @@
 #include <class_board.h>
 #include <class_board_item.h>
 
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 BOARD_CONNECTED_ITEM::BOARD_CONNECTED_ITEM( BOARD_ITEM* aParent, KICAD_T idtype ) :
     BOARD_ITEM( aParent, idtype ), m_netinfo( &NETINFO_LIST::ORPHANED_ITEM )

pcbnew/board_netlist_updater.cpp

@@ -41,7 +41,7 @@
 #include <class_zone.h>
 
 #include <pcb_netlist.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <reporter.h>
 
 #include <board_netlist_updater.h>

pcbnew/class_board.cpp

@@ -58,7 +58,7 @@
 #include <class_pcb_text.h>
 #include <class_pcb_target.h>
 #include <class_dimension.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 
 /**

pcbnew/connectivity/CMakeLists.txt

@@ -0,0 +1,16 @@
+include_directories( BEFORE ${INC_BEFORE} )
+
+include_directories(
+    ./
+    ../
+    ../../include
+    ../../polygon
+    ${INC_AFTER}
+)
+
+set( PCBNEW_CONN_SRCS
+    connectivity_algo.cpp
+    connectivity_data.cpp
+)
+
+add_library( connectivity STATIC ${PCBNEW_CONN_SRCS} )

pcbnew/connectivity/connectivity_algo.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <connectivity_algo.h>
+#include <connectivity/connectivity_algo.h>
 #include <widgets/progress_reporter.h>
 #include <geometry/geometry_utils.h>
 

pcbnew/connectivity/connectivity_algo.h

@@ -43,8 +43,8 @@
 #include <deque>
 #include <intrusive_list.h>
 
-#include <connectivity_rtree.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_rtree.h>
+#include <connectivity/connectivity_data.h>
 
 class CN_ITEM;
 class CN_CONNECTIVITY_ALGO_IMPL;

pcbnew/connectivity/connectivity_data.cpp

@@ -29,8 +29,8 @@
 #include <thread>
 #include <algorithm>
 
-#include <connectivity_data.h>
-#include <connectivity_algo.h>
+#include <connectivity/connectivity_data.h>
+#include <connectivity/connectivity_algo.h>
 #include <ratsnest_data.h>
 
 CONNECTIVITY_DATA::CONNECTIVITY_DATA()

pcbnew/deltrack.cpp

@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <pcb_edit_frame.h>
 #include <macros.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 #include <class_board.h>
 #include <class_track.h>

pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp

@@ -26,7 +26,7 @@
 #include <pcb_edit_frame.h>
 #include <class_drawpanel.h>
 #include <class_board.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <view/view.h>
 #include <pcb_layer_box_selector.h>
 

pcbnew/dialogs/dialog_netlist.cpp

@@ -43,7 +43,7 @@
 #include <board_design_settings.h>
 #include <class_board.h>
 #include <class_module.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <wildcards_and_files_ext.h>
 
 #include <dialog_netlist.h>

pcbnew/dialogs/dialog_select_net_from_list.cpp

@@ -40,7 +40,7 @@
 #include <view/view.h>
 #include <view/view_controls.h>
 #include <pcb_painter.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 class DIALOG_SELECT_NET_FROM_LIST: public DIALOG_SELECT_NET_FROM_LIST_BASE
 {

pcbnew/dialogs/dialog_track_via_properties.cpp

@@ -29,7 +29,7 @@
 #include <class_track.h>
 #include <pcb_edit_frame.h>
 #include <confirm.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <class_module.h>
 #include <widgets/net_selector.h>
 #include <board_commit.h>

pcbnew/dragsegm.cpp

@@ -41,7 +41,7 @@
 
 #include <class_module.h>
 #include <class_board.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 /* a list of DRAG_SEGM_PICKER items used to move or drag tracks */
 std::vector<DRAG_SEGM_PICKER> g_DragSegmentList;

pcbnew/drc.cpp

@@ -43,8 +43,8 @@
 #include <geometry/seg.h>
 #include <math_for_graphics.h>
 #include <geometry/geometry_utils.h>
-#include <connectivity_data.h>
-#include <connectivity_algo.h>
+#include <connectivity/connectivity_data.h>
+#include <connectivity/connectivity_algo.h>
 
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>

pcbnew/edit.cpp

@@ -53,7 +53,7 @@
 #include <dialog_drc.h>
 #include <invoke_pcb_dialog.h>
 #include <array_creator.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 #include <zone_filler.h>
 

pcbnew/editrack-part2.cpp

@@ -43,7 +43,7 @@
 #include <pcbnew.h>
 #include <drc.h>
 
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 
 bool PCB_EDIT_FRAME::Other_Layer_Route( TRACK* aTrack, wxDC* DC )

pcbnew/editrack.cpp

@@ -40,7 +40,7 @@
 #include <class_board.h>
 #include <class_track.h>
 #include <class_zone.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 
 
 static void Abort_Create_Track( EDA_DRAW_PANEL* panel, wxDC* DC );