pcbnew: Separating connectivity to subdir

7 years ago · 4460313104
48 changed files with 65 additions and 52 deletions
--- a/common/CMakeLists.txt
+++ b/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
--- a/pcbnew/CMakeLists.txt
+++ b/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
--- a/pcbnew/autorouter/ar_autoplacer.cpp
+++ b/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>
--- a/pcbnew/autorouter/ar_autoplacer.h
+++ b/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>

--- a/pcbnew/block.cpp
+++ b/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

--- a/pcbnew/board_commit.cpp
+++ b/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;
--- a/pcbnew/board_connected_item.cpp
+++ b/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 )
--- a/pcbnew/board_netlist_updater.cpp
+++ b/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>
--- a/pcbnew/class_board.cpp
+++ b/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>


 /**
--- a/pcbnew/connectivity/CMakeLists.txt
+++ b/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} )
--- a/pcbnew/connectivity/connectivity_algo.cpp
+++ b/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>

--- a/pcbnew/connectivity/connectivity_algo.h
+++ b/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;
--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/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()
--- a/pcbnew/connectivity/connectivity_data.h
+++ b/pcbnew/connectivity/connectivity_data.h
--- a/pcbnew/connectivity/connectivity_rtree.h
+++ b/pcbnew/connectivity/connectivity_rtree.h
--- a/pcbnew/deltrack.cpp
+++ b/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>
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/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>

--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/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>
--- a/pcbnew/dialogs/dialog_select_net_from_list.cpp
+++ b/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
 {
--- a/pcbnew/dialogs/dialog_track_via_properties.cpp
+++ b/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>
--- a/pcbnew/dragsegm.cpp
+++ b/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;
--- a/pcbnew/drc.cpp
+++ b/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>
--- a/pcbnew/edit.cpp
+++ b/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>

--- a/pcbnew/editrack-part2.cpp
+++ b/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 )
--- a/pcbnew/editrack.cpp
+++ b/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 );
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@ -50,7 +50,7 @@
 #include <wx/wfstream.h>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <memory.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 using namespace PCB_KEYS_T;

--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@ -29,7 +29,7 @@
 #include <worksheet_viewitem.h>
 #include <ratsnest_viewitem.h>
 #include <ratsnest_data.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 #include <colors_design_settings.h>
 #include <class_board.h>
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@ -60,7 +60,7 @@
 #include <class_board.h>
 #include <class_module.h>
 #include <worksheet_viewitem.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <ratsnest_viewitem.h>
 #include <wildcards_and_files_ext.h>
 #include <kicad_string.h>
--- a/pcbnew/pcb_footprint_edit_utils.cpp
+++ b/pcbnew/pcb_footprint_edit_utils.cpp
@ -43,7 +43,7 @@
 #include <drag.h>
 #include <dialog_get_footprint_by_name.h>

-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 static void MoveFootprint( EDA_DRAW_PANEL* aPanel, wxDC* aDC,
                           const wxPoint& aPosition, bool aErase );
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest.cpp
@ -40,7 +40,6 @@

 #include <pcbnew.h>

-#include <connectivity_data.h>
 #include <ratsnest_data.h>

 /**
--- a/pcbnew/ratsnest_data.cpp
+++ b/pcbnew/ratsnest_data.cpp
@ -40,8 +40,6 @@ using namespace std::placeholders;
 #include <algorithm>
 #include <limits>

-#include <connectivity_algo.h>
-
 static uint64_t getDistance( const CN_ANCHOR_PTR& aNode1, const CN_ANCHOR_PTR& aNode2 )
 {
    double  dx = ( aNode1->Pos().x - aNode2->Pos().x );
--- a/pcbnew/ratsnest_data.h
+++ b/pcbnew/ratsnest_data.h
@ -40,7 +40,7 @@
 #include <ttl/halfedge/hetriang.h>
 #include <ttl/halfedge/hetraits.h>

-#include <connectivity_algo.h>
+#include <connectivity/connectivity_algo.h>

 class BOARD;
 class BOARD_ITEM;
--- a/pcbnew/ratsnest_viewitem.cpp
+++ b/pcbnew/ratsnest_viewitem.cpp
@ -29,7 +29,6 @@

 #include <ratsnest_viewitem.h>
 #include <ratsnest_data.h>
-#include <connectivity_data.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <pcb_painter.h>
 #include <layers_id_colors_and_visibility.h>
--- a/pcbnew/specctra_import_export/specctra_import.cpp
+++ b/pcbnew/specctra_import_export/specctra_import.cpp
@ -44,7 +44,7 @@
 #include <class_track.h>
 #include <class_zone.h>
 #include <class_drawsegment.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <view/view.h>

 #include "specctra.h"
--- a/pcbnew/swig/connectivity.i
+++ b/pcbnew/swig/connectivity.i
@ -28,12 +28,12 @@
 // this shared_ptr line has to be before include connectivity_data.h.
 %shared_ptr(CONNECTIVITY_DATA)

-%include connectivity_data.h
+%include connectivity/connectivity_data.h

 


 %{
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 %}

--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@ -42,7 +42,7 @@
 #include <view/view_controls.h>
 #include <view/view.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <confirm.h>
 #include <bitmaps.h>
 #include <hotkeys.h>
--- a/pcbnew/tools/pcb_editor_control.cpp
+++ b/pcbnew/tools/pcb_editor_control.cpp
@ -45,7 +45,7 @@
 #include <pcb_draw_panel_gal.h>
 #include <class_module.h>
 #include <class_pcb_target.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <collectors.h>
 #include <zones_functions_for_undo_redo.h>
 #include <board_commit.h>
--- a/pcbnew/tools/pcbnew_control.cpp
+++ b/pcbnew/tools/pcbnew_control.cpp
@ -48,7 +48,7 @@
 #include <pcbnew_id.h>
 #include <pcb_edit_frame.h>
 #include <pcb_draw_panel_gal.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <tool/tool_manager.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <view/view_controls.h>
--- a/pcbnew/tools/point_editor.cpp
+++ b/pcbnew/tools/point_editor.cpp
@ -45,7 +45,7 @@ using namespace std::placeholders;
 #include <class_zone.h>
 #include <class_board.h>
 #include <class_module.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 #include "zone_filler.h"

--- a/pcbnew/tools/selection.cpp
+++ b/pcbnew/tools/selection.cpp
@ -49,7 +49,7 @@ using namespace std::placeholders;

 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 #include "selection_tool.h"
 #include "pcb_bright_box.h"
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@ -53,7 +53,7 @@ using namespace std::placeholders;
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
 #include <router/router_tool.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <footprint_viewer_frame.h>
 #include "tool_event_utils.h"

--- a/pcbnew/tools/zone_filler_tool.cpp
+++ b/pcbnew/tools/zone_filler_tool.cpp
@ -28,7 +28,7 @@

 #include <class_zone.h>
 #include <class_module.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <board_commit.h>

 #include <widgets/progress_reporter.h>
--- a/pcbnew/tracks_cleaner.cpp
+++ b/pcbnew/tracks_cleaner.cpp
@ -37,8 +37,8 @@
 #include <class_track.h>
 #include <dialog_cleaning_options.h>
 #include <board_commit.h>
-#include <connectivity_data.h>
-#include <connectivity_algo.h>
+#include <connectivity/connectivity_algo.h>
+#include <connectivity/connectivity_data.h>

 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
--- a/pcbnew/undo_redo.cpp
+++ b/pcbnew/undo_redo.cpp
@ -46,7 +46,7 @@ using namespace std::placeholders;
 #include <class_edge_mod.h>
 #include <origin_viewitem.h>

-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 #include <tools/selection_tool.h>
 #include <tools/pcbnew_control.h>
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@ -36,7 +36,7 @@
 #include <class_pcb_text.h>
 #include <class_pcb_target.h>

-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>
 #include <board_commit.h>

 #include <widgets/progress_reporter.h>
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@ -45,7 +45,7 @@
 #include <protos.h>
 #include <zones_functions_for_undo_redo.h>
 #include <drc.h>
-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 #include <widgets/progress_reporter.h>

--- a/pcbnew/zones_by_polygon_fill_functions.cpp
+++ b/pcbnew/zones_by_polygon_fill_functions.cpp
@ -46,7 +46,6 @@
 #include <pcbnew.h>
 #include <zones.h>

-#include <connectivity_data.h>
 #include <board_commit.h>

 #include <widgets/progress_reporter.h>
--- a/qa/qa_utils/pcb_test_frame.cpp
+++ b/qa/qa_utils/pcb_test_frame.cpp
@ -46,7 +46,7 @@
 #include <pcb_painter.h>
 #include <pcb_edit_frame.h>

-#include <connectivity_data.h>
+#include <connectivity/connectivity_data.h>

 #include <io_mgr.h>
 #include <set>