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

Fix a bug in commit 57e59a49

This commit is contained in:
jean-pierre charras 2022-05-20 15:08:50 +02:00
parent fa11e1c097
commit a09bd4ae12
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/tools/edit_tool_move_fct.cpp
View File

@ -202,6 +202,8 @@ void DRC_TEST_PROVIDER_COURTYARD_CLEARANCE_ON_MOVE::testCourtyardClearances()
return false; return false;
}; };
bool skipNextCmp = false;
if( ( frontA.OutlineCount() > 0 && frontA.BBoxFromCaches().Intersects( fpBBBox ) ) if( ( frontA.OutlineCount() > 0 && frontA.BBoxFromCaches().Intersects( fpBBBox ) )
|| ( backA.OutlineCount() > 0 && backA.BBoxFromCaches().Intersects( fpBBBox ) ) ) || ( backA.OutlineCount() > 0 && backA.BBoxFromCaches().Intersects( fpBBBox ) ) )
{ {
@ -211,11 +213,15 @@ void DRC_TEST_PROVIDER_COURTYARD_CLEARANCE_ON_MOVE::testCourtyardClearances()
{ {
m_FpInConflict.insert( fpA ); m_FpInConflict.insert( fpA );
m_FpInConflict.insert( fpB ); m_FpInConflict.insert( fpB );
return; skipNextCmp = true;
break;
} }
} }
} }
if( skipNextCmp )
continue; // fpA and fpB are already in list
if( ( frontB.OutlineCount() > 0 && frontB.BBoxFromCaches().Intersects( fpABBox ) ) if( ( frontB.OutlineCount() > 0 && frontB.BBoxFromCaches().Intersects( fpABBox ) )
|| ( backB.OutlineCount() > 0 && backB.BBoxFromCaches().Intersects( fpABBox ) ) ) || ( backB.OutlineCount() > 0 && backB.BBoxFromCaches().Intersects( fpABBox ) ) )
{ {
@ -225,7 +231,7 @@ void DRC_TEST_PROVIDER_COURTYARD_CLEARANCE_ON_MOVE::testCourtyardClearances()
{ {
m_FpInConflict.insert( fpA ); m_FpInConflict.insert( fpA );
m_FpInConflict.insert( fpB ); m_FpInConflict.insert( fpB );
return; break;
} }
} }
} }
@ -482,8 +488,8 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
// Ensure the "old" conflicts are cleared // Ensure the "old" conflicts are cleared
for( FOOTPRINT* fp: lastFpInConflict ) for( FOOTPRINT* fp: lastFpInConflict )
{ {
m_toolMgr->GetView()->Update( fp );
fp->ClearFlags( COURTYARD_CONFLICT ); fp->ClearFlags( COURTYARD_CONFLICT );
m_toolMgr->GetView()->Update( fp );
need_redraw = true; need_redraw = true;
} }
@ -493,11 +499,11 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
{ {
if( !fp->HasFlag( COURTYARD_CONFLICT ) ) if( !fp->HasFlag( COURTYARD_CONFLICT ) )
{ {
fp->SetFlags( COURTYARD_CONFLICT );
m_toolMgr->GetView()->Update( fp ); m_toolMgr->GetView()->Update( fp );
need_redraw = true; need_redraw = true;
} }
fp->SetFlags( COURTYARD_CONFLICT );
lastFpInConflict.push_back( fp ); lastFpInConflict.push_back( fp );
} }