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

Move "hide" back to prior fp_text location

This commit is contained in:
Dick Hollenbeck 2017-01-27 15:44:41 -06:00 committed by Wayne Stambaugh
parent 59876c35ae
commit 35fc1f3361
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/eda_text.cpp
View File

@ -425,6 +425,7 @@ bool EDA_TEXT::IsDefaultFormatting() const
);
}
void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
throw( IO_ERROR )
{
@ -481,7 +482,7 @@ void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl
aFormatter->Print( 0, ")" );
}
if( !IsVisible() )
if( !(aControlBits & CTL_OMIT_HIDE) && !IsVisible() )
aFormatter->Print( 0, " hide" );
aFormatter->Print( 0, ")\n" );

4
include/eda_text.h
View File

@ -36,6 +36,10 @@
#include <base_struct.h> // EDA_RECT
// part of the kicad_plugin.h family of defines.
#define CTL_OMIT_HIDE (1 << 6) // found in eda_text.h
// Graphic Text justify:
// Values -1,0,1 are used in computations, do not change them
enum EDA_TEXT_HJUSTIFY_T {

4
pcbnew/kicad_plugin.cpp
View File

@ -1422,14 +1422,12 @@ void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const
m_out->Print( 0, ")" );
formatLayer( aText );
/* 25-Jan-2017: "hide" now moved into (effects ... ) block
if( !aText->IsVisible() )
m_out->Print( 0, " hide" );
*/
m_out->Print( 0, "\n" );
aText->EDA_TEXT::Format( m_out, aNestLevel, m_ctl );
aText->EDA_TEXT::Format( m_out, aNestLevel, m_ctl | CTL_OMIT_HIDE );
m_out->Print( aNestLevel, ")\n" );
}

1
pcbnew/kicad_plugin.h
View File

@ -51,6 +51,7 @@ class NETINFO_MAPPING;
#define CTL_OMIT_PATH (1 << 4) ///< Omit component sheet time stamp (useless in library)
#define CTL_OMIT_AT (1 << 5) ///< Omit position and rotation
// (always saved with potion 0,0 and rotation = 0 in library)
//#define CTL_OMIT_HIDE (1 << 6) // found in eda_text.h
// common combinations of the above: