Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Push wxString allocation to smaller context 

Prevents creation of new wxString on stack for each clearance check
7.0
Seth Hillbrand 3 years ago
parent
359d66bc81
commit
4043dca613
1 changed files with 32 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      pcbnew/drc/drc_engine.cpp

63
pcbnew/drc/drc_engine.cpp
View File

@ -754,11 +754,18 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
if( aConstraintType == CLEARANCE_CONSTRAINT || aConstraintType == HOLE_CLEARANCE_CONSTRAINT )
{
int override_val = 0;
wxString msg;
int overrideA = 0;
int overrideB = 0;
if( ac && !b_is_non_copper )
overrideA = ac->GetLocalClearanceOverrides( nullptr );
if( bc && !a_is_non_copper )
overrideB = bc->GetLocalClearanceOverrides( nullptr );
if( overrideA > 0 || overrideB > 0 )
{
int overrideA = ac->GetLocalClearanceOverrides( nullptr );
wxString msg;
if( overrideA > 0 )
{
@ -769,11 +776,6 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
override_val = ac->GetLocalClearanceOverrides( &msg );
}
}
if( bc && !a_is_non_copper )
{
int overrideB = bc->GetLocalClearanceOverrides( nullptr );
if( overrideB > 0 )
{
@ -785,38 +787,38 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
if( overrideB > override_val )
override_val = bc->GetLocalClearanceOverrides( &msg );
}
}
if( override_val )
{
if( aConstraintType == CLEARANCE_CONSTRAINT )
if( override_val )
{
if( override_val < m_designSettings->m_MinClearance )
if( aConstraintType == CLEARANCE_CONSTRAINT )
{
override_val = m_designSettings->m_MinClearance;
msg = _( "board minimum" );
if( override_val < m_designSettings->m_MinClearance )
{
override_val = m_designSettings->m_MinClearance;
msg = _( "board minimum" );
REPORT( "" )
REPORT( wxString::Format( _( "Board minimum clearance: %s." ),
REPORT_VALUE( override_val ) ) )
REPORT( "" )
REPORT( wxString::Format( _( "Board minimum clearance: %s." ),
REPORT_VALUE( override_val ) ) )
}
}
}
else
{
if( override_val < m_designSettings->m_HoleClearance )
else
{
override_val = m_designSettings->m_HoleClearance;
msg = _( "board minimum hole" );
if( override_val < m_designSettings->m_HoleClearance )
{
override_val = m_designSettings->m_HoleClearance;
msg = _( "board minimum hole" );
REPORT( "" )
REPORT( wxString::Format( _( "Board minimum hole clearance: %s." ),
REPORT_VALUE( override_val ) ) )
REPORT( "" )
REPORT( wxString::Format( _( "Board minimum hole clearance: %s." ),
REPORT_VALUE( override_val ) ) )
}
}
}
constraint.SetName( msg );
constraint.m_Value.SetMin( override_val );
return constraint;
constraint.SetName( msg );
constraint.m_Value.SetMin( override_val );
return constraint;
}
}
}
else if( aConstraintType == ZONE_CONNECTION_CONSTRAINT )
@ -969,7 +971,6 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
wxString min = wxT( "<i>" ) + _( "undefined" ) + wxT( "</i>" );
wxString opt = wxT( "<i>" ) + _( "undefined" ) + wxT( "</i>" );
wxString max = wxT( "<i>" ) + _( "undefined" ) + wxT( "</i>" );
wxString msg;
if( implicit )
{

Write Preview
Loading…
Cancel
Save