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

Remember conversion strategy. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13043
This commit is contained in:
Jeff Young 2022-11-30 14:27:40 +00:00
parent 17bb57cc73
commit 98ab078905
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pcbnew/tools/convert_tool.cpp
View File

@ -153,6 +153,8 @@ CONVERT_TOOL::CONVERT_TOOL() :
m_menu( nullptr ), m_menu( nullptr ),
m_frame( nullptr ) m_frame( nullptr )
{ {
m_convertSettings.m_Strategy = CENTERLINE;
m_convertSettings.m_DeleteOriginals = true;
} }
@ -225,13 +227,9 @@ bool CONVERT_TOOL::Init()
int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent ) int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
{ {
std::vector<SHAPE_POLY_SET> polys; std::vector<SHAPE_POLY_SET> polys;
CONVERT_SETTINGS convertSettings;
PCB_LAYER_ID destLayer = m_frame->GetActiveLayer(); PCB_LAYER_ID destLayer = m_frame->GetActiveLayer();
FOOTPRINT* parentFootprint = nullptr; FOOTPRINT* parentFootprint = nullptr;
convertSettings.m_Strategy = BOUNDING_HULL; // Required for preflight at least
convertSettings.m_DeleteOriginals = true;
PCB_SELECTION& selection = m_selectionTool->RequestSelection( PCB_SELECTION& selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool ) []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool )
{ {
@ -241,7 +239,7 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
return 0; return 0;
auto getPolys = auto getPolys =
[&]() [&]( CONVERT_STRATEGY strategy )
{ {
polys.clear(); polys.clear();
@ -250,13 +248,11 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
SHAPE_POLY_SET polySet; SHAPE_POLY_SET polySet;
polySet.Append( makePolysFromClosedGraphics( selection.GetItems(), polySet.Append( makePolysFromClosedGraphics( selection.GetItems(), strategy ) );
convertSettings.m_Strategy) );
polySet.Append( makePolysFromChainedSegs( selection.GetItems(), polySet.Append( makePolysFromChainedSegs( selection.GetItems(), strategy ) );
convertSettings.m_Strategy) );
if( convertSettings.m_Strategy == BOUNDING_HULL ) if( strategy == BOUNDING_HULL )
polySet.Append( makePolysFromOpenGraphics( selection.GetItems() ) ); polySet.Append( makePolysFromOpenGraphics( selection.GetItems() ) );
if( polySet.IsEmpty() ) if( polySet.IsEmpty() )
@ -276,7 +272,7 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
}; };
// Pre-flight getPolys() to see if there's anything to convert. // Pre-flight getPolys() to see if there's anything to convert.
if( !getPolys() ) if( !getPolys( BOUNDING_HULL ) )
return 0; return 0;
bool isFootprint = m_frame->IsType( FRAME_FOOTPRINT_EDITOR ); bool isFootprint = m_frame->IsType( FRAME_FOOTPRINT_EDITOR );
@ -297,12 +293,12 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
if( aEvent.IsAction( &PCB_ACTIONS::convertToPoly ) ) if( aEvent.IsAction( &PCB_ACTIONS::convertToPoly ) )
{ {
CONVERT_SETTINGS_DIALOG dlg( m_frame, &convertSettings ); CONVERT_SETTINGS_DIALOG dlg( m_frame, &m_convertSettings );
if( dlg.ShowModal() != wxID_OK ) if( dlg.ShowModal() != wxID_OK )
return 0; return 0;
if( !getPolys() ) if( !getPolys( m_convertSettings.m_Strategy ) )
return 0; return 0;
for( const SHAPE_POLY_SET& poly : polys ) for( const SHAPE_POLY_SET& poly : polys )
@ -310,7 +306,7 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
PCB_SHAPE* graphic = isFootprint ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE; PCB_SHAPE* graphic = isFootprint ? new FP_SHAPE( parentFootprint ) : new PCB_SHAPE;
int width = bds.m_LineThickness[ bds.GetLayerClass( layer ) ]; int width = bds.m_LineThickness[ bds.GetLayerClass( layer ) ];
if( convertSettings.m_Strategy == COPY_LINEWIDTH ) if( m_convertSettings.m_Strategy == COPY_LINEWIDTH )
{ {
BOARD_ITEM* topLeftItem = nullptr; BOARD_ITEM* topLeftItem = nullptr;
VECTOR2I pos; VECTOR2I pos;
@ -357,26 +353,30 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
int ret; int ret;
// No copy-line-width option for zones/keepouts
if( m_convertSettings.m_Strategy == COPY_LINEWIDTH )
m_convertSettings.m_Strategy = CENTERLINE;
if( aEvent.IsAction( &PCB_ACTIONS::convertToKeepout ) ) if( aEvent.IsAction( &PCB_ACTIONS::convertToKeepout ) )
{ {
zoneInfo.SetIsRuleArea( true ); zoneInfo.SetIsRuleArea( true );
ret = InvokeRuleAreaEditor( frame, &zoneInfo, &convertSettings ); ret = InvokeRuleAreaEditor( frame, &zoneInfo, &m_convertSettings );
} }
else if( nonCopper ) else if( nonCopper )
{ {
zoneInfo.SetIsRuleArea( false ); zoneInfo.SetIsRuleArea( false );
ret = InvokeNonCopperZonesEditor( frame, &zoneInfo, &convertSettings ); ret = InvokeNonCopperZonesEditor( frame, &zoneInfo, &m_convertSettings );
} }
else else
{ {
zoneInfo.SetIsRuleArea( false ); zoneInfo.SetIsRuleArea( false );
ret = InvokeCopperZonesEditor( frame, &zoneInfo, &convertSettings ); ret = InvokeCopperZonesEditor( frame, &zoneInfo, &m_convertSettings );
} }
if( ret == wxID_CANCEL ) if( ret == wxID_CANCEL )
return 0; return 0;
if( !getPolys() ) if( !getPolys( m_convertSettings.m_Strategy ) )
return 0; return 0;
for( const SHAPE_POLY_SET& poly : polys ) for( const SHAPE_POLY_SET& poly : polys )
@ -392,7 +392,7 @@ int CONVERT_TOOL::CreatePolys( const TOOL_EVENT& aEvent )
} }
} }
if( convertSettings.m_DeleteOriginals ) if( m_convertSettings.m_DeleteOriginals )
{ {
PCB_SELECTION selectionCopy = selection; PCB_SELECTION selectionCopy = selection;
m_selectionTool->ClearSelection(); m_selectionTool->ClearSelection();

2
pcbnew/tools/convert_tool.h
View File

@ -96,9 +96,11 @@ private:
SHAPE_POLY_SET makePolysFromClosedGraphics( const std::deque<EDA_ITEM*>& aItems, SHAPE_POLY_SET makePolysFromClosedGraphics( const std::deque<EDA_ITEM*>& aItems,
CONVERT_STRATEGY aStrategy ); CONVERT_STRATEGY aStrategy );
private:
PCB_SELECTION_TOOL* m_selectionTool; PCB_SELECTION_TOOL* m_selectionTool;
CONDITIONAL_MENU* m_menu; CONDITIONAL_MENU* m_menu;
PCB_BASE_FRAME* m_frame; PCB_BASE_FRAME* m_frame;
CONVERT_SETTINGS m_convertSettings;
}; };
#endif #endif