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

Takes into account hidden module text settings.

This commit is contained in:
Maciej Suminski 2014-02-03 07:22:31 -06:00 committed by Dick Hollenbeck
parent 15bfac3f4e 8e6019748a
commit 63bc40b58e
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pcbnew/class_text_mod.cpp
View File

@ -417,28 +417,35 @@ EDA_ITEM* TEXTE_MODULE::Clone() const
void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const
{ {
switch( m_Type ) if( m_NoShow ) // Hidden text
{ {
case TEXT_is_REFERENCE: aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_INVISIBLE );
aLayers[0] = ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE ); }
break; else
{
case TEXT_is_VALUE: switch( m_Type )
aLayers[0] = ITEM_GAL_LAYER( MOD_VALUES_VISIBLE );
break;
default:
switch( GetParent()->GetLayer() )
{ {
case LAYER_N_BACK: case TEXT_is_REFERENCE:
aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE ); // how about SILKSCREEN_N_BACK? aLayers[0] = ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE );
break; break;
case LAYER_N_FRONT: case TEXT_is_VALUE:
aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ); // how about SILKSCREEN_N_FRONT? aLayers[0] = ITEM_GAL_LAYER( MOD_VALUES_VISIBLE );
break;
default:
switch( GetParent()->GetLayer() )
{
case LAYER_N_BACK:
aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE ); // how about SILKSCREEN_N_BACK?
break;
case LAYER_N_FRONT:
aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ); // how about SILKSCREEN_N_FRONT?
break;
}
break; break;
} }
break;
} }
aCount = 1; aCount = 1;

2
pcbnew/ratsnest_data.cpp
View File

@ -240,7 +240,7 @@ void RN_NET::compute()
return; return;
} }
else if( boardNodes.size() == 1 ) // This case is even simpler else if( boardNodes.size() <= 1 ) // This case is even simpler
{ {
m_rnEdges.reset( new std::vector<RN_EDGE_PTR>( 0 ) ); m_rnEdges.reset( new std::vector<RN_EDGE_PTR>( 0 ) );