eeschema: fix set bus width when define KICAD_GOST
This commit is contained in:
parent
e6ec9f0a32
commit
d8c14403f2
|
@ -37,15 +37,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
|
|||
{
|
||||
m_choiceUnits->SetFocus();
|
||||
m_sdbSizer1OK->SetDefault();
|
||||
|
||||
#if defined (KICAD_GOST)
|
||||
|
||||
/* The GOST standard pre-defines certain schematic attributes that cannot be changed */
|
||||
|
||||
m_spinBusWidth->Enable(false);
|
||||
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -47,20 +47,12 @@ public:
|
|||
|
||||
void SetBusWidth( int aWidth )
|
||||
{
|
||||
#if defined( KICAD_GOST )
|
||||
m_spinBusWidth->SetValue( GOST_BUS_WIDTH );
|
||||
#else
|
||||
m_spinBusWidth->SetValue( aWidth );
|
||||
#endif
|
||||
}
|
||||
|
||||
int GetBusWidth( void )
|
||||
{
|
||||
#if defined( KICAD_GOST )
|
||||
return GOST_BUS_WIDTH;
|
||||
#else
|
||||
return m_spinBusWidth->GetValue();
|
||||
#endif
|
||||
}
|
||||
|
||||
void SetLineWidth( int aWidth ) { m_spinLineWidth->SetValue( aWidth ); }
|
||||
|
|
|
@ -13,13 +13,6 @@
|
|||
*/
|
||||
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 : */
|
||||
#define INSETUP true /* used when the parameter is saved in general config
|
||||
* if not used, the parameter is saved in the local
|
||||
|
|
|
@ -214,11 +214,7 @@ int SCH_LINE::GetPenSize() const
|
|||
|
||||
if( m_Layer == LAYER_BUS )
|
||||
{
|
||||
#if defined(KICAD_GOST)
|
||||
pensize = GOST_BUS_WIDTH;
|
||||
#else
|
||||
pensize = ( m_width == 0 ) ? g_DefaultBusWidth : m_width;
|
||||
#endif
|
||||
}
|
||||
|
||||
return pensize;
|
||||
|
|
Loading…
Reference in New Issue