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

CHANGED: moved footprint lock shadows to children. 

A full bounding hull wash gets overwhelming on
boards with lots of mechanically-constrained
objects.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14007
revert-0c36e162
Jeff Young 6 months ago
parent
2e556d0abc
commit
661d002234
6 changed files with 74 additions and 62 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. 15
      pcbnew/footprint.cpp
  2. 4
      pcbnew/pad.cpp
  3. 111
      pcbnew/pcb_painter.cpp
  4. 2
      pcbnew/pcb_shape.cpp
  5. 2
      pcbnew/pcb_text.cpp
  6. 2
      pcbnew/pcb_textbox.cpp

15
pcbnew/footprint.cpp
View File

@ -2235,9 +2235,6 @@ std::vector<int> FOOTPRINT::ViewGetLayers() const
break;
}
if( IsLocked() )
layers.push_back( LAYER_LOCKED_ITEM_SHADOW );
if( IsConflicting() )
layers.push_back( LAYER_CONFLICTS_SHADOW );
@ -2270,18 +2267,6 @@ std::vector<int> FOOTPRINT::ViewGetLayers() const
double FOOTPRINT::ViewGetLOD( int aLayer, const KIGFX::VIEW* aView ) const
{
if( aLayer == LAYER_LOCKED_ITEM_SHADOW )
{
// The locked shadow shape is shown only if the footprint itself is visible
if( ( m_layer == F_Cu ) && aView->IsLayerVisible( LAYER_FOOTPRINTS_FR ) )
return LOD_SHOW;
if( ( m_layer == B_Cu ) && aView->IsLayerVisible( LAYER_FOOTPRINTS_BK ) )
return LOD_SHOW;
return LOD_HIDE;
}
if( aLayer == LAYER_CONFLICTS_SHADOW && IsConflicting() )
{
// The locked shadow shape is shown only if the footprint itself is visible

4
pcbnew/pad.cpp
View File

@ -1692,6 +1692,10 @@ std::vector<int> PAD::ViewGetLayers() const
if( m_attribute == PAD_ATTRIB::NPTH )
layers.push_back( LAYER_NON_PLATEDHOLES );
if( IsLocked() || ( GetParentFootprint() && GetParentFootprint()->IsLocked() ) )
layers.push_back( LAYER_LOCKED_ITEM_SHADOW );
LSET cuLayers = ( m_padStack.LayerSet() & LSET::AllCuMask() );
// Don't spend cycles rendering layers that aren't visible

111
pcbnew/pcb_painter.cpp
View File

@ -201,10 +201,12 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const BOARD_ITEM* aItem, int aLayer ) con
int netCode = -1;
int originalLayer = aLayer;
// Marker shadows
if( aLayer == LAYER_MARKER_SHADOWS )
return m_backgroundColor.WithAlpha( 0.6 );
if( aLayer == LAYER_LOCKED_ITEM_SHADOW )
return m_layerColors.at( aLayer );
// SMD pads use the copper netname layer
if( aLayer == LAYER_PAD_FR_NETNAMES )
aLayer = GetNetnameLayer( F_Cu );
@ -297,10 +299,10 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const BOARD_ITEM* aItem, int aLayer ) con
// Some graphic objects are BOARD_CONNECTED_ITEM, but they are seen here as
// actually board connected objects only if on a copper layer
const BOARD_CONNECTED_ITEM* conItem =
aItem->IsConnected() && aItem->IsOnCopperLayer()
? static_cast<const BOARD_CONNECTED_ITEM*>( aItem )
: nullptr;
const BOARD_CONNECTED_ITEM* conItem = nullptr;
if( aItem->IsConnected() && aItem->IsOnCopperLayer() )
conItem = static_cast<const BOARD_CONNECTED_ITEM*>( aItem );
// Try to obtain the netcode for the aItem
if( conItem )
@ -1461,34 +1463,9 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
if( m_pcbSettings.m_ForcePadSketchModeOn )
outline_mode = true;
if( outline_mode )
{
// Outline mode
m_gal->SetIsFill( false );
m_gal->SetIsStroke( true );
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
m_gal->SetStrokeColor( color );
}
else
{
// Filled mode
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
m_gal->SetFillColor( color );
}
bool drawShape = false;
if( aLayer == LAYER_PAD_PLATEDHOLES || aLayer == LAYER_NON_PLATEDHOLES )
{
SHAPE_SEGMENT slot = getPadHoleShape( aPad );
if( slot.GetSeg().A == slot.GetSeg().B ) // Circular hole
m_gal->DrawCircle( slot.GetSeg().A, slot.GetWidth() / 2.0 );
else
m_gal->DrawSegment( slot.GetSeg().A, slot.GetSeg().B, slot.GetWidth() );
}
else if( m_pcbSettings.IsPrinting() )
if( m_pcbSettings.IsPrinting() )
{
drawShape = aPad->FlashLayer( m_pcbSettings.GetPrintLayers() );
}
@ -1502,6 +1479,11 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
drawShape = true;
outline_mode = true;
}
else if( aLayer == LAYER_LOCKED_ITEM_SHADOW )
{
drawShape = true;
outline_mode = false;
}
if( outline_mode )
{
@ -1511,27 +1493,68 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
m_gal->SetStrokeColor( color );
}
else
{
// Filled mode
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
m_gal->SetFillColor( color );
}
if( drawShape )
if( aLayer == LAYER_PAD_PLATEDHOLES || aLayer == LAYER_NON_PLATEDHOLES )
{
SHAPE_SEGMENT slot = getPadHoleShape( aPad );
if( slot.GetSeg().A == slot.GetSeg().B ) // Circular hole
m_gal->DrawCircle( slot.GetSeg().A, slot.GetWidth() / 2.0 );
else
m_gal->DrawSegment( slot.GetSeg().A, slot.GetSeg().B, slot.GetWidth() );
}
else if( drawShape )
{
VECTOR2I pad_size = aPad->GetSize( pcbLayer );
VECTOR2I margin;
switch( aLayer )
auto getExpansion =
[&]( PCB_LAYER_ID layer )
{
VECTOR2I expansion;
switch( aLayer )
{
case F_Mask:
case B_Mask:
expansion.x = expansion.y = aPad->GetSolderMaskExpansion( layer );
break;
case F_Paste:
case B_Paste:
expansion = aPad->GetSolderPasteMargin( layer );
break;
default:
expansion.x = expansion.y = 0;
break;
}
return expansion;
};
if( aLayer == LAYER_LOCKED_ITEM_SHADOW )
{
case F_Mask:
case B_Mask:
margin.x = margin.y = aPad->GetSolderMaskExpansion( pcbLayer );
break;
LSET visibleLayers = aPad->GetBoard()->GetVisibleLayers()
& aPad->GetBoard()->GetEnabledLayers()
& aPad->GetLayerSet();
case F_Paste:
case B_Paste:
margin = aPad->GetSolderPasteMargin( pcbLayer );
break;
for( PCB_LAYER_ID layer : visibleLayers )
margin = std::max( margin, getExpansion( layer ) );
default:
margin.x = margin.y = 0;
break;
margin.x += m_lockedShadowMargin / 2;
margin.y += m_lockedShadowMargin / 2;
}
else
{
margin = getExpansion( pcbLayer );
}
std::unique_ptr<PAD> dummyPad;

2
pcbnew/pcb_shape.cpp
View File

@ -697,7 +697,7 @@ std::vector<int> PCB_SHAPE::ViewGetLayers() const
}
}
if( IsLocked() )
if( IsLocked() || ( GetParentFootprint() && GetParentFootprint()->IsLocked() ) )
layers.push_back( LAYER_LOCKED_ITEM_SHADOW );
return layers;

2
pcbnew/pcb_text.cpp
View File

@ -209,7 +209,7 @@ const BOX2I PCB_TEXT::ViewBBox() const
std::vector<int> PCB_TEXT::ViewGetLayers() const
{
if( IsLocked() )
if( IsLocked() || ( GetParentFootprint() && GetParentFootprint()->IsLocked() ) )
return { GetLayer(), LAYER_LOCKED_ITEM_SHADOW };
return { GetLayer() };

2
pcbnew/pcb_textbox.cpp
View File

@ -401,7 +401,7 @@ double PCB_TEXTBOX::ViewGetLOD( int aLayer, const KIGFX::VIEW* aView ) const
std::vector<int> PCB_TEXTBOX::ViewGetLayers() const
{
if( IsLocked() )
if( IsLocked() || ( GetParentFootprint() && GetParentFootprint()->IsLocked() ) )
return { GetLayer(), LAYER_LOCKED_ITEM_SHADOW };
return { GetLayer() };

Write Preview
Loading…
Cancel
Save