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

Fix up erc json a little

This commit is contained in:
Marek Roszko 2023-08-13 19:10:26 -04:00
parent 061d18cbb0
commit 87d36dbfd8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/rc_item.cpp
View File

@ -162,7 +162,7 @@ void RC_ITEM::GetJsonViolation( RC_JSON::VIOLATION& aViolation, UNITS_PROVIDER*
wxString severity = getSeverityString( aSeverity ); wxString severity = getSeverityString( aSeverity );
aViolation.severity = severity; aViolation.severity = severity;
aViolation.description = GetViolatingRuleDesc(); aViolation.description = GetErrorMessage();
aViolation.type = GetSettingsKey(); aViolation.type = GetSettingsKey();
EDA_ITEM* mainItem = nullptr; EDA_ITEM* mainItem = nullptr;

2
eeschema/erc_report.cpp
View File

@ -129,7 +129,7 @@ bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName )
{ {
RC_JSON::ERC_SHEET jsonSheet; RC_JSON::ERC_SHEET jsonSheet;
jsonSheet.path = sheetList[i].PathHumanReadable(); jsonSheet.path = sheetList[i].PathHumanReadable();
jsonSheet.uuid = sheetList[i].Path().AsString(); jsonSheet.uuid_path = sheetList[i].Path().AsString();
for( SCH_ITEM* aItem : sheetList[i].LastScreen()->Items().OfType( SCH_MARKER_T ) ) for( SCH_ITEM* aItem : sheetList[i].LastScreen()->Items().OfType( SCH_MARKER_T ) )
{ {

4
include/rc_json_schema.h
View File

@ -81,12 +81,12 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( DRC_REPORT, source, date, kicad_version, vio
struct ERC_SHEET struct ERC_SHEET
{ {
wxString uuid; wxString uuid_path;
wxString path; wxString path;
std::vector<VIOLATION> violations; std::vector<VIOLATION> violations;
}; };
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( ERC_SHEET, uuid, path, violations ) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE( ERC_SHEET, uuid_path, path, violations )
struct ERC_REPORT : REPORT_BASE struct ERC_REPORT : REPORT_BASE
{ {