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

Fix typo introduced in DLIST erradication. 

Fixes: lp:1832030
* https://bugs.launchpad.net/kicad/+bug/1832030
This commit is contained in:
Jeff Young 2019-06-11 01:00:15 +01:00
parent 6623ab91a8
commit b36f982272
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/kicad_clipboard.cpp
View File

@ -83,7 +83,7 @@ void CLIPBOARD_IO::SaveSelection( const PCBNEW_SELECTION& aSelected )
( i->Type() != PCB_PAD_T ) ) ( i->Type() != PCB_PAD_T ) )
{ {
onlyModuleParts = false; onlyModuleParts = false;
continue; break;
} }
} }

14
pcbnew/tools/pcbnew_control.cpp
View File

@ -771,7 +771,7 @@ static void moveNoFlagToVector( std::deque<T>& aList, std::vector<BOARD_ITEM*>&
{ {
std::copy_if( aList.begin(), aList.end(), std::back_inserter( aTarget ), std::copy_if( aList.begin(), aList.end(), std::back_inserter( aTarget ),
[](T aItem){ [](T aItem){
bool retval = aItem->GetFlags() & FLAG0; bool retval = ( aItem->GetFlags() & FLAG0 ) == 0;
aItem->ClearFlags( FLAG0 ); aItem->ClearFlags( FLAG0 );
return retval; return retval;
} ); } );
@ -876,27 +876,19 @@ int PCBNEW_CONTROL::AppendBoard( PLUGIN& pi, wxString& fileName )
if( !brd ) if( !brd )
return 1; return 1;
// Mark existing items, in order to know what are the new items // Mark existing items, in order to know what are the new items so we can select only
// to be ble to select only the new items after loadind // the new items after loading
for( auto track : brd->Tracks() ) for( auto track : brd->Tracks() )
{
track->SetFlags( FLAG0 ); track->SetFlags( FLAG0 );
}
for( auto module : brd->Modules() ) for( auto module : brd->Modules() )
{
module->SetFlags( FLAG0 ); module->SetFlags( FLAG0 );
}
for( auto drawing : brd->Drawings() ) for( auto drawing : brd->Drawings() )
{
drawing->SetFlags( FLAG0 ); drawing->SetFlags( FLAG0 );
}
for( auto zone : brd->Zones() ) for( auto zone : brd->Zones() )
{
zone->SetFlags( FLAG0 ); zone->SetFlags( FLAG0 );
}
// Keep also the count of copper layers, to adjust if necessary // Keep also the count of copper layers, to adjust if necessary
int initialCopperLayerCount = brd->GetCopperLayerCount(); int initialCopperLayerCount = brd->GetCopperLayerCount();