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

Eeschema: Draw junctions last 

Places junctions on the schematic after all other items
to avoid visual clutter when a pin overlaps a junction.

Fixes lp:1582343

https://bugs.launchpad.net/kicad/+bug/1582343
This commit is contained in:
Seth Hillbrand 2017-11-03 10:56:59 -07:00 committed by Wayne Stambaugh
parent 5181c0ac75
commit 0017c701c7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/sch_screen.cpp
View File

@ -559,6 +559,7 @@ void SCH_SCREEN::Draw( EDA_DRAW_PANEL* aCanvas, wxDC* aDC, GR_DRAWMODE aDrawMode
* library editor and library viewer do not use m_drawList, and therefore * library editor and library viewer do not use m_drawList, and therefore
* their SCH_SCREEN::Draw() draws nothing * their SCH_SCREEN::Draw() draws nothing
*/ */
std::vector< SCH_ITEM* > junctions;
// Ensure links are up to date, even if a library was reloaded for some reason: // Ensure links are up to date, even if a library was reloaded for some reason:
UpdateSymbolLinks(); UpdateSymbolLinks();
@ -568,10 +569,16 @@ void SCH_SCREEN::Draw( EDA_DRAW_PANEL* aCanvas, wxDC* aDC, GR_DRAWMODE aDrawMode
if( item->IsMoving() || item->IsResized() ) if( item->IsMoving() || item->IsResized() )
continue; continue;
// uncomment line below when there is a virtual EDA_ITEM::GetBoundingBox() if( item->Type() == SCH_JUNCTION_T )
// if( panel->GetClipBox().Intersects( item->GetBoundingBox() ) ) junctions.push_back( item );
item->Draw( aCanvas, aDC, wxPoint( 0, 0 ), aDrawMode, aColor ); else
// uncomment line below when there is a virtual EDA_ITEM::GetBoundingBox()
// if( panel->GetClipBox().Intersects( item->GetBoundingBox() ) )
item->Draw( aCanvas, aDC, wxPoint( 0, 0 ), aDrawMode, aColor );
} }
for( auto item : junctions )
item->Draw( aCanvas, aDC, wxPoint( 0, 0 ), aDrawMode, aColor );
} }