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

pcbnew: Fix polygon corner adding in board editor 

Polygon corners were enabled in the footprint editor but the logic
didn't extend to the board editor.  This revises the logic to look for
DRAWSEGMENTs and only reference the PCB_MODULE_EDGE_T where needed to
create a new segment in the footprint.

Fixes: lp:1782966
* https://bugs.launchpad.net/kicad/+bug/1782966
This commit is contained in:
Seth Hillbrand 2018-10-01 04:15:12 -07:00
parent 3da0d03c36
commit 6c693f80a7
1 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
pcbnew/tools/point_editor.cpp
View File

@ -959,12 +959,11 @@ int POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
if( !item || !canAddCorner( *item ) ) if( !item || !canAddCorner( *item ) )
return 0; return 0;
DRAWSEGMENT* graphicItem = dynamic_cast<DRAWSEGMENT*>( item );
BOARD_COMMIT commit( frame ); BOARD_COMMIT commit( frame );
bool moduleEdge = item->Type() == PCB_MODULE_EDGE_T;
if( item->Type() == PCB_ZONE_AREA_T || if( item->Type() == PCB_ZONE_AREA_T ||
( moduleEdge && static_cast<DRAWSEGMENT*>( item )->GetShape() == S_POLYGON ) ) ( graphicItem && graphicItem->GetShape() == S_POLYGON ) )
{ {
unsigned int nearestIdx = 0; unsigned int nearestIdx = 0;
unsigned int nextNearestIdx = 0; unsigned int nextNearestIdx = 0;
@ -972,10 +971,10 @@ int POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
unsigned int firstPointInContour = 0; unsigned int firstPointInContour = 0;
SHAPE_POLY_SET* zoneOutline; SHAPE_POLY_SET* zoneOutline;
if( moduleEdge ) if( item->Type() == PCB_ZONE_AREA_T )
zoneOutline = &( static_cast<DRAWSEGMENT*>( item )->GetPolyShape() );
else
zoneOutline = static_cast<ZONE_CONTAINER*>( item )->Outline(); zoneOutline = static_cast<ZONE_CONTAINER*>( item )->Outline();
else
zoneOutline = &( graphicItem->GetPolyShape() );
commit.Modify( item ); commit.Modify( item );
@ -1010,7 +1009,6 @@ int POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
} }
} }
// Find the point on the closest segment // Find the point on the closest segment
VECTOR2I sideOrigin = zoneOutline->Vertex( nearestIdx ); VECTOR2I sideOrigin = zoneOutline->Vertex( nearestIdx );
VECTOR2I sideEnd = zoneOutline->Vertex( nextNearestIdx ); VECTOR2I sideEnd = zoneOutline->Vertex( nextNearestIdx );
@ -1022,54 +1020,46 @@ int POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
if( nearestPoint == sideOrigin || nearestPoint == sideEnd ) if( nearestPoint == sideOrigin || nearestPoint == sideEnd )
nearestPoint = ( sideOrigin + sideEnd ) / 2; nearestPoint = ( sideOrigin + sideEnd ) / 2;
// Add corner between nearestIdx and nextNearestIdx:
zoneOutline->InsertVertex( nextNearestIdx, nearestPoint ); zoneOutline->InsertVertex( nextNearestIdx, nearestPoint );
// In board editor, we re-hatch the zone item // We re-hatch the filled zones but not polygons
if( !moduleEdge ) if( item->Type() == PCB_ZONE_AREA_T )
static_cast<ZONE_CONTAINER*>( item )->Hatch(); static_cast<ZONE_CONTAINER*>( item )->Hatch();
commit.Push( _( "Add a zone corner" ) ); commit.Push( _( "Add a zone corner" ) );
} }
else if( item->Type() == PCB_LINE_T || else if( graphicItem && graphicItem->GetShape() == S_SEGMENT )
( moduleEdge && static_cast<DRAWSEGMENT*>( item )->GetShape() == S_SEGMENT ) )
{ {
DRAWSEGMENT* segment = static_cast<DRAWSEGMENT*>( item ); commit.Modify( graphicItem );
if( segment->GetShape() == S_SEGMENT ) SEG seg( graphicItem->GetStart(), graphicItem->GetEnd() );
VECTOR2I nearestPoint = seg.NearestPoint( cursorPos );
// Move the end of the line to the break point..
graphicItem->SetEnd( wxPoint( nearestPoint.x, nearestPoint.y ) );
// and add another one starting from the break point
DRAWSEGMENT* newSegment;
if( item->Type() == PCB_MODULE_EDGE_T )
{ {
commit.Modify( segment ); EDGE_MODULE* edge = static_cast<EDGE_MODULE*>( graphicItem );
assert( edge->GetParent()->Type() == PCB_MODULE_T );
SEG seg( segment->GetStart(), segment->GetEnd() ); newSegment = new EDGE_MODULE( *edge );
VECTOR2I nearestPoint = seg.NearestPoint( cursorPos );
// Move the end of the line to the break point..
segment->SetEnd( wxPoint( nearestPoint.x, nearestPoint.y ) );
// and add another one starting from the break point
DRAWSEGMENT* newSegment;
if( moduleEdge )
{
EDGE_MODULE* edge = static_cast<EDGE_MODULE*>( segment );
assert( edge->Type() == PCB_MODULE_EDGE_T );
assert( edge->GetParent()->Type() == PCB_MODULE_T );
newSegment = new EDGE_MODULE( *edge );
}
else
{
newSegment = new DRAWSEGMENT( *segment );
}
newSegment->ClearSelected();
newSegment->SetStart( wxPoint( nearestPoint.x, nearestPoint.y ) );
newSegment->SetEnd( wxPoint( seg.B.x, seg.B.y ) );
commit.Add( newSegment );
commit.Push( _( "Split segment" ) );
} }
else
{
newSegment = new DRAWSEGMENT( *graphicItem );
}
newSegment->ClearSelected();
newSegment->SetStart( wxPoint( nearestPoint.x, nearestPoint.y ) );
newSegment->SetEnd( wxPoint( seg.B.x, seg.B.y ) );
commit.Add( newSegment );
commit.Push( _( "Split segment" ) );
} }
updatePoints(); updatePoints();