Pcbnew plot: fix a few minor issues:

- SVG export: fix color of PCB texts.
- Avoid marking board as modified after plotting layers, when options not saved in board are modified.
This commit is contained in:
jean-pierre charras
2017-07-31 20:05:32 +02:00
parent 557e69f72a
commit 816307e500
6 changed files with 60 additions and 64 deletions
+8 -15
View File
@@ -224,18 +224,12 @@ bool BRDITEMS_PLOTTER::PlotAllTextsModule( MODULE* aModule )
// Plot text fields, if allowed
if( trace_ref )
{
if( GetReferenceColor() == COLOR4D::UNSPECIFIED )
PlotTextModule( &aModule->Reference(), getColor( textLayer ) );
else
PlotTextModule( &aModule->Reference(), GetReferenceColor() );
PlotTextModule( &aModule->Reference(), getColor( textLayer ) );
}
if( trace_val )
{
if( GetValueColor() == COLOR4D::UNSPECIFIED )
PlotTextModule( &aModule->Value(), getColor( textLayer ) );
else
PlotTextModule( &aModule->Value(), GetValueColor() );
PlotTextModule( &aModule->Value(), getColor( textLayer ) );
}
for( BOARD_ITEM* item = aModule->GraphicalItemsList().GetFirst(); item; item = item->Next() )
@@ -345,11 +339,9 @@ void BRDITEMS_PLOTTER::PlotDimension( DIMENSION* aDim )
draw.SetWidth( aDim->GetWidth() );
draw.SetLayer( aDim->GetLayer() );
COLOR4D color = aDim->GetBoard()->GetLayerColor( aDim->GetLayer() );
COLOR4D color = getColor( aDim->GetLayer() );
// Set plot color (change WHITE to LIGHTGRAY because
// the white items are not seen on a white paper or screen
m_plotter->SetColor( color != WHITE ? color : LIGHTGRAY);
m_plotter->SetColor( color );
PlotTextePcb( &aDim->Text() );
@@ -565,7 +557,8 @@ void BRDITEMS_PLOTTER::PlotTextePcb( TEXTE_PCB* pt_texte )
gbr_metadata.SetApertureAttrib( GBR_APERTURE_METADATA::GBR_APERTURE_ATTRIB_NONCONDUCTOR );
}
m_plotter->SetColor( getColor( pt_texte->GetLayer() ) );
COLOR4D color = getColor( pt_texte->GetLayer() );
m_plotter->SetColor( color );
size = pt_texte->GetTextSize();
pos = pt_texte->GetTextPos();
@@ -593,14 +586,14 @@ void BRDITEMS_PLOTTER::PlotTextePcb( TEXTE_PCB* pt_texte )
for( unsigned ii = 0; ii < strings_list.Count(); ii++ )
{
wxString& txt = strings_list.Item( ii );
m_plotter->Text( positions[ii], COLOR4D::UNSPECIFIED, txt, orient, size,
m_plotter->Text( positions[ii], color, txt, orient, size,
pt_texte->GetHorizJustify(), pt_texte->GetVertJustify(),
thickness, pt_texte->IsItalic(), allow_bold, false, &gbr_metadata );
}
}
else
{
m_plotter->Text( pos, COLOR4D::UNSPECIFIED, shownText, orient, size,
m_plotter->Text( pos, color, shownText, orient, size,
pt_texte->GetHorizJustify(), pt_texte->GetVertJustify(),
thickness, pt_texte->IsItalic(), allow_bold, false, &gbr_metadata );
}