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

Zone fill: fix an issue that uses thermal spoke width as thermal gap. 

Fixes #10300
https://gitlab.com/kicad/code/kicad/issues/10300
This commit is contained in:
jean-pierre charras 2022-01-08 14:24:14 +01:00
parent 33dbe92deb
commit 2b20a58615
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/drc/drc_engine.cpp
View File

@ -833,15 +833,15 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
{ {
if( pad && pad->GetLocalThermalGapOverride( nullptr ) > 0 ) if( pad && pad->GetLocalThermalGapOverride( nullptr ) > 0 )
{ {
int override = pad->GetLocalThermalGapOverride( &m_msg ); int gap_override = pad->GetLocalThermalGapOverride( &m_msg );
REPORT( "" ) REPORT( "" )
REPORT( wxString::Format( _( "Local override on %s; thermal relief gap: %s." ), REPORT( wxString::Format( _( "Local override on %s; thermal relief gap: %s." ),
EscapeHTML( pad->GetSelectMenuText( UNITS ) ), EscapeHTML( pad->GetSelectMenuText( UNITS ) ),
EscapeHTML( REPORT_VALUE( override ) ) ) ) EscapeHTML( REPORT_VALUE( gap_override ) ) ) )
constraint.SetName( m_msg ); constraint.SetName( m_msg );
constraint.m_Value.SetMin( override ); constraint.m_Value.SetMin( gap_override );
return constraint; return constraint;
} }
} }
@ -849,25 +849,25 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
{ {
if( pad && pad->GetLocalSpokeWidthOverride( nullptr ) > 0 ) if( pad && pad->GetLocalSpokeWidthOverride( nullptr ) > 0 )
{ {
int override = pad->GetLocalSpokeWidthOverride( &m_msg ); int spoke_override = pad->GetLocalSpokeWidthOverride( &m_msg );
REPORT( "" ) REPORT( "" )
REPORT( wxString::Format( _( "Local override on %s; thermal spoke width: %s." ), REPORT( wxString::Format( _( "Local override on %s; thermal spoke width: %s." ),
EscapeHTML( pad->GetSelectMenuText( UNITS ) ), EscapeHTML( pad->GetSelectMenuText( UNITS ) ),
EscapeHTML( REPORT_VALUE( override ) ) ) ) EscapeHTML( REPORT_VALUE( spoke_override ) ) ) )
if( zone && zone->GetMinThickness() > override ) if( zone && zone->GetMinThickness() > spoke_override )
{ {
override = zone->GetMinThickness(); spoke_override = zone->GetMinThickness();
REPORT( "" ) REPORT( "" )
REPORT( wxString::Format( _( "Zone %s min thickness: %s." ), REPORT( wxString::Format( _( "Zone %s min thickness: %s." ),
EscapeHTML( zone->GetSelectMenuText( UNITS ) ), EscapeHTML( zone->GetSelectMenuText( UNITS ) ),
EscapeHTML( REPORT_VALUE( override ) ) ) ) EscapeHTML( REPORT_VALUE( spoke_override ) ) ) )
} }
constraint.SetName( m_msg ); constraint.SetName( m_msg );
constraint.m_Value.SetMin( override ); constraint.m_Value.SetMin( spoke_override );
return constraint; return constraint;
} }
} }
@ -1242,7 +1242,7 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
{ {
if( zone ) if( zone )
{ {
int local = zone->GetThermalReliefSpokeWidth(); int local = zone->GetThermalReliefGap();
REPORT( "" ) REPORT( "" )
REPORT( wxString::Format( _( "Zone %s thermal relief gap: %s." ), REPORT( wxString::Format( _( "Zone %s thermal relief gap: %s." ),