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

Don't allow duplication of footprint items outside of footprint editor. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15487
This commit is contained in:
Jeff Young 2023-09-03 22:04:00 +01:00
parent e7d6c84aef
commit 9bba8e5956
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/tools/edit_tool.cpp
View File

@ -2207,6 +2207,7 @@ int EDIT_TOOL::Duplicate( const TOOL_EVENT& aEvent )
const PCB_SELECTION& selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I&, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool )
{
sTool->FilterCollectorForFreePads( aCollector, true );
sTool->FilterCollectorForMarkers( aCollector );
sTool->FilterCollectorForHierarchy( aCollector, true );
} );
@ -2250,18 +2251,12 @@ int EDIT_TOOL::Duplicate( const TOOL_EVENT& aEvent )
}
else if( FOOTPRINT* parentFootprint = orig_item->GetParentFootprint() )
{
commit.Modify( parentFootprint );
dupe_item = parentFootprint->DuplicateItem( orig_item, true /* add to parent */ );
// No sub-footprint modifications allowed outside of footprint editor
}
else
{
switch( orig_item->Type() )
{
case PCB_FIELD_T:
// Todo: these should probably be duplicated into new text items that
// have variables that reference the field values
break;
case PCB_FOOTPRINT_T:
case PCB_TEXT_T:
case PCB_TEXTBOX_T:

2
pcbnew/tools/edit_tool_move_fct.cpp
View File

@ -171,7 +171,7 @@ int EDIT_TOOL::PackAndMoveFootprints( const TOOL_EVENT& aEvent )
{
sTool->FilterCollectorForMarkers( aCollector );
sTool->FilterCollectorForHierarchy( aCollector, true );
sTool->FilterCollectorForFreePads( aCollector );
sTool->FilterCollectorForFreePads( aCollector, true );
// Iterate from the back so we don't have to worry about removals.
for( int i = aCollector.GetCount() - 1; i >= 0; --i )

5
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -3281,7 +3281,8 @@ void PCB_SELECTION_TOOL::FilterCollectorForHierarchy( GENERAL_COLLECTOR& aCollec
}
void PCB_SELECTION_TOOL::FilterCollectorForFreePads( GENERAL_COLLECTOR& aCollector ) const
void PCB_SELECTION_TOOL::FilterCollectorForFreePads( GENERAL_COLLECTOR& aCollector,
bool aForcePromotion ) const
{
std::set<BOARD_ITEM*> to_add;
@ -3291,7 +3292,7 @@ void PCB_SELECTION_TOOL::FilterCollectorForFreePads( GENERAL_COLLECTOR& aCollect
BOARD_ITEM* item = aCollector[i];
if( !m_isFootprintEditor && item->Type() == PCB_PAD_T
&& !frame()->GetPcbNewSettings()->m_AllowFreePads )
&& ( !frame()->GetPcbNewSettings()->m_AllowFreePads || aForcePromotion ) )
{
if( !aCollector.HasItem( item->GetParent() ) )
to_add.insert( item->GetParent() );

3
pcbnew/tools/pcb_selection_tool.h
View File

@ -199,7 +199,8 @@ public:
* Check the "allow free pads" setting and if disabled, replace any pads in the collector
* with their parent footprints.
*/
void FilterCollectorForFreePads( GENERAL_COLLECTOR& aCollector ) const;
void FilterCollectorForFreePads( GENERAL_COLLECTOR& aCollector,
bool aForcePromotion = false ) const;
/**
* Drop any PCB_MARKERs from the collector.