realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed post-rebase error with unit parsing.

Browse Source
This commit is contained in:
Daniel Treffenstädt 2025-06-15 15:10:01 +02:00
parent 42eb1dbff1
commit 5f4cffd934
No known key found for this signature in database
GPG Key ID: 3D92CAF477537F3E
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/drc/drc_test_provider_fanout_checks.cpp
View File

@ -60,11 +60,6 @@ public:
virtual bool Run() override;
virtual const wxString GetName() const override { return wxT( "pad_fanout" ); };
virtual const wxString GetDescription() const override
{
return wxT( "Tests Fanout width from pads" );
}
};
@ -75,7 +70,7 @@ bool DRC_TEST_PROVIDER_FANOUT_CHECKS::Run()
&& !m_drcEngine->HasRulesForConstraintType( FOOTPRINT_FANOUT_POINT_SYMMETRY_CONSTRAINT )
&& !m_drcEngine->HasRulesForConstraintType( PAD_FANOUT_VIA_DISTANCE_CONSTRAINT ) )
{
reportAux( wxT( "No fanout constraints found. Tests not run." ) );
REPORT_AUX( wxT( "No fanout constraints found. Tests not run." ) );
return true; // continue with other tests
}
@ -600,7 +595,6 @@ bool DRC_TEST_PROVIDER_FANOUT_CHECKS::Run()
}
}
reportRuleStatistics();
return !m_drcEngine->IsCancelled();
}

5
pcbnew/pcbexpr_evaluator.cpp
View File

@ -689,8 +689,9 @@ wxString PCBEXPR_UNIT_RESOLVER::GetSupportedUnitsMessage() const
const std::vector<EDA_UNITS>& PCBEXPR_UNIT_RESOLVER::GetSupportedUnitsTypes() const
{
static const std::vector<EDA_UNITS> pcbUnits = { EDA_UNITS::MILS, EDA_UNITS::MM, EDA_UNITS::INCH,
EDA_UNITS::FS, EDA_UNITS::PS, EDA_UNITS::DEGREES, EDA_UNITS::PERCENT };
static const std::vector<EDA_UNITS> pcbUnits = { EDA_UNITS::MILS, EDA_UNITS::MM, EDA_UNITS::INCH,
EDA_UNITS::FS, EDA_UNITS::PS, EDA_UNITS::DEGREES,
EDA_UNITS::UNSCALED, EDA_UNITS::PERCENT };
return pcbUnits;
}

4
qa/tests/pcbnew/drc/test_drc_fanout_checks.cpp
View File

@ -77,7 +77,7 @@ BOOST_FIXTURE_TEST_CASE( DRCFanoutChecks, DRC_REGRESSION_TEST_FIXTURE )
violations.push_back( *aItem );
} );
bds.m_DRCEngine->RunTests( EDA_UNITS::MILLIMETRES, true, false );
bds.m_DRCEngine->RunTests( EDA_UNITS::MM, true, false );
if( violations.size() == test.second )
{
@ -86,7 +86,7 @@ BOOST_FIXTURE_TEST_CASE( DRCFanoutChecks, DRC_REGRESSION_TEST_FIXTURE )
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCHES );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );