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

Fix incorrect assertion failure in specctra export, when a footprint contains segments on edge.cut layer (Bug #1545546)

This commit is contained in:
jean-pierre charras 2016-02-15 09:55:10 +01:00
parent aa6beaaba0
commit 8931df339e
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pcbnew/specctra_export.cpp
View File

@ -289,7 +289,7 @@ static DRAWSEGMENT* findPoint( const wxPoint& aPoint, ::PCB_TYPE_COLLECTOR* item
DRAWSEGMENT* graphic = (DRAWSEGMENT*) (*items)[i]; DRAWSEGMENT* graphic = (DRAWSEGMENT*) (*items)[i];
unsigned d; unsigned d;
wxASSERT( graphic->Type() == PCB_LINE_T ); wxASSERT( graphic->Type() == PCB_LINE_T || graphic->Type() == PCB_MODULE_EDGE_T );
switch( graphic->GetShape() ) switch( graphic->GetShape() )
{ {
@ -348,7 +348,7 @@ static DRAWSEGMENT* findPoint( const wxPoint& aPoint, ::PCB_TYPE_COLLECTOR* item
#if defined(DEBUG) #if defined(DEBUG)
if( items->GetCount() ) if( items->GetCount() )
{ {
printf( "Unable to find segment matching point (%.6g,%.6g) (seg count %d)\n", printf( "Unable to find segment matching point (%.6g;%.6g) (seg count %d)\n",
IU2um( aPoint.x )/1000, IU2um( aPoint.y )/1000, IU2um( aPoint.x )/1000, IU2um( aPoint.y )/1000,
items->GetCount()); items->GetCount());
@ -356,13 +356,22 @@ static DRAWSEGMENT* findPoint( const wxPoint& aPoint, ::PCB_TYPE_COLLECTOR* item
{ {
DRAWSEGMENT* graphic = (DRAWSEGMENT*) (*items)[i]; DRAWSEGMENT* graphic = (DRAWSEGMENT*) (*items)[i];
printf( "item %d, type=%s, start=%.6g %.6g end=%.6g,%.6g\n", if( graphic->GetShape() == S_ARC )
i + 1, printf( "item %d, type=%s, start=%.6g;%.6g end=%.6g;%.6g\n",
TO_UTF8( BOARD_ITEM::ShowShape( graphic->GetShape() ) ), i + 1,
IU2um( graphic->GetStart().x )/1000, TO_UTF8( BOARD_ITEM::ShowShape( graphic->GetShape() ) ),
IU2um( graphic->GetStart().y )/1000, IU2um( graphic->GetArcStart().x )/1000,
IU2um( graphic->GetEnd().x )/1000, IU2um( graphic->GetArcStart().y )/1000,
IU2um( graphic->GetEnd().y )/1000 ); IU2um( graphic->GetArcEnd().x )/1000,
IU2um( graphic->GetArcEnd().y )/1000 );
else
printf( "item %d, type=%s, start=%.6g;%.6g end=%.6g;%.6g\n",
i + 1,
TO_UTF8( BOARD_ITEM::ShowShape( graphic->GetShape() ) ),
IU2um( graphic->GetStart().x )/1000,
IU2um( graphic->GetStart().y )/1000,
IU2um( graphic->GetEnd().x )/1000,
IU2um( graphic->GetEnd().y )/1000 );
} }
} }
#endif #endif