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

Stop trying to zero-out offset of custom-shaped pads. 

It causes *way* to many issues.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15555
newinvert
Jeff Young 2 years ago
parent
f3f57f77d9
commit
68c839b214
5 changed files with 30 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. 2
      eeschema/sch_bus_entry.cpp
  2. 2
      eeschema/sch_line.cpp
  3. 4
      pcbnew/dialogs/dialog_pad_properties.cpp
  4. 2
      pcbnew/pad.cpp
  5. 69
      pcbnew/tools/pad_tool.cpp

2
eeschema/sch_bus_entry.cpp
View File

@ -590,7 +590,7 @@ static struct SCH_BUS_ENTRY_DESC
propMgr.InheritsAfter( TYPE_HASH( SCH_BUS_WIRE_ENTRY ), TYPE_HASH( SCH_BUS_ENTRY_BASE ) );
propMgr.InheritsAfter( TYPE_HASH( SCH_BUS_BUS_ENTRY ), TYPE_HASH( SCH_BUS_ENTRY_BASE ) );
auto& plotDashTypeEnum = ENUM_MAP<PLOT_DASH_TYPE>::Instance();
ENUM_MAP<PLOT_DASH_TYPE>& plotDashTypeEnum = ENUM_MAP<PLOT_DASH_TYPE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
{

2
eeschema/sch_line.cpp
View File

@ -982,7 +982,7 @@ static struct SCH_LINE_DESC
{
SCH_LINE_DESC()
{
auto& plotDashTypeEnum = ENUM_MAP<PLOT_DASH_TYPE>::Instance();
ENUM_MAP<PLOT_DASH_TYPE>& plotDashTypeEnum = ENUM_MAP<PLOT_DASH_TYPE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
{

4
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -947,9 +947,7 @@ void DIALOG_PAD_PROPERTIES::OnPadShapeSelection( wxCommandEvent& event )
m_sizeY.Enable( m_PadShapeSelector->GetSelection() != CHOICE_SHAPE_CIRCLE
&& m_PadShapeSelector->GetSelection() != CHOICE_SHAPE_CUSTOM_CIRC_ANCHOR );
m_offsetShapeOpt->Enable( m_PadShapeSelector->GetSelection() != CHOICE_SHAPE_CIRCLE
&& m_PadShapeSelector->GetSelection() != CHOICE_SHAPE_CUSTOM_CIRC_ANCHOR
&& m_PadShapeSelector->GetSelection() != CHOICE_SHAPE_CUSTOM_RECT_ANCHOR );
m_offsetShapeOpt->Enable( m_PadShapeSelector->GetSelection() != CHOICE_SHAPE_CIRCLE );
if( !m_offsetShapeOpt->IsEnabled() )
m_offsetShapeOpt->SetValue( false );

2
pcbnew/pad.cpp
View File

@ -1642,7 +1642,7 @@ void PAD::TransformShapeToPolygon( SHAPE_POLY_SET& aBuffer, PCB_LAYER_ID aLayer,
SHAPE_POLY_SET outline;
MergePrimitivesAsPolygon( &outline, aErrorLoc );
outline.Rotate( m_orient );
outline.Move( VECTOR2I( m_pos ) );
outline.Move( VECTOR2I( padShapePos ) );
if( aClearance > 0 || aErrorLoc == ERROR_OUTSIDE )
{

69
pcbnew/tools/pad_tool.cpp
View File

@ -752,11 +752,8 @@ PCB_LAYER_ID PAD_TOOL::explodePad( PAD* aPad )
UNIMPLEMENTED_FOR( shape->SHAPE_T_asString() );
}
if( shape->GetShape() != SHAPE_T::POLY ) // Poly's are board-relative
{
shape->Move( aPad->GetPosition() );
shape->Rotate( aPad->GetPosition(), aPad->GetOrientation() );
}
shape->Rotate( VECTOR2I( 0, 0 ), aPad->GetOrientation() );
shape->Move( aPad->ShapePos() );
shape->SetLayer( layer );
@ -780,8 +777,7 @@ std::vector<PCB_SHAPE*> PAD_TOOL::RecombinePad( PAD* aPad, bool aIsDryRun, BOARD
int maxError = board()->GetDesignSettings().m_MaxError;
FOOTPRINT* footprint = aPad->GetParentFootprint();
// Don't leave an object in the point editor that might no longer exist after
// recombining the pad.
// Don't leave an object in the point editor that might no longer exist after recombining.
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear );
for( BOARD_ITEM* item : footprint->GraphicalItems() )
@ -855,41 +851,31 @@ std::vector<PCB_SHAPE*> PAD_TOOL::RecombinePad( PAD* aPad, bool aIsDryRun, BOARD
{
aCommit.Modify( aPad );
// Create a new minimally-sized circular anchor and convert existing pad
// to a polygon primitive
SHAPE_POLY_SET existingOutline;
aPad->TransformShapeToPolygon( existingOutline, layer, 0, maxError, ERROR_INSIDE );
aPad->SetAnchorPadShape( PAD_SHAPE::CIRCLE );
// The actual pad shape may be offset from the pad anchor, so we don't want the anchor
// shape to be overly large (and stick out from under the actual pad shape). Normally
// this means we want the anchor pad to be entirely inside the hole, but offsets are
// also used with SMD pads to control the anchor point for track routing.
if( aPad->GetDrillSizeX() > 0 )
if( aPad->GetShape() == PAD_SHAPE::CIRCLE || aPad->GetShape() == PAD_SHAPE::RECTANGLE )
{
// For a pad with a hole, just make sure the anchor shape is entirely inside the
// hole.
aPad->SetSize( aPad->GetDrillSize() / 2 );
// Use the existing pad as an anchor
aPad->SetAnchorPadShape( aPad->GetShape() );
aPad->SetShape( PAD_SHAPE::CUSTOM );
}
else
{
// For a SMD pad, an offset is usually used to control the anchor point for routing.
// In this case it will usually be at least 1/2 the minimum track width inside the
// pad. We halve that value again just to be safe.
aPad->SetSize( VECTOR2I( board()->GetDesignSettings().m_TrackMinWidth / 2,
board()->GetDesignSettings().m_TrackMinWidth / 2 ) );
// Create a new circular anchor and convert existing pad to a polygon primitive
SHAPE_POLY_SET existingOutline;
aPad->TransformShapeToPolygon( existingOutline, layer, 0, maxError, ERROR_INSIDE );
int minExtent = std::min( aPad->GetSize().x, aPad->GetSize().y );
aPad->SetAnchorPadShape( PAD_SHAPE::CIRCLE );
aPad->SetSize( VECTOR2I( minExtent, minExtent ) );
aPad->SetShape( PAD_SHAPE::CUSTOM );
PCB_SHAPE* shape = new PCB_SHAPE( nullptr, SHAPE_T::POLY );
shape->SetFilled( true );
shape->SetStroke( STROKE_PARAMS( 0, PLOT_DASH_TYPE::SOLID ) );
shape->SetPolyShape( existingOutline );
shape->Rotate( VECTOR2I( 0, 0 ), - aPad->GetOrientation() );
shape->Move( - aPad->ShapePos() );
aPad->AddPrimitive( shape );
}
PCB_SHAPE* shape = new PCB_SHAPE( nullptr, SHAPE_T::POLY );
shape->SetFilled( true );
shape->SetStroke( STROKE_PARAMS( 0, PLOT_DASH_TYPE::SOLID ) );
shape->SetPolyShape( existingOutline );
shape->Move( - aPad->GetPosition() );
shape->Rotate( VECTOR2I( 0, 0 ), - aPad->GetOrientation() );
aPad->AddPrimitive( shape );
aPad->SetShape( PAD_SHAPE::CUSTOM );
aPad->SetOffset( VECTOR2I( 0, 0 ) );
}
while( PCB_SHAPE* fpShape = findNext( layer ) )
@ -936,13 +922,10 @@ std::vector<PCB_SHAPE*> PAD_TOOL::RecombinePad( PAD* aPad, bool aIsDryRun, BOARD
UNIMPLEMENTED_FOR( primitive->SHAPE_T_asString() );
}
if( primitive->GetShape() != SHAPE_T::POLY ) // Poly's are board-relative
{
primitive->Move( - aPad->GetPosition() );
primitive->Rotate( VECTOR2I( 0, 0 ), - aPad->GetOrientation() );
}
primitive->Move( - aPad->ShapePos() );
primitive->Rotate( VECTOR2I( 0, 0 ), - aPad->GetOrientation() );
primitive->SetIsAnnotationProxy( fpShape->IsAnnotationProxy());
primitive->SetIsAnnotationProxy( fpShape->IsAnnotationProxy() );
aPad->AddPrimitive( primitive );
aCommit.Remove( fpShape );

Write Preview
Loading…
Cancel
Save