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

Remove preferred layer disambiguation for multiple modules. 

The preferred list isn't actually in use anymore at this point, so
it currently has no effect other than to mess things up since we
aren't keeping track of which modules have been rejected when we
check the module count.

Fixes https://gitlab.com/kicad/code/kicad/issues/3721
This commit is contained in:
Jeff Young 2020-02-03 15:44:41 +00:00
parent 465ffff162
commit d02c0da3ab
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/tools/selection_tool.cpp
View File

@ -1973,10 +1973,8 @@ void SELECTION_TOOL::GuessSelectionCandidates( GENERAL_COLLECTOR& aCollector,
}
}
int numZones = aCollector.CountType( PCB_ZONE_AREA_T );
// Zone edges are very specific; zone fills much less so.
if( numZones > 0 )
if( aCollector.CountType( PCB_ZONE_AREA_T ) > 0 )
{
for( int i = aCollector.GetCount() - 1; i >= 0; i-- )
{
@ -2102,9 +2100,7 @@ void SELECTION_TOOL::GuessSelectionCandidates( GENERAL_COLLECTOR& aCollector,
}
}
int moduleCount = aCollector.CountType( PCB_MODULE_T );
if( moduleCount > 0 )
if( aCollector.CountType( PCB_MODULE_T ) > 0 )
{
double maxArea = calcMaxArea( aCollector, PCB_MODULE_T );
BOX2D viewportD = getView()->GetViewport();
@ -2131,10 +2127,6 @@ void SELECTION_TOOL::GuessSelectionCandidates( GENERAL_COLLECTOR& aCollector,
// footprint then it should be considered for selection
else if( calcRatio( calcArea( mod ), maxArea ) <= footprintToFootprintMinRatio )
continue;
// if there are multiple footprints for selection at this point, prefer
// one that is on the active layer
else if( moduleCount > 1 && mod->GetLayer() == activeLayer )
preferred.insert( mod );
// reject ALL OTHER footprints if there's still something else left
// to select
else if( (int)( rejected.size() + 1 ) < aCollector.GetCount() )