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

Allow rectangles to be converted to lines

This commit is contained in:
Jon Evans 2020-09-08 08:41:22 -04:00
parent a0fbb79fd0
commit 3d5b216d1d
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pcbnew/tools/convert_tool.cpp
View File

@ -77,7 +77,7 @@ bool CONVERT_TOOL::Init()
auto anyLines = graphicLines || trackLines; auto anyLines = graphicLines || trackLines;
auto anyPolys = ( S_C::OnlyType( PCB_ZONE_AREA_T ) || auto anyPolys = ( S_C::OnlyType( PCB_ZONE_AREA_T ) ||
P_S_C::OnlyGraphicShapeTypes( { S_POLYGON } ) ); P_S_C::OnlyGraphicShapeTypes( { S_POLYGON, S_RECT } ) );
auto lineToArc = P_S_C::OnlyGraphicShapeTypes( { S_SEGMENT } ) || auto lineToArc = P_S_C::OnlyGraphicShapeTypes( { S_SEGMENT } ) ||
S_C::OnlyType( PCB_TRACE_T ); S_C::OnlyType( PCB_TRACE_T );
@ -358,6 +358,9 @@ int CONVERT_TOOL::PolyToLines( const TOOL_EVENT& aEvent )
case S_POLYGON: case S_POLYGON:
break; break;
case S_RECT:
break;
default: default:
aCollector.Remove( item ); aCollector.Remove( item );
} }
@ -388,9 +391,33 @@ int CONVERT_TOOL::PolyToLines( const TOOL_EVENT& aEvent )
break; break;
case PCB_LINE_T: case PCB_LINE_T:
wxASSERT( static_cast<DRAWSEGMENT*>( aItem )->GetShape() == S_POLYGON ); {
set = static_cast<DRAWSEGMENT*>( aItem )->GetPolyShape(); DRAWSEGMENT* graphic = static_cast<DRAWSEGMENT*>( aItem );
if( graphic->GetShape() == S_POLYGON )
{
set = graphic->GetPolyShape();
}
else if( graphic->GetShape() == S_RECT )
{
SHAPE_LINE_CHAIN outline;
VECTOR2I start( graphic->GetStart() );
VECTOR2I end( graphic->GetEnd() );
outline.Append( start );
outline.Append( VECTOR2I( end.x, start.y ) );
outline.Append( end );
outline.Append( VECTOR2I( start.x, end.y ) );
outline.SetClosed( true );
set.AddOutline( outline );
}
else
{
wxFAIL_MSG( "Unhandled graphic shape type in PolyToLines - getPolySet" );
}
break; break;
}
default: default:
wxFAIL_MSG( "Unhandled type in PolyToLines - getPolySet" ); wxFAIL_MSG( "Unhandled type in PolyToLines - getPolySet" );