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

Backed out assembly plot patch

This commit is contained in:
Lorenzo Marcantonio 2014-09-09 18:55:27 +02:00
parent fb590c7231
commit c5681a3278
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -508,7 +508,7 @@ set( wxWidgets_CONFIG_OPTIONS --static=no )
if( APPLE AND ( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES OR KICAD_SCRIPTING_WXPYTHON) ) if( APPLE AND ( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES OR KICAD_SCRIPTING_WXPYTHON) )
find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET ) find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
else() else()
find_package( wxWidgets COMPONENTS gl aui adv html core net base xml QUIET ) find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
endif() endif()
if( NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) ) if( NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) )

12
pcbnew/plot_brditems_plotter.cpp
View File

@ -124,13 +124,6 @@ bool BRDITEMS_PLOTTER::PlotAllTextsModule( MODULE* aModule )
if( textLayer > LAYER_ID_COUNT ) // how will this ever be true? if( textLayer > LAYER_ID_COUNT ) // how will this ever be true?
return false; return false;
// Special rule: assembly always shows reference from the silk layer
if( (m_layerMask[F_Fab]) && (textLayer == F_SilkS) )
trace_ref = true;
if( (m_layerMask[B_Fab]) && (textLayer == B_SilkS) )
trace_ref = true;
if( !m_layerMask[textLayer] ) if( !m_layerMask[textLayer] )
trace_val = false; trace_val = false;
@ -223,11 +216,6 @@ void BRDITEMS_PLOTTER::PlotTextModule( TEXTE_MODULE* pt_texte, EDA_COLOR_T aColo
// calculate some text parameters : // calculate some text parameters :
size = pt_texte->GetSize(); size = pt_texte->GetSize();
// Assembly drawings always have the reference on the origin
if( m_layerMask[F_Fab] || m_layerMask[B_Fab] )
pos = static_cast<MODULE*>( pt_texte->GetParent() )->GetPosition();
else
pos = pt_texte->GetTextPosition(); pos = pt_texte->GetTextPosition();
orient = pt_texte->GetDrawRotation(); orient = pt_texte->GetDrawRotation();