electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore BRIGHTENED state when printing.

Browse Source 
Fixes: lp:1788480
* https://bugs.launchpad.net/kicad/+bug/1788480
This commit is contained in:
Jeff Young
2019-04-01 13:23:37 +01:00
parent 3da5396c8d
commit 81d4a45e73
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eeschema/sch_bus_entry.cpp
+3 -1
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 );
eeschema/sch_junction.cpp
+3 -3
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 );
eeschema/sch_line.cpp
+3 -1
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 );
eeschema/sch_text.cpp
+9 -5
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 );