From d3004fc8336502a5c02775362f5dddc665cd4dab Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Tue, 2 Apr 2013 11:03:15 +0200 Subject: [PATCH] Showing module's value and reference text on proper layers. --- pcbnew/basepcbframe.cpp | 1 + pcbnew/class_text_mod.cpp | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp index 2cd72ee990..57947a7585 100644 --- a/pcbnew/basepcbframe.cpp +++ b/pcbnew/basepcbframe.cpp @@ -92,6 +92,7 @@ const int m_galLayerOrder[] = DRAW_N, COMMENT_N, ECO1_N, ECO2_N, EDGE_N, UNUSED_LAYER_29, UNUSED_LAYER_30, UNUSED_LAYER_31, ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ), + ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE), ITEM_GAL_LAYER( MOD_VALUES_VISIBLE ), SILKSCREEN_N_FRONT, SOLDERPASTE_N_FRONT, ADHESIVE_N_FRONT, SOLDERMASK_N_FRONT, ITEM_GAL_LAYER( VIA_HOLES_VISIBLE ), ITEM_GAL_LAYER( PAD_HOLES_VISIBLE ), diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp index 56de7e3c5f..f909ee8099 100644 --- a/pcbnew/class_text_mod.cpp +++ b/pcbnew/class_text_mod.cpp @@ -490,14 +490,27 @@ EDA_ITEM* TEXTE_MODULE::Clone() const void TEXTE_MODULE::ViewGetLayers( int aLayers[], int& aCount ) const { - switch( GetParent()->GetLayer() ) + switch( m_Type ) { - case LAYER_N_BACK: - aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE ); // how about SILKSCREEN_N_BACK? + case TEXT_is_REFERENCE: + aLayers[0] = ITEM_GAL_LAYER( MOD_REFERENCES_VISIBLE ); break; - case LAYER_N_FRONT: - aLayers[0] = ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ); // how about SILKSCREEN_N_FRONT? + case TEXT_is_VALUE: + 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; }