Commit 63bc40b5 authored by Maciej Suminski's avatar Maciej Suminski Committed by Dick Hollenbeck

Takes into account hidden module text settings.

parents 15bfac3f 8e601974
...@@ -417,28 +417,35 @@ EDA_ITEM* TEXTE_MODULE::Clone() const ...@@ -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;
......
...@@ -240,7 +240,7 @@ void RN_NET::compute() ...@@ -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 ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment