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

Ignore BRIGHTENED state when printing. 

Fixes: lp:1788480
* https://bugs.launchpad.net/kicad/+bug/1788480
This commit is contained in:
Jeff Young 2019-03-07 15:25:19 +00:00
parent 3da5396c8d
commit 81d4a45e73
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/sch_bus_entry.cpp
View File

@ -167,8 +167,10 @@ void SCH_BUS_ENTRY_BASE::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint&
if( aColor != COLOR4D::UNSPECIFIED )
color = aColor;
else if( aPanel->GetScreen() && !aPanel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
color = GetLayerColor( LAYER_BRIGHTENED );
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
color = GetLayerColor( m_Layer );
GRSetDrawMode( aDC, aDrawMode );

6
eeschema/sch_junction.cpp
View File

@ -100,10 +100,10 @@ void SCH_JUNCTION::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffs
if( aColor != COLOR4D::UNSPECIFIED )
color = aColor;
else if( aPanel->GetScreen() && !aPanel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
color = GetLayerColor( LAYER_BRIGHTENED );
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED :
( conn && conn->IsBus() ) ?
LAYER_BUS : m_Layer );
color = GetLayerColor( ( conn && conn->IsBus() ) ? LAYER_BUS : m_Layer );
GRSetDrawMode( aDC, aDrawMode );

4
eeschema/sch_line.cpp
View File

@ -315,8 +315,10 @@ void SCH_LINE::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
color = Color;
else if( m_color != COLOR4D::UNSPECIFIED )
color = m_color;
else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
color = GetLayerColor( LAYER_BRIGHTENED );
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
color = GetLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );

14
eeschema/sch_text.cpp
View File

@ -316,8 +316,10 @@ void SCH_TEXT::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& aOffset,
if( Color != COLOR4D::UNSPECIFIED )
color = Color;
else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
color = GetLayerColor( LAYER_BRIGHTENED );
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
color = GetLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
@ -843,8 +845,10 @@ void SCH_GLOBALLABEL::Draw( EDA_DRAW_PANEL* panel,
if( Color != COLOR4D::UNSPECIFIED )
color = Color;
else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
color = GetLayerColor( LAYER_BRIGHTENED );
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED : m_Layer );
color = GetLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
@ -1110,10 +1114,10 @@ void SCH_HIERLABEL::Draw( EDA_DRAW_PANEL* panel,
if( Color != COLOR4D::UNSPECIFIED )
color = Color;
else if( panel->GetScreen() && !panel->GetScreen()->m_IsPrinting && GetState( BRIGHTENED ) )
color = GetLayerColor( LAYER_BRIGHTENED );
else
color = GetLayerColor( GetState( BRIGHTENED ) ? LAYER_BRIGHTENED :
( conn && conn->IsBus() ) ?
LAYER_BUS : m_Layer );
color = GetLayerColor( ( conn && conn->IsBus() ) ? LAYER_BUS : m_Layer );
GRSetDrawMode( DC, DrawMode );