haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ERC items to their own directory

This commit is contained in:
Seth Hillbrand 2024-05-03 11:11:16 -07:00
parent 71b020eb14
commit 2139789c4c
34 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/CMakeLists.txt
View File

@ -323,8 +323,17 @@ set( SYNC_SHEET_PIN_SRCS
sync_sheet_pin/sheet_synchronization_model.cpp sync_sheet_pin/sheet_synchronization_model.cpp
) )
set( EESCHEMA_ERC_SRCS
erc/erc.cpp
erc/erc_item.cpp
erc/erc_report.cpp
erc/erc_sch_pin_context.cpp
erc/erc_settings.cpp
)
set( EESCHEMA_SRCS set( EESCHEMA_SRCS
${EESCHEMA_DLGS} ${EESCHEMA_DLGS}
${EESCHEMA_ERC_SRCS}
${EESCHEMA_LIBEDIT_SRCS} ${EESCHEMA_LIBEDIT_SRCS}
${EESCHEMA_SCH_IO} ${EESCHEMA_SCH_IO}
${EESCHEMA_SIM_SRCS} ${EESCHEMA_SIM_SRCS}
@ -342,11 +351,6 @@ set( EESCHEMA_SRCS
eeschema_helpers.cpp eeschema_helpers.cpp
eeschema_jobs_handler.cpp eeschema_jobs_handler.cpp
eeschema_settings.cpp eeschema_settings.cpp
erc.cpp
erc_item.cpp
erc_report.cpp
erc_sch_pin_context.cpp
erc_settings.cpp
fields_data_model.cpp fields_data_model.cpp
fields_grid_table.cpp fields_grid_table.cpp
files-io.cpp files-io.cpp

2
eeschema/annotate.cpp
View File

@ -28,7 +28,7 @@
#include <sch_edit_frame.h> #include <sch_edit_frame.h>
#include <schematic.h> #include <schematic.h>
#include <sch_commit.h> #include <sch_commit.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <sch_reference_list.h> #include <sch_reference_list.h>
#include <symbol_library.h> #include <symbol_library.h>
#include <tools/ee_selection.h> #include <tools/ee_selection.h>

2
eeschema/connection_graph.cpp
View File

@ -28,7 +28,7 @@
#include <core/kicad_algo.h> #include <core/kicad_algo.h>
#include <common.h> #include <common.h>
#include <core/kicad_algo.h> #include <core/kicad_algo.h>
#include <erc.h> #include <erc/erc.h>
#include <pin_type.h> #include <pin_type.h>
#include <sch_bus_entry.h> #include <sch_bus_entry.h>
#include <sch_symbol.h> #include <sch_symbol.h>

2
eeschema/connection_graph.h
View File

@ -26,7 +26,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <sch_connection.h> #include <sch_connection.h>
#include <sch_item.h> #include <sch_item.h>
#include <wx/treectrl.h> #include <wx/treectrl.h>

6
eeschema/dialogs/dialog_erc.cpp
View File

@ -37,14 +37,14 @@
#include <tools/ee_actions.h> #include <tools/ee_actions.h>
#include <tools/ee_inspection_tool.h> #include <tools/ee_inspection_tool.h>
#include <dialog_erc.h> #include <dialog_erc.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <id.h> #include <id.h>
#include <confirm.h> #include <confirm.h>
#include <common.h> #include <common.h>
#include <widgets/wx_html_report_box.h> #include <widgets/wx_html_report_box.h>
#include <dialogs/dialog_text_entry.h> #include <dialogs/dialog_text_entry.h>
#include <erc_item.h> #include <erc/erc_item.h>
#include <eeschema_settings.h> #include <eeschema_settings.h>
#include <string_utils.h> #include <string_utils.h>
#include <kiplatform/ui.h> #include <kiplatform/ui.h>

2
eeschema/dialogs/dialog_schematic_setup.cpp
View File

@ -27,7 +27,7 @@
#include <dialogs/panel_setup_buses.h> #include <dialogs/panel_setup_buses.h>
#include <panel_setup_formatting.h> #include <panel_setup_formatting.h>
#include <panel_setup_pinmap.h> #include <panel_setup_pinmap.h>
#include <erc_item.h> #include <erc/erc_item.h>
#include <panel_text_variables.h> #include <panel_text_variables.h>
#include <panel_bom_presets.h> #include <panel_bom_presets.h>
#include <project/project_file.h> #include <project/project_file.h>

2
eeschema/dialogs/panel_setup_pinmap.cpp
View File

@ -30,7 +30,7 @@
#include <tools/ee_actions.h> #include <tools/ee_actions.h>
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <panel_setup_pinmap.h> #include <panel_setup_pinmap.h>
#include <erc.h> #include <erc/erc.h>
#include <id.h> #include <id.h>
#include <wx/bmpbuttn.h> #include <wx/bmpbuttn.h>
#include <wx/statline.h> #include <wx/statline.h>

2
eeschema/dialogs/panel_setup_pinmap.h
View File

@ -26,7 +26,7 @@
#define _PANEL_SETUP_PINMAP_H_ #define _PANEL_SETUP_PINMAP_H_
#include <sch_pin.h> // For PINTYPE_COUNT definition #include <sch_pin.h> // For PINTYPE_COUNT definition
#include <erc_settings.h> #include <erc/erc_settings.h>
#include "panel_setup_pinmap_base.h" #include "panel_setup_pinmap_base.h"

4
eeschema/eeschema_jobs_handler.cpp
View File

@ -40,8 +40,8 @@
#include <kiway.h> #include <kiway.h>
#include <sch_painter.h> #include <sch_painter.h>
#include <locale_io.h> #include <locale_io.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <plotters/plotters_pslike.h> #include <plotters/plotters_pslike.h>
#include <drawing_sheet/ds_data_model.h> #include <drawing_sheet/ds_data_model.h>

4
eeschema/erc.cpp → eeschema/erc/erc.cpp
View File

@ -30,8 +30,8 @@
#include "kiface_ids.h" #include "kiface_ids.h"
#include <advanced_config.h> #include <advanced_config.h>
#include <common.h> // for ExpandEnvVarSubstitutions #include <common.h> // for ExpandEnvVarSubstitutions
#include <erc.h> #include <erc/erc.h>
#include <erc_sch_pin_context.h> #include <erc/erc_sch_pin_context.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>
#include <string_utils.h> #include <string_utils.h>
#include <sch_pin.h> #include <sch_pin.h>

2
eeschema/erc.h → eeschema/erc/erc.h
View File

@ -26,7 +26,7 @@
#ifndef ERC_H #ifndef ERC_H
#define ERC_H #define ERC_H
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <vector> #include <vector>
#include <map> #include <map>

2
eeschema/erc_item.cpp → eeschema/erc/erc_item.cpp
View File

@ -24,7 +24,7 @@
#include "wx/html/m_templ.h" #include "wx/html/m_templ.h"
#include "wx/html/styleparams.h" #include "wx/html/styleparams.h"
#include <erc.h> #include <erc/erc.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <marker_base.h> #include <marker_base.h>
#include <sch_edit_frame.h> #include <sch_edit_frame.h>

0
eeschema/erc_item.h → eeschema/erc/erc_item.h
View File

2
eeschema/erc_report.cpp → eeschema/erc/erc_report.cpp
View File

@ -27,7 +27,7 @@
#include <build_version.h> #include <build_version.h>
#include "erc_report.h" #include "erc_report.h"
#include <eda_units.h> #include <eda_units.h>
#include <erc.h> #include <erc/erc.h>
#include <fstream> #include <fstream>
#include <macros.h> #include <macros.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

0
eeschema/erc_report.h → eeschema/erc/erc_report.h
View File

2
eeschema/erc_sch_pin_context.cpp → eeschema/erc/erc_sch_pin_context.cpp
View File

@ -27,7 +27,7 @@
* @file erc_sch_pin_context.cpp * @file erc_sch_pin_context.cpp
*/ */
#include <erc_sch_pin_context.h> #include <erc/erc_sch_pin_context.h>
SCH_PIN* ERC_SCH_PIN_CONTEXT::Pin() SCH_PIN* ERC_SCH_PIN_CONTEXT::Pin()

0
eeschema/erc_sch_pin_context.h → eeschema/erc/erc_sch_pin_context.h
View File

4
eeschema/erc_settings.cpp → eeschema/erc/erc_settings.cpp
View File

@ -18,8 +18,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <erc_item.h> #include <erc/erc_item.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <schematic.h> #include <schematic.h>
#include <sch_marker.h> #include <sch_marker.h>
#include <sch_screen.h> #include <sch_screen.h>

2
eeschema/erc_settings.h → eeschema/erc/erc_settings.h
View File

@ -22,7 +22,7 @@
#ifndef _ERC_SETTINGS_H #ifndef _ERC_SETTINGS_H
#define _ERC_SETTINGS_H #define _ERC_SETTINGS_H
#include <erc_item.h> #include <erc/erc_item.h>
#include <pin_type.h> #include <pin_type.h>
#include <settings/nested_settings.h> #include <settings/nested_settings.h>
#include <widgets/ui_common.h> #include <widgets/ui_common.h>

2
eeschema/netlist_exporters/netlist_generator.cpp
View File

@ -32,7 +32,7 @@
#include <reporter.h> #include <reporter.h>
#include <confirm.h> #include <confirm.h>
#include <kiway.h> #include <kiway.h>
#include <erc.h> #include <erc/erc.h>
#include <netlist.h> #include <netlist.h>
#include <netlist_exporter_base.h> #include <netlist_exporter_base.h>

4
eeschema/sch_marker.cpp
View File

@ -28,14 +28,14 @@
#include <bitmaps.h> #include <bitmaps.h>
#include <base_units.h> #include <base_units.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <sch_marker.h> #include <sch_marker.h>
#include <schematic.h> #include <schematic.h>
#include <widgets/ui_common.h> #include <widgets/ui_common.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <erc_item.h> #include <erc/erc_item.h>
#include <sch_screen.h> #include <sch_screen.h>
/// Factor to convert the maker unit shape to internal units: /// Factor to convert the maker unit shape to internal units:

2
eeschema/sch_marker.h
View File

@ -25,7 +25,7 @@
#ifndef TYPE_SCH_MARKER_H_ #ifndef TYPE_SCH_MARKER_H_
#define TYPE_SCH_MARKER_H_ #define TYPE_SCH_MARKER_H_
#include <erc_item.h> #include <erc/erc_item.h>
#include <sch_item.h> #include <sch_item.h>
#include <marker_base.h> #include <marker_base.h>

2
eeschema/sch_reference_list.cpp
View File

@ -37,7 +37,7 @@
#include <unordered_set> #include <unordered_set>
#include <string_utils.h> #include <string_utils.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <sch_symbol.h> #include <sch_symbol.h>
#include <sch_edit_frame.h> #include <sch_edit_frame.h>

2
eeschema/sch_reference_list.h
View File

@ -33,7 +33,7 @@
#include <sch_sheet_path.h> #include <sch_sheet_path.h>
#include <sch_symbol.h> #include <sch_symbol.h>
#include <sch_text.h> #include <sch_text.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
/** Schematic annotation scope options. */ /** Schematic annotation scope options. */

4
eeschema/sch_rule_area.cpp
View File

@ -27,8 +27,8 @@
#include <vector> #include <vector>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <erc_item.h> #include <erc/erc_item.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <geometry/shape_segment.h> #include <geometry/shape_segment.h>
#include <geometry/shape_simple.h> #include <geometry/shape_simple.h>
#include <sch_line.h> #include <sch_line.h>

2
eeschema/schematic.cpp
View File

@ -23,7 +23,7 @@
#include <core/ignore.h> #include <core/ignore.h>
#include <core/kicad_algo.h> #include <core/kicad_algo.h>
#include <ee_collectors.h> #include <ee_collectors.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <sch_marker.h> #include <sch_marker.h>
#include <project.h> #include <project.h>
#include <project/project_file.h> #include <project/project_file.h>

2
eeschema/tools/sch_editor_control.cpp
View File

@ -34,7 +34,7 @@
#include <dialogs/dialog_update_from_pcb.h> #include <dialogs/dialog_update_from_pcb.h>
#include <dialogs/hotkey_cycle_popup.h> #include <dialogs/hotkey_cycle_popup.h>
#include <project_rescue.h> #include <project_rescue.h>
#include <erc.h> #include <erc/erc.h>
#include <invoke_sch_dialog.h> #include <invoke_sch_dialog.h>
#include <string_utils.h> #include <string_utils.h>
#include <kiway.h> #include <kiway.h>

6
qa/tests/eeschema/erc/test_erc_global_labels.cpp
View File

@ -23,9 +23,9 @@
#include <connection_graph.h> #include <connection_graph.h>
#include <schematic.h> #include <schematic.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <locale_io.h> #include <locale_io.h>

6
qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp
View File

@ -23,9 +23,9 @@
#include <connection_graph.h> #include <connection_graph.h>
#include <schematic.h> #include <schematic.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <locale_io.h> #include <locale_io.h>

6
qa/tests/eeschema/erc/test_erc_label_not_connected.cpp
View File

@ -23,9 +23,9 @@
#include <connection_graph.h> #include <connection_graph.h>
#include <schematic.h> #include <schematic.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <locale_io.h> #include <locale_io.h>

6
qa/tests/eeschema/erc/test_erc_no_connect.cpp
View File

@ -23,9 +23,9 @@
#include <connection_graph.h> #include <connection_graph.h>
#include <schematic.h> #include <schematic.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <locale_io.h> #include <locale_io.h>

6
qa/tests/eeschema/erc/test_erc_rule_areas.cpp
View File

@ -23,9 +23,9 @@
#include <connection_graph.h> #include <connection_graph.h>
#include <schematic.h> #include <schematic.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <sch_rule_area.h> #include <sch_rule_area.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <locale_io.h> #include <locale_io.h>

6
qa/tests/eeschema/erc/test_erc_stacking_pins.cpp
View File

@ -23,9 +23,9 @@
#include <connection_graph.h> #include <connection_graph.h>
#include <schematic.h> #include <schematic.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
#include <erc.h> #include <erc/erc.h>
#include <erc_report.h> #include <erc/erc_report.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <locale_io.h> #include <locale_io.h>

2
qa/tests/eeschema/test_ee_item.cpp
View File

@ -46,7 +46,7 @@
#include <sch_sheet.h> #include <sch_sheet.h>
#include <sch_pin.h> #include <sch_pin.h>
#include <erc_settings.h> #include <erc/erc_settings.h>
class TEST_EE_ITEM_FIXTURE class TEST_EE_ITEM_FIXTURE
{ {