Handle single line segments on footprint edgecuts
Also, only display an infobar message for footprints when there is no footprint loaded (instead of if the outline isn't closed). Fixes https://gitlab.com/kicad/code/kicad/issues/4866
This commit is contained in:
Ian McInerney
parent
37eed564ab
commit
a5ed5e5675
|
|
@ -430,7 +430,7 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
|
||||||
if( aWarningReporter )
|
if( aWarningReporter )
|
||||||
{
|
{
|
||||||
if( !createBoardPolygon( &msg ) )
|
if( !createBoardPolygon( &msg ) )
|
||||||
aWarningReporter->Report( _( "Board outline is not closed: " ) + msg, RPT_SEVERITY_WARNING );
|
aWarningReporter->Report( msg, RPT_SEVERITY_WARNING );
|
||||||
else
|
else
|
||||||
aWarningReporter->Report( wxEmptyString );
|
aWarningReporter->Report( wxEmptyString );
|
||||||
}
|
}
|
||||||
|
|
@ -442,13 +442,40 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
extern bool BuildFootprintPolygonOutlines( BOARD* aBoard, SHAPE_POLY_SET& aOutlines,
|
||||||
|
wxString* aErrorText, unsigned int aTolerance,
|
||||||
|
wxPoint* aErrorLocation );
|
||||||
|
|
||||||
|
|
||||||
bool BOARD_ADAPTER::createBoardPolygon( wxString* aErrorMsg )
|
bool BOARD_ADAPTER::createBoardPolygon( wxString* aErrorMsg )
|
||||||
{
|
{
|
||||||
m_board_poly.RemoveAllContours();
|
m_board_poly.RemoveAllContours();
|
||||||
|
|
||||||
wxString errmsg;
|
bool success = false;
|
||||||
|
wxString msg;
|
||||||
|
|
||||||
return m_board->GetBoardPolygonOutlines( m_board_poly, aErrorMsg );
|
if( m_board->IsFootprintHolder() )
|
||||||
|
{
|
||||||
|
success = BuildFootprintPolygonOutlines( m_board, m_board_poly, &msg,
|
||||||
|
m_board->GetDesignSettings().m_MaxError,
|
||||||
|
nullptr );
|
||||||
|
|
||||||
|
// Make polygon strictly simple to avoid issues (especially in 3D viewer)
|
||||||
|
m_board_poly.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
|
||||||
|
|
||||||
|
if( aErrorMsg )
|
||||||
|
*aErrorMsg = msg;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
success = m_board->GetBoardPolygonOutlines( m_board_poly, &msg );
|
||||||
|
|
||||||
|
if( aErrorMsg )
|
||||||
|
*aErrorMsg = _( "Board outline is not closed: " ) + msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,17 @@
|
||||||
#include <geometry/shape_poly_set.h>
|
#include <geometry/shape_poly_set.h>
|
||||||
#include <geometry/geometry_utils.h>
|
#include <geometry/geometry_utils.h>
|
||||||
|
|
||||||
|
#include <wx/log.h>
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Flag to enable debug tracing for the board outline creation
|
||||||
|
*
|
||||||
|
* Use "KICAD_BOARD_OUTLINE" to enable.
|
||||||
|
*
|
||||||
|
* @ingroup trace_env_vars
|
||||||
|
*/
|
||||||
|
const wxChar* traceBoardOutline = wxT( "KICAD_BOARD_OUTLINE" );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function close_ness
|
* Function close_ness
|
||||||
|
|
@ -832,11 +843,21 @@ bool BuildBoardPolygonOutlines( BOARD* aBoard, SHAPE_POLY_SET& aOutlines, wxStri
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the complete bounding box of the board (including all items)
|
* Get the complete bounding box of the board (including all items).
|
||||||
|
*
|
||||||
|
* The vertex numbers and segment numbers of the rectangle returned.
|
||||||
|
* 1
|
||||||
|
* *---------------*
|
||||||
|
* |1 2|
|
||||||
|
* 0| |2
|
||||||
|
* |0 3|
|
||||||
|
* *---------------*
|
||||||
|
* 3
|
||||||
*/
|
*/
|
||||||
void buildBoardBoundingBoxPoly( const BOARD* aBoard, SHAPE_POLY_SET& aOutline )
|
void buildBoardBoundingBoxPoly( const BOARD* aBoard, SHAPE_POLY_SET& aOutline )
|
||||||
{
|
{
|
||||||
EDA_RECT bbbox = aBoard->GetBoundingBox();
|
EDA_RECT bbbox = aBoard->GetBoundingBox();
|
||||||
|
SHAPE_LINE_CHAIN chain;
|
||||||
|
|
||||||
// If null area, uses the global bounding box.
|
// If null area, uses the global bounding box.
|
||||||
if( ( bbbox.GetWidth() ) == 0 || ( bbbox.GetHeight() == 0 ) )
|
if( ( bbbox.GetWidth() ) == 0 || ( bbbox.GetHeight() == 0 ) )
|
||||||
|
|
@ -846,21 +867,17 @@ void buildBoardBoundingBoxPoly( const BOARD* aBoard, SHAPE_POLY_SET& aOutline )
|
||||||
if( ( bbbox.GetWidth() ) == 0 || ( bbbox.GetHeight() == 0 ) )
|
if( ( bbbox.GetWidth() ) == 0 || ( bbbox.GetHeight() == 0 ) )
|
||||||
bbbox.Inflate( Millimeter2iu( 1.0 ) );
|
bbbox.Inflate( Millimeter2iu( 1.0 ) );
|
||||||
|
|
||||||
|
// Inflate slightly (by 1/10th the size of the box)
|
||||||
|
bbbox.Inflate( bbbox.GetWidth() / 10, bbbox.GetHeight() / 10 );
|
||||||
|
|
||||||
|
chain.Append( bbbox.GetOrigin() );
|
||||||
|
chain.Append( bbbox.GetOrigin().x, bbbox.GetEnd().y );
|
||||||
|
chain.Append( bbbox.GetEnd() );
|
||||||
|
chain.Append( bbbox.GetEnd().x, bbbox.GetOrigin().y );
|
||||||
|
chain.SetClosed( true );
|
||||||
|
|
||||||
aOutline.RemoveAllContours();
|
aOutline.RemoveAllContours();
|
||||||
aOutline.NewOutline();
|
aOutline.AddOutline( chain );
|
||||||
|
|
||||||
wxPoint corner;
|
|
||||||
aOutline.Append( bbbox.GetOrigin() );
|
|
||||||
|
|
||||||
corner.x = bbbox.GetOrigin().x;
|
|
||||||
corner.y = bbbox.GetEnd().y;
|
|
||||||
aOutline.Append( corner );
|
|
||||||
|
|
||||||
aOutline.Append( bbbox.GetEnd() );
|
|
||||||
|
|
||||||
corner.x = bbbox.GetEnd().x;
|
|
||||||
corner.y = bbbox.GetOrigin().y;
|
|
||||||
aOutline.Append( corner );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -868,22 +885,22 @@ bool isCopperOutside( const MODULE* aMod, SHAPE_POLY_SET& aShape )
|
||||||
{
|
{
|
||||||
bool padOutside = false;
|
bool padOutside = false;
|
||||||
|
|
||||||
for( auto pad : aMod->Pads() )
|
for( D_PAD* pad : aMod->Pads() )
|
||||||
{
|
{
|
||||||
SHAPE_POLY_SET padPoly;
|
SHAPE_POLY_SET poly = aShape;
|
||||||
pad->BuildPadShapePolygon( padPoly, wxSize( 0, 0 ) );
|
|
||||||
|
|
||||||
bool padOutsidePad = false;
|
poly.BooleanIntersection( *pad->GetEffectivePolygon(), SHAPE_POLY_SET::PM_FAST );
|
||||||
for( auto it = padPoly.CIterateSegments( 0 ); it; it++ )
|
|
||||||
|
if( poly.OutlineCount() == 0 )
|
||||||
{
|
{
|
||||||
auto seg = it.Get();
|
wxPoint padPos = pad->GetPosition();
|
||||||
padOutsidePad |= !aShape.Collide( seg );
|
wxLogTrace( traceBoardOutline, "Tested pad (%d, %d): outside", padPos.x, padPos.y );
|
||||||
|
padOutside = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPoint padPos = pad->GetPosition();
|
wxPoint padPos = pad->GetPosition();
|
||||||
wxLogDebug( "Tested pad (%d, %d): %s", padPos.x, padPos.y, padOutsidePad ? "true" : "false" );
|
wxLogTrace( traceBoardOutline, "Tested pad (%d, %d): not outside", padPos.x, padPos.y );
|
||||||
|
|
||||||
padOutside |= padOutsidePad;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return padOutside;
|
return padOutside;
|
||||||
|
|
@ -912,6 +929,59 @@ VECTOR2I projectPointOnSegment( const VECTOR2I& aEndPoint, const SHAPE_POLY_SET&
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int findEndSegments( SHAPE_LINE_CHAIN& aChain, SEG& aStartSeg, SEG& aEndSeg )
|
||||||
|
{
|
||||||
|
int foundSegs = 0;
|
||||||
|
|
||||||
|
for( int i = 0; i < aChain.SegmentCount(); i++ )
|
||||||
|
{
|
||||||
|
SEG seg = aChain.Segment( i );
|
||||||
|
|
||||||
|
bool foundA = false;
|
||||||
|
bool foundB = false;
|
||||||
|
|
||||||
|
for( int j = 0; j < aChain.SegmentCount(); j++ )
|
||||||
|
{
|
||||||
|
// Don't test the segment against itself
|
||||||
|
if( i == j )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
SEG testSeg = aChain.Segment( j );
|
||||||
|
|
||||||
|
if( testSeg.Contains( seg.A ) )
|
||||||
|
foundA = true;
|
||||||
|
|
||||||
|
if( testSeg.Contains( seg.B ) )
|
||||||
|
foundB = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// This segment isn't a start or end
|
||||||
|
if( foundA && foundB )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if( foundSegs == 0 )
|
||||||
|
{
|
||||||
|
// The first segment we encounter is the "start" segment
|
||||||
|
wxLogTrace( traceBoardOutline, "Found start segment: (%d, %d)-(%d, %d)",
|
||||||
|
seg.A.x, seg.A.y, seg.B.x, seg.B.y );
|
||||||
|
aStartSeg = seg;
|
||||||
|
foundSegs++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Once we find both start and end, we can stop
|
||||||
|
wxLogTrace( traceBoardOutline, "Found end segment: (%d, %d)-(%d, %d)",
|
||||||
|
seg.A.x, seg.A.y, seg.B.x, seg.B.y );
|
||||||
|
aEndSeg = seg;
|
||||||
|
foundSegs++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return foundSegs;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This function is used to extract a board outline for a footprint view.
|
* This function is used to extract a board outline for a footprint view.
|
||||||
*
|
*
|
||||||
|
|
@ -925,7 +995,8 @@ VECTOR2I projectPointOnSegment( const VECTOR2I& aEndPoint, const SHAPE_POLY_SET&
|
||||||
* as a hole, and the outer edge will be formed using the bounding box.
|
* as a hole, and the outer edge will be formed using the bounding box.
|
||||||
*/
|
*/
|
||||||
bool BuildFootprintPolygonOutlines( BOARD* aBoard, SHAPE_POLY_SET& aOutlines,
|
bool BuildFootprintPolygonOutlines( BOARD* aBoard, SHAPE_POLY_SET& aOutlines,
|
||||||
wxString* aErrorText, unsigned int aTolerance, wxPoint* aErrorLocation )
|
wxString* aErrorText, unsigned int aTolerance,
|
||||||
|
wxPoint* aErrorLocation )
|
||||||
{
|
{
|
||||||
PCB_TYPE_COLLECTOR items;
|
PCB_TYPE_COLLECTOR items;
|
||||||
|
|
||||||
|
|
@ -947,97 +1018,301 @@ bool BuildFootprintPolygonOutlines( BOARD* aBoard, SHAPE_POLY_SET& aOutlines,
|
||||||
|
|
||||||
bool success = ConvertOutlineToPolygon( segList, outlines, aErrorText, aTolerance, aErrorLocation );
|
bool success = ConvertOutlineToPolygon( segList, outlines, aErrorText, aTolerance, aErrorLocation );
|
||||||
|
|
||||||
|
MODULE* boardMod = aBoard->GetFirstModule();
|
||||||
|
|
||||||
|
// No module loaded
|
||||||
|
if( !boardMod )
|
||||||
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "No module found on board" );
|
||||||
|
|
||||||
|
if( aErrorText )
|
||||||
|
*aErrorText = _( "No footprint loaded" );
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// A closed outline was found
|
// A closed outline was found
|
||||||
if( success )
|
if( success )
|
||||||
{
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Closed outline found" );
|
||||||
|
|
||||||
// If copper is outside a closed polygon, treat it as a hole
|
// If copper is outside a closed polygon, treat it as a hole
|
||||||
if( isCopperOutside( aBoard->GetFirstModule(), outlines ) )
|
if( isCopperOutside( boardMod, outlines ) )
|
||||||
{
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Treating outline as a hole" );
|
||||||
|
|
||||||
buildBoardBoundingBoxPoly( aBoard, aOutlines );
|
buildBoardBoundingBoxPoly( aBoard, aOutlines );
|
||||||
|
|
||||||
// Copy all outlines from the conversion as holes into the new outline
|
// Copy all outlines from the conversion as holes into the new outline
|
||||||
for( int i = 0; i < outlines.OutlineCount(); i++ )
|
for( int i = 0; i < outlines.OutlineCount(); i++ )
|
||||||
{
|
{
|
||||||
aOutlines.AddHole( outlines.Outline( i ), -1 );
|
SHAPE_LINE_CHAIN& out = outlines.Outline( i );
|
||||||
|
|
||||||
|
if( out.IsClosed() )
|
||||||
|
aOutlines.AddHole( out, -1 );
|
||||||
|
|
||||||
for( int j = 0; j < outlines.HoleCount( i ); j++ )
|
for( int j = 0; j < outlines.HoleCount( i ); j++ )
|
||||||
{
|
{
|
||||||
aOutlines.AddHole( outlines.Hole( i, j ), -1 );
|
SHAPE_LINE_CHAIN& hole = outlines.Hole( i, j );
|
||||||
|
|
||||||
|
if( hole.IsClosed() )
|
||||||
|
aOutlines.AddHole( hole, -1 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If all copper is inside, then the computed outline is the board outline
|
// If all copper is inside, then the computed outline is the board outline
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Treating outline as board edge" );
|
||||||
aOutlines = outlines;
|
aOutlines = outlines;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
// No board outlines were found, so use the bounding box
|
// No board outlines were found, so use the bounding box
|
||||||
else if( !outlines.OutlineCount() )
|
else if( outlines.OutlineCount() == 0 )
|
||||||
{
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Using footprint bounding box" );
|
||||||
buildBoardBoundingBoxPoly( aBoard, aOutlines );
|
buildBoardBoundingBoxPoly( aBoard, aOutlines );
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
// There is an outline present, but it is not closed
|
// There is an outline present, but it is not closed
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SHAPE_POLY_SET closedPolys;
|
wxLogTrace( traceBoardOutline, "Trying to build outline" );
|
||||||
SHAPE_POLY_SET openPolys;
|
|
||||||
|
|
||||||
// Extract all polygons to top-level entities
|
std::vector<SHAPE_LINE_CHAIN> closedChains;
|
||||||
for( int i = 0; i < outlines.OutlineCount(); i++ )
|
std::vector<SHAPE_LINE_CHAIN> openChains;
|
||||||
|
|
||||||
|
// The ConvertOutlineToPolygon function returns only one main
|
||||||
|
// outline and the rest as holes, so we promote the holes and process them
|
||||||
|
openChains.push_back( outlines.Outline( 0 ) );
|
||||||
|
|
||||||
|
for( int j = 0; j < outlines.HoleCount( 0 ); j++ )
|
||||||
{
|
{
|
||||||
SHAPE_LINE_CHAIN chain = outlines.Outline( i );
|
SHAPE_LINE_CHAIN hole = outlines.Hole( 0, j );
|
||||||
|
|
||||||
// Separate the open and closed polygons
|
if( hole.IsClosed() )
|
||||||
if( chain.IsClosed() )
|
|
||||||
{
|
{
|
||||||
wxLogDebug( "Outline closed" );
|
wxLogTrace( traceBoardOutline, "Found closed hole" );
|
||||||
closedPolys.AddOutline( chain );
|
closedChains.push_back( hole );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxLogDebug( "Outline open" );
|
wxLogTrace( traceBoardOutline, "Found open hole" );
|
||||||
chain.SetClosed( true );
|
openChains.push_back( hole );
|
||||||
openPolys.AddOutline( chain );
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// The ConvertOutlineToPolygon function returns only one main
|
SHAPE_POLY_SET bbox;
|
||||||
// outline and the rest as holes, so we promote the holes
|
buildBoardBoundingBoxPoly( aBoard, bbox );
|
||||||
for( int j = 0; j < outlines.HoleCount( i ); j++ )
|
|
||||||
|
// Treat the open polys as the board edge
|
||||||
|
SHAPE_LINE_CHAIN chain = openChains[0];
|
||||||
|
SHAPE_LINE_CHAIN rect = bbox.Outline( 0 );
|
||||||
|
|
||||||
|
// We know the outline chain is open, so set to non-closed to get better segment count
|
||||||
|
chain.SetClosed( false );
|
||||||
|
|
||||||
|
SEG startSeg;
|
||||||
|
SEG endSeg;
|
||||||
|
|
||||||
|
// The two possible board outlines
|
||||||
|
SHAPE_LINE_CHAIN upper;
|
||||||
|
SHAPE_LINE_CHAIN lower;
|
||||||
|
|
||||||
|
findEndSegments( chain, startSeg, endSeg );
|
||||||
|
|
||||||
|
if( chain.SegmentCount() == 0 )
|
||||||
|
{
|
||||||
|
// Something is wrong, bail out with the overall module bounding box
|
||||||
|
wxLogTrace( traceBoardOutline, "No line segments in provided outline" );
|
||||||
|
aOutlines = bbox;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if( chain.SegmentCount() == 1 )
|
||||||
|
{
|
||||||
|
// This case means there is only 1 line segment making up the edge cuts of the footprint,
|
||||||
|
// so we just need to use it to cut the bounding box in half.
|
||||||
|
wxLogTrace( traceBoardOutline, "Only 1 line segment in provided outline" );
|
||||||
|
|
||||||
|
startSeg = chain.Segment( 0 );
|
||||||
|
|
||||||
|
// Intersect with all the sides of the rectangle
|
||||||
|
OPT_VECTOR2I inter0 = startSeg.IntersectLines( rect.Segment( 0 ) );
|
||||||
|
OPT_VECTOR2I inter1 = startSeg.IntersectLines( rect.Segment( 1 ) );
|
||||||
|
OPT_VECTOR2I inter2 = startSeg.IntersectLines( rect.Segment( 2 ) );
|
||||||
|
OPT_VECTOR2I inter3 = startSeg.IntersectLines( rect.Segment( 3 ) );
|
||||||
|
|
||||||
|
if( inter0 && inter2 && !inter1 && !inter3 )
|
||||||
{
|
{
|
||||||
SHAPE_LINE_CHAIN hole = outlines.Hole( i, j );
|
// Intersects the vertical rectangle sides only
|
||||||
|
wxLogTrace( traceBoardOutline, "Segment intersects only vertical bbox sides" );
|
||||||
|
|
||||||
if( hole.IsClosed() )
|
// The upper half
|
||||||
|
upper.Append( *inter0 );
|
||||||
|
upper.Append( rect.GetPoint( 1 ) );
|
||||||
|
upper.Append( rect.GetPoint( 2 ) );
|
||||||
|
upper.Append( *inter2 );
|
||||||
|
upper.SetClosed( true );
|
||||||
|
|
||||||
|
// The lower half
|
||||||
|
lower.Append( *inter0 );
|
||||||
|
lower.Append( rect.GetPoint( 0 ) );
|
||||||
|
lower.Append( rect.GetPoint( 3 ) );
|
||||||
|
lower.Append( *inter2 );
|
||||||
|
lower.SetClosed( true );
|
||||||
|
}
|
||||||
|
else if( inter1 && inter3 && !inter0 && !inter2 )
|
||||||
|
{
|
||||||
|
// Intersects the horizontal rectangle sides only
|
||||||
|
wxLogTrace( traceBoardOutline, "Segment intersects only horizontal bbox sides" );
|
||||||
|
|
||||||
|
// The left half
|
||||||
|
upper.Append( *inter1 );
|
||||||
|
upper.Append( rect.GetPoint( 1 ) );
|
||||||
|
upper.Append( rect.GetPoint( 0 ) );
|
||||||
|
upper.Append( *inter3 );
|
||||||
|
upper.SetClosed( true );
|
||||||
|
|
||||||
|
// The right half
|
||||||
|
lower.Append( *inter1 );
|
||||||
|
lower.Append( rect.GetPoint( 2 ) );
|
||||||
|
lower.Append( rect.GetPoint( 3 ) );
|
||||||
|
lower.Append( *inter3 );
|
||||||
|
lower.SetClosed( true );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Angled line segment that cuts across a corner
|
||||||
|
wxLogTrace( traceBoardOutline, "Segment intersects two perpendicular bbox sides" );
|
||||||
|
|
||||||
|
// Figure out which actual lines are intersected, since IntersectLines assumes an infinite line
|
||||||
|
bool hit0 = rect.Segment( 0 ).Contains( *inter0 );
|
||||||
|
bool hit1 = rect.Segment( 1 ).Contains( *inter1 );
|
||||||
|
bool hit2 = rect.Segment( 2 ).Contains( *inter2 );
|
||||||
|
bool hit3 = rect.Segment( 3 ).Contains( *inter3 );
|
||||||
|
|
||||||
|
if( hit0 && hit1 )
|
||||||
{
|
{
|
||||||
wxLogDebug( "Hole closed" );
|
// Cut across the upper left corner
|
||||||
closedPolys.AddOutline( hole );
|
wxLogTrace( traceBoardOutline, "Segment cuts upper left corner" );
|
||||||
|
|
||||||
|
// The upper half
|
||||||
|
upper.Append( *inter0 );
|
||||||
|
upper.Append( rect.GetPoint( 1 ) );
|
||||||
|
upper.Append( *inter1 );
|
||||||
|
upper.SetClosed( true );
|
||||||
|
|
||||||
|
// The lower half
|
||||||
|
lower.Append( *inter0 );
|
||||||
|
lower.Append( rect.GetPoint( 0 ) );
|
||||||
|
lower.Append( rect.GetPoint( 3 ) );
|
||||||
|
lower.Append( rect.GetPoint( 2 ) );
|
||||||
|
lower.Append( *inter1 );
|
||||||
|
lower.SetClosed( true );
|
||||||
|
}
|
||||||
|
else if( hit1 && hit2 )
|
||||||
|
{
|
||||||
|
// Cut across the upper right corner
|
||||||
|
wxLogTrace( traceBoardOutline, "Segment cuts upper right corner" );
|
||||||
|
|
||||||
|
// The upper half
|
||||||
|
upper.Append( *inter1 );
|
||||||
|
upper.Append( rect.GetPoint( 2 ) );
|
||||||
|
upper.Append( *inter2 );
|
||||||
|
upper.SetClosed( true );
|
||||||
|
|
||||||
|
// The lower half
|
||||||
|
lower.Append( *inter1 );
|
||||||
|
lower.Append( rect.GetPoint( 1 ) );
|
||||||
|
lower.Append( rect.GetPoint( 0 ) );
|
||||||
|
lower.Append( rect.GetPoint( 3 ) );
|
||||||
|
lower.Append( *inter2 );
|
||||||
|
lower.SetClosed( true );
|
||||||
|
}
|
||||||
|
else if( hit2 && hit3 )
|
||||||
|
{
|
||||||
|
// Cut across the lower right corner
|
||||||
|
wxLogTrace( traceBoardOutline, "Segment cuts lower right corner" );
|
||||||
|
|
||||||
|
// The upper half
|
||||||
|
upper.Append( *inter2 );
|
||||||
|
upper.Append( rect.GetPoint( 2 ) );
|
||||||
|
upper.Append( rect.GetPoint( 1 ) );
|
||||||
|
upper.Append( rect.GetPoint( 0 ) );
|
||||||
|
upper.Append( *inter3 );
|
||||||
|
upper.SetClosed( true );
|
||||||
|
|
||||||
|
// The bottom half
|
||||||
|
lower.Append( *inter2 );
|
||||||
|
lower.Append( rect.GetPoint( 3 ) );
|
||||||
|
lower.Append( *inter3 );
|
||||||
|
lower.SetClosed( true );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxLogDebug( "Hole open" );
|
// Cut across the lower left corner
|
||||||
hole.SetClosed( true );
|
wxLogTrace( traceBoardOutline, "Segment cuts upper left corner" );
|
||||||
openPolys.AddOutline( hole );
|
|
||||||
|
// The upper half
|
||||||
|
upper.Append( *inter0 );
|
||||||
|
upper.Append( rect.GetPoint( 1 ) );
|
||||||
|
upper.Append( rect.GetPoint( 2 ) );
|
||||||
|
upper.Append( rect.GetPoint( 3 ) );
|
||||||
|
upper.Append( *inter3 );
|
||||||
|
upper.SetClosed( true );
|
||||||
|
|
||||||
|
// The bottom half
|
||||||
|
lower.Append( *inter0 );
|
||||||
|
lower.Append( rect.GetPoint( 0 ) );
|
||||||
|
lower.Append( *inter3 );
|
||||||
|
lower.SetClosed( true );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
SHAPE_POLY_SET boardBoundingBox;
|
|
||||||
buildBoardBoundingBoxPoly( aBoard, boardBoundingBox );
|
|
||||||
|
|
||||||
for( int i = 0; i < openPolys.OutlineCount(); i++ )
|
|
||||||
{
|
{
|
||||||
SHAPE_LINE_CHAIN chain = openPolys.Outline( i );
|
// More than 1 segment
|
||||||
|
wxLogTrace( traceBoardOutline, "Multiple segments in outline" );
|
||||||
|
|
||||||
|
// Just a temporary thing
|
||||||
VECTOR2I startProj = projectPointOnSegment( chain.CPoint( 0 ), openPolys, i );
|
aOutlines = bbox;
|
||||||
VECTOR2I endProj = projectPointOnSegment( chain.CLastPoint(), openPolys, i );
|
return true;
|
||||||
|
|
||||||
wxLogDebug( "Start project: (%d, %d)", startProj.x, startProj.y );
|
|
||||||
wxLogDebug( "end project: (%d, %d)", endProj.x, endProj.y );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Figure out which is the correct outline
|
||||||
|
SHAPE_POLY_SET poly1;
|
||||||
|
SHAPE_POLY_SET poly2;
|
||||||
|
|
||||||
|
poly1.NewOutline();
|
||||||
|
poly1.Append( upper );
|
||||||
|
|
||||||
|
poly2.NewOutline();
|
||||||
|
poly2.Append( lower );
|
||||||
|
|
||||||
|
if( isCopperOutside( boardMod, poly1 ) )
|
||||||
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Using lower shape" );
|
||||||
|
aOutlines = poly2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Using upper shape" );
|
||||||
|
aOutlines = poly1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add all closed polys as holes to the main outline
|
||||||
|
for( SHAPE_LINE_CHAIN& closedChain : closedChains )
|
||||||
|
{
|
||||||
|
wxLogTrace( traceBoardOutline, "Adding hole to main outline" );
|
||||||
|
aOutlines.AddHole( closedChain, -1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return success;
|
// We really shouldn't reach this point
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue