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

Don't assume colour theme preview board will have a DRCEngine. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5650
pull/16/head
Jeff Young 5 years ago
parent
652a59b781
commit
0ca09abbd3
2 changed files with 42 additions and 49 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. 13
      pcbnew/board_connected_item.cpp
  2. 78
      pcbnew/class_track.cpp

13
pcbnew/board_connected_item.cpp
View File

@ -84,14 +84,15 @@ NETCLASS* BOARD_CONNECTED_ITEM::GetEffectiveNetclass() const
int BOARD_CONNECTED_ITEM::GetClearance( PCB_LAYER_ID aLayer, BOARD_ITEM* aItem,
wxString* aSource ) const
{
// No clearance if "this" is not (yet) linked to a board therefore no available netclass
if( !GetBoard() )
return 0;
DRC_CONSTRAINT constraint;
std::shared_ptr<DRC_ENGINE> drcEngine = GetBoard()->GetDesignSettings().m_DRCEngine;
if( GetBoard() && GetBoard()->GetDesignSettings().m_DRCEngine )
{
BOARD_DESIGN_SETTINGS& bds = GetBoard()->GetDesignSettings();
DRC_CONSTRAINT constraint = drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_CLEARANCE,
this, aItem, aLayer );
constraint = bds.m_DRCEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_CLEARANCE, this,
aItem, aLayer );
}
if( constraint.Value().HasMin() )
{

78
pcbnew/class_track.cpp
View File

@ -78,37 +78,28 @@ EDA_ITEM* VIA::Clone() const
wxString VIA::GetSelectMenuText( EDA_UNITS aUnits ) const
{
wxString format;
BOARD* board = GetBoard();
wxString viaType;
switch( GetViaType() )
{
case VIATYPE::BLIND_BURIED:
format = _( "Blind/Buried Via %s %s on %s - %s" );
break;
case VIATYPE::MICROVIA:
format = _( "Micro Via %s %s on %s - %s" );
break;
// else say nothing about normal (through) vias
default:
format = _( "Via %s %s on %s - %s" );
break;
case VIATYPE::BLIND_BURIED: viaType = _( "Blind/Buried" ) + " "; break;
case VIATYPE::MICROVIA: viaType = _( "Micro" ) + " "; break;
default: viaType = _( "" ); break;
}
if( board )
{
// say which layers, only two for now
PCB_LAYER_ID topLayer;
PCB_LAYER_ID botLayer;
LayerPair( &topLayer, &botLayer );
return wxString::Format( format.GetData(), MessageTextFromValue( aUnits, m_Width ),
GetNetnameMsg(), board->GetLayerName( topLayer ), board->GetLayerName( botLayer ) );
}
else
{
return wxString::Format( format.GetData(), MessageTextFromValue( aUnits, m_Width ),
GetNetnameMsg(), wxT( "??" ), wxT( "??" ) );
}
// say which layers, only two for now
PCB_LAYER_ID topLayer;
PCB_LAYER_ID botLayer;
BOARD* board = GetBoard();
LayerPair( &topLayer, &botLayer );
return wxString::Format( _( "%s Via %s %s on %s - %s" ),
viaType,
MessageTextFromValue( aUnits, m_Width ),
GetNetnameMsg(),
board ? board->GetLayerName( topLayer ) : wxT( "??" ),
board ? board->GetLayerName( botLayer ) : wxT( "??" ) );
}
@ -127,18 +118,18 @@ int TRACK::GetLocalClearance( wxString* aSource ) const
void TRACK::GetWidthConstraints( int* aMin, int* aMax, wxString* aSource ) const
{
// No constraints if "this" is not (yet) linked to a board
if( !GetBoard() )
{
*aMin = 0;
*aMax = INT_MAX;
return;
}
*aMin = 0;
*aMax = INT_MAX;
std::shared_ptr<DRC_ENGINE> drcEngine = GetBoard()->GetDesignSettings().m_DRCEngine;
DRC_CONSTRAINT constraint;
DRC_CONSTRAINT constraint = drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_TRACK_WIDTH,
this, nullptr, GetLayer() );
if( GetBoard() && GetBoard()->GetDesignSettings().m_DRCEngine )
{
BOARD_DESIGN_SETTINGS& bds = GetBoard()->GetDesignSettings();
constraint = bds.m_DRCEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_TRACK_WIDTH, this,
nullptr, GetLayer() );
}
if( constraint.Value().HasMin() || constraint.Value().HasMax() )
{
@ -156,10 +147,6 @@ void TRACK::GetWidthConstraints( int* aMin, int* aMax, wxString* aSource ) const
int VIA::GetMinAnnulus( PCB_LAYER_ID aLayer, wxString* aSource ) const
{
// No constraints if "this" is not (yet) linked to a board
if( !GetBoard() )
return 0;
if( !IsPadOnLayer( aLayer ) )
{
if( aSource )
@ -168,10 +155,15 @@ int VIA::GetMinAnnulus( PCB_LAYER_ID aLayer, wxString* aSource ) const
return 0;
}
std::shared_ptr<DRC_ENGINE> drcEngine = GetBoard()->GetDesignSettings().m_DRCEngine;
DRC_CONSTRAINT constraint;
DRC_CONSTRAINT constraint = drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_ANNULUS_WIDTH,
this, nullptr, aLayer );
if( GetBoard() && GetBoard()->GetDesignSettings().m_DRCEngine )
{
BOARD_DESIGN_SETTINGS& bds = GetBoard()->GetDesignSettings();
constraint = bds.m_DRCEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_ANNULUS_WIDTH, this,
nullptr, aLayer );
}
if( constraint.Value().HasMin() )
{

Write Preview
Loading…
Cancel
Save