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

ADDED: Polygon simplify 

Simplifies the polygon for graphical shape, zones and rule areas,
removing duplicate points and making the outline easier to handle

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17883
This commit is contained in:
Seth Hillbrand 2024-04-29 17:47:34 -07:00
parent 8b5564629a
commit 7fdb5e98a2
4 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
pcbnew/tools/edit_tool.cpp
View File

@ -136,6 +136,9 @@ static std::shared_ptr<CONDITIONAL_MENU> makeShapeModificationMenu( TOOL_INTERAC
static const std::vector<KICAD_T> polygonBooleanTypes = { PCB_SHAPE_LOCATE_RECT_T,
PCB_SHAPE_LOCATE_POLY_T };
static const std::vector<KICAD_T> polygonSimplifyTypes = { PCB_SHAPE_LOCATE_POLY_T,
PCB_ZONE_T };
auto hasCornerCondition =
[aTool]( const SELECTION& aSelection )
{
@ -154,6 +157,7 @@ static std::shared_ptr<CONDITIONAL_MENU> makeShapeModificationMenu( TOOL_INTERAC
// clang-format off
menu->AddItem( PCB_ACTIONS::healShapes, SELECTION_CONDITIONS::HasTypes( healShapesTypes ) );
menu->AddItem( PCB_ACTIONS::simplifyPolygons, SELECTION_CONDITIONS::HasTypes( polygonSimplifyTypes ) );
menu->AddItem( PCB_ACTIONS::filletLines, SELECTION_CONDITIONS::OnlyTypes( filletChamferTypes ) );
menu->AddItem( PCB_ACTIONS::chamferLines, SELECTION_CONDITIONS::OnlyTypes( filletChamferTypes ) );
menu->AddItem( PCB_ACTIONS::extendLines, SELECTION_CONDITIONS::OnlyTypes( lineExtendTypes )
@ -1463,6 +1467,76 @@ int EDIT_TOOL::ModifyLines( const TOOL_EVENT& aEvent )
}
int EDIT_TOOL::SimplifyPolygons( const TOOL_EVENT& aEvent )
{
PCB_SELECTION& selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool )
{
std::vector<VECTOR2I> pts;
// Iterate from the back so we don't have to worry about removals.
for( int i = aCollector.GetCount() - 1; i >= 0; --i )
{
BOARD_ITEM* item = aCollector[i];
if( !item->IsType( { PCB_SHAPE_LOCATE_POLY_T, PCB_ZONE_T } ) )
aCollector.Remove( item );
if( ZONE* zone = dyn_cast<ZONE*>( item ) )
{
if( zone->IsTeardropArea() )
aCollector.Remove( item );
}
}
},
true /* prompt user regarding locked items */ );
// Store last used value
static int s_toleranceValue = pcbIUScale.mmToIU( 3 );
WX_UNIT_ENTRY_DIALOG dlg( frame(), _( "Simplify Shapes" ), _( "Tolerance value:" ),
s_toleranceValue );
if( dlg.ShowModal() == wxID_CANCEL )
return 0;
s_toleranceValue = dlg.GetValue();
if( s_toleranceValue <= 0 )
return 0;
BOARD_COMMIT commit{ this };
std::vector<PCB_SHAPE*> shapeList;
for( EDA_ITEM* item : selection )
{
commit.Modify( item );
if( PCB_SHAPE* shape = dyn_cast<PCB_SHAPE*>( item ) )
{
SHAPE_POLY_SET& poly = shape->GetPolyShape();
poly.SimplifyOutlines( s_toleranceValue );
}
if( ZONE* zone = dyn_cast<ZONE*>( item ) )
{
SHAPE_POLY_SET* poly = zone->Outline();
poly->SimplifyOutlines( s_toleranceValue );
}
}
commit.Push( _( "Simplify Polygons" ) );
// Notify other tools of the changes
m_toolMgr->ProcessEvent( EVENTS::SelectedItemsModified );
return 0;
}
int EDIT_TOOL::HealShapes( const TOOL_EVENT& aEvent )
{
PCB_SELECTION& selection = m_selectionTool->RequestSelection(
@ -3074,6 +3148,7 @@ void EDIT_TOOL::setTransitions()
Go( &EDIT_TOOL::FilletTracks, PCB_ACTIONS::filletTracks.MakeEvent() );
Go( &EDIT_TOOL::ModifyLines, PCB_ACTIONS::filletLines.MakeEvent() );
Go( &EDIT_TOOL::ModifyLines, PCB_ACTIONS::chamferLines.MakeEvent() );
Go( &EDIT_TOOL::SimplifyPolygons, PCB_ACTIONS::simplifyPolygons.MakeEvent() );
Go( &EDIT_TOOL::HealShapes, PCB_ACTIONS::healShapes.MakeEvent() );
Go( &EDIT_TOOL::ModifyLines, PCB_ACTIONS::extendLines.MakeEvent() );
Go( &EDIT_TOOL::BooleanPolygons, PCB_ACTIONS::mergePolygons.MakeEvent() );

5
pcbnew/tools/edit_tool.h
View File

@ -137,6 +137,11 @@ public:
*/
int HealShapes( const TOOL_EVENT& aEvent );
/**
* Simplify the outlines of selected polygon objects
*/
int SimplifyPolygons( const TOOL_EVENT& aEvent );
/**
* Modify selected polygons into a single polygon using boolean operations
* such as merge (union) or subtract (difference)

6
pcbnew/tools/pcb_actions.cpp
View File

@ -622,6 +622,12 @@ TOOL_ACTION PCB_ACTIONS::chamferLines( TOOL_ACTION_ARGS()
.Tooltip( _( "Cut away corners between selected lines" ) )
.Icon( BITMAPS::chamfer ) );
TOOL_ACTION PCB_ACTIONS::simplifyPolygons( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveEdit.simplifyPolygons" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Simplify Polygons" ) )
.Tooltip( _( "Simplify polygon outlines, removing superfluous points" ) ) );
TOOL_ACTION PCB_ACTIONS::healShapes( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveEdit.healShapes" )
.Scope( AS_GLOBAL )

2
pcbnew/tools/pcb_actions.h
View File

@ -162,6 +162,8 @@ public:
static TOOL_ACTION healShapes;
/// Extend selected lines to meet at a point
static TOOL_ACTION extendLines;
/// Simplify polygon outlines
static TOOL_ACTION simplifyPolygons;
/// Merge multiple polygons into a single polygon
static TOOL_ACTION mergePolygons;