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

finishing work started in commit ba37d6fca35b67fc04a21aa111aba97c80c3a1b0: 

Command add corner to zone in GAL mode: fix corner cases (existing when a zone has holes).
(Well, "corner case" is the right word: I can't resist)
This commit is contained in:
jean-pierre charras 2017-04-14 14:38:59 +02:00
parent 83169af988
commit 74cd53fb31
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pcbnew/tools/point_editor.cpp
View File

@ -776,37 +776,50 @@ int POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
if( item->Type() == PCB_ZONE_AREA_T ) if( item->Type() == PCB_ZONE_AREA_T )
{ {
ZONE_CONTAINER* zone = static_cast<ZONE_CONTAINER*>( item ); ZONE_CONTAINER* zone = static_cast<ZONE_CONTAINER*>( item );
SHAPE_POLY_SET* outline = zone->Outline(); SHAPE_POLY_SET* zoneOutline = zone->Outline();
commit.Modify( zone ); commit.Modify( zone );
unsigned int nearestIdx = 0; unsigned int nearestIdx = 0;
unsigned int nextNearestIdx = 0; unsigned int nextNearestIdx = 0;
unsigned int nearestDist = INT_MAX; unsigned int nearestDist = INT_MAX;
unsigned int firstPointInContour = 0;
for( int i = 0; i < outline->TotalVertices(); ++i ) // Search the best outline segment to add a new corner
// and therefore break this segment into two segments
// Object to iterate through the corners of the outlines (main contour and its holes)
SHAPE_POLY_SET::ITERATOR iterator = zoneOutline->Iterate( 0,
zoneOutline->OutlineCount()-1, /* IterateHoles */ true );
int curr_idx = 0;
// Iterate through all the corners of the outlines and search the best segment
for( ; iterator; iterator++, curr_idx++ )
{ {
int jj = i+1; int jj = curr_idx+1;
if( jj >= outline->TotalVertices() ) if( iterator.IsEndContour() )
jj = 0; { // We reach the last point of the current contour (main or hole)
jj = firstPointInContour;
firstPointInContour = curr_idx+1; // Prepare next contour analysis
}
SEG side( outline->Vertex( i ), outline->Vertex( jj ) ); SEG curr_segment( zoneOutline->Vertex( curr_idx ), zoneOutline->Vertex( jj ) );
unsigned int distance = side.Distance( cursorPos ); unsigned int distance = curr_segment.Distance( cursorPos );
if( distance < nearestDist ) if( distance < nearestDist )
{ {
nearestDist = distance; nearestDist = distance;
nearestIdx = i; nearestIdx = curr_idx;
nextNearestIdx = i + 1; nextNearestIdx = jj;
} }
} }
// Find the point on the closest segment // Find the point on the closest segment
VECTOR2I sideOrigin = outline->Vertex( nearestIdx ); VECTOR2I sideOrigin = zoneOutline->Vertex( nearestIdx );
VECTOR2I sideEnd = outline->Vertex( nextNearestIdx ); VECTOR2I sideEnd = zoneOutline->Vertex( nextNearestIdx );
SEG nearestSide( sideOrigin, sideEnd ); SEG nearestSide( sideOrigin, sideEnd );
VECTOR2I nearestPoint = nearestSide.NearestPoint( cursorPos ); VECTOR2I nearestPoint = nearestSide.NearestPoint( cursorPos );
@ -816,7 +829,7 @@ int POINT_EDITOR::addCorner( const TOOL_EVENT& aEvent )
nearestPoint = ( sideOrigin + sideEnd ) / 2; nearestPoint = ( sideOrigin + sideEnd ) / 2;
// Add corner between nearestIdx and nextNearestIdx: // Add corner between nearestIdx and nextNearestIdx:
outline->InsertVertex( nextNearestIdx, nearestPoint ); zoneOutline->InsertVertex( nextNearestIdx, nearestPoint );
zone->Hatch(); zone->Hatch();
commit.Push( _( "Add a zone corner" ) ); commit.Push( _( "Add a zone corner" ) );
@ -880,14 +893,14 @@ int POINT_EDITOR::removeCorner( const TOOL_EVENT& aEvent )
BOARD_COMMIT commit( frame ); BOARD_COMMIT commit( frame );
ZONE_CONTAINER* zone = static_cast<ZONE_CONTAINER*>( item ); ZONE_CONTAINER* zone = static_cast<ZONE_CONTAINER*>( item );
SHAPE_POLY_SET* outline = zone->Outline(); SHAPE_POLY_SET* zoneOutline = zone->Outline();
commit.Modify( zone ); commit.Modify( zone );
for( int i = 0; i < outline->TotalVertices(); ++i ) for( int i = 0; i < zoneOutline->TotalVertices(); ++i )
{ {
if( outline->Vertex( i ) == m_editedPoint->GetPosition() ) if( zoneOutline->Vertex( i ) == m_editedPoint->GetPosition() )
{ {
outline->RemoveVertex( i ); zoneOutline->RemoveVertex( i );
setEditedPoint( NULL ); setEditedPoint( NULL );
commit.Push( _( "Remove a zone corner" ) ); commit.Push( _( "Remove a zone corner" ) );
break; break;