eeschema: fix set bus width when define KICAD_GOST

This commit is contained in:
Andrey Fedorushkov 2012-05-25 18:33:58 +04:00
parent e6ec9f0a32
commit d8c14403f2
4 changed files with 0 additions and 28 deletions

View File

@ -37,15 +37,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
{ {
m_choiceUnits->SetFocus(); m_choiceUnits->SetFocus();
m_sdbSizer1OK->SetDefault(); m_sdbSizer1OK->SetDefault();
#if defined (KICAD_GOST)
/* The GOST standard pre-defines certain schematic attributes that cannot be changed */
m_spinBusWidth->Enable(false);
#endif
} }

View File

@ -47,20 +47,12 @@ public:
void SetBusWidth( int aWidth ) void SetBusWidth( int aWidth )
{ {
#if defined( KICAD_GOST )
m_spinBusWidth->SetValue( GOST_BUS_WIDTH );
#else
m_spinBusWidth->SetValue( aWidth ); m_spinBusWidth->SetValue( aWidth );
#endif
} }
int GetBusWidth( void ) int GetBusWidth( void )
{ {
#if defined( KICAD_GOST )
return GOST_BUS_WIDTH;
#else
return m_spinBusWidth->GetValue(); return m_spinBusWidth->GetValue();
#endif
} }
void SetLineWidth( int aWidth ) { m_spinLineWidth->SetValue( aWidth ); } void SetLineWidth( int aWidth ) { m_spinLineWidth->SetValue( aWidth ); }

View File

@ -13,13 +13,6 @@
*/ */
extern int g_DefaultBusWidth; extern int g_DefaultBusWidth;
#if defined(KICAD_GOST)
/** In a GOST build, the bus width is set and cannot be changed */
#define GOST_BUS_WIDTH 22
#endif
/* saving parameters option : */ /* saving parameters option : */
#define INSETUP true /* used when the parameter is saved in general config #define INSETUP true /* used when the parameter is saved in general config
* if not used, the parameter is saved in the local * if not used, the parameter is saved in the local

View File

@ -214,11 +214,7 @@ int SCH_LINE::GetPenSize() const
if( m_Layer == LAYER_BUS ) if( m_Layer == LAYER_BUS )
{ {
#if defined(KICAD_GOST)
pensize = GOST_BUS_WIDTH;
#else
pensize = ( m_width == 0 ) ? g_DefaultBusWidth : m_width; pensize = ( m_width == 0 ) ? g_DefaultBusWidth : m_width;
#endif
} }
return pensize; return pensize;