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

eeschema: Set images to draw first in eeschema 

Bitmaps in eeschema are mainly used for referencing and data.  Having
them between functional items obscures the elements.  This places the
images in the background for eeschema as a partial fix for lp:1787404

This commit should not be picked into 5.1 as the canvas changes.
This commit is contained in:
Seth Hillbrand 2018-09-06 02:11:01 -07:00
parent 1f60d8fdbf
commit 5e9b4dd6a5
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/sch_screen.cpp
View File

@ -535,21 +535,33 @@ void SCH_SCREEN::Draw( EDA_DRAW_PANEL* aCanvas, wxDC* aDC, GR_DRAWMODE aDrawMode
* their SCH_SCREEN::Draw() draws nothing
*/
std::vector< SCH_ITEM* > junctions;
std::vector< SCH_ITEM* > middlez;
// Ensure links are up to date, even if a library was reloaded for some reason:
UpdateSymbolLinks();
// BITMAPs are drawn first, junctions are drawn last
// All other items are drawn in the order they were placed in the schematic
for( SCH_ITEM* item = m_drawList.begin(); item; item = item->Next() )
{
if( item->IsMoving() || item->IsResized() )
continue;
// TODO: clean this draw routine with a well-defined drawing order (maybe 5.1?)
if( item->Type() == SCH_JUNCTION_T )
junctions.push_back( item );
else
// uncomment line below when there is a virtual EDA_ITEM::GetBoundingBox()
// if( panel->GetClipBox().Intersects( item->GetBoundingBox() ) )
else if( item->Type() == SCH_BITMAP_T )
item->Draw( aCanvas, aDC, wxPoint( 0, 0 ), aDrawMode, aColor );
else
middlez.push_back( item );
}
for( auto item : middlez )
{
// 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 )