From d694bb59609311557d64afc0bd1b63706bd6ec06 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 11 Feb 2024 20:12:26 -0500 Subject: [PATCH] Use file name rather than path for erc/drc json and text reports --- eeschema/erc_report.cpp | 3 ++- pcbnew/drc/drc_report.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eeschema/erc_report.cpp b/eeschema/erc_report.cpp index ce3d2b4947..549f0d7592 100644 --- a/eeschema/erc_report.cpp +++ b/eeschema/erc_report.cpp @@ -114,7 +114,8 @@ bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName ) std::map itemMap; RC_JSON::ERC_REPORT reportHead; - reportHead.source = m_sch->GetFileName(); + wxFileName fn( m_sch->GetFileName() ); + reportHead.source = fn.GetFullName(); reportHead.date = GetISO8601CurrentDateTime(); reportHead.kicad_version = GetMajorMinorPatchVersion(); reportHead.coordinate_units = EDA_UNIT_UTILS::GetLabel( m_reportUnits ); diff --git a/pcbnew/drc/drc_report.cpp b/pcbnew/drc/drc_report.cpp index 6971379a6b..3a179317a6 100644 --- a/pcbnew/drc/drc_report.cpp +++ b/pcbnew/drc/drc_report.cpp @@ -58,7 +58,8 @@ bool DRC_REPORT::WriteTextReport( const wxString& aFullFileName ) BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings(); int count; - fprintf( fp, "** Drc report for %s **\n", TO_UTF8( m_board->GetFileName() ) ); + wxFileName fn( m_board->GetFileName() ); + fprintf( fp, "** Drc report for %s **\n", TO_UTF8( fn.GetFullName() ) ); fprintf( fp, "** Created on %s **\n", TO_UTF8( GetISO8601CurrentDateTime() ) ); @@ -120,7 +121,9 @@ bool DRC_REPORT::WriteJsonReport( const wxString& aFullFileName ) m_board->FillItemMap( itemMap ); RC_JSON::DRC_REPORT reportHead; - reportHead.source = m_board->GetFileName(); + + wxFileName fn( m_board->GetFileName() ); + reportHead.source = fn.GetFullName(); reportHead.date = GetISO8601CurrentDateTime(); reportHead.kicad_version = GetMajorMinorPatchVersion(); reportHead.coordinate_units = EDA_UNIT_UTILS::GetLabel( m_reportUnits );