Commit patch from Brian Sidebotham (Bus width value option)
This commit is contained in:
parent
76765f2269
commit
afdf5258f3
|
@ -37,6 +37,15 @@ 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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -41,44 +41,43 @@ public:
|
||||||
void SetUnits( const wxArrayString& units, int select = 0 );
|
void SetUnits( const wxArrayString& units, int select = 0 );
|
||||||
int GetUnitsSelection( void ) { return m_choiceUnits->GetSelection(); }
|
int GetUnitsSelection( void ) { return m_choiceUnits->GetSelection(); }
|
||||||
|
|
||||||
void SetGridSelection( int select )
|
void SetGridSelection( int select ) { m_choiceGridSize->SetSelection( select ); }
|
||||||
{
|
|
||||||
m_choiceGridSize->SetSelection( select );
|
|
||||||
}
|
|
||||||
int GetGridSelection( void ) { return m_choiceGridSize->GetSelection(); }
|
int GetGridSelection( void ) { return m_choiceGridSize->GetSelection(); }
|
||||||
void SetGridSizes( const GRIDS& grid_sizes, int grid_id );
|
void SetGridSizes( const GRIDS& grid_sizes, int grid_id );
|
||||||
|
|
||||||
void SetLineWidth( int line_width )
|
void SetBusWidth( int aWidth )
|
||||||
{
|
{
|
||||||
m_spinLineWidth->SetValue( line_width );
|
#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 ); }
|
||||||
int GetLineWidth( void ) { return m_spinLineWidth->GetValue(); }
|
int GetLineWidth( void ) { return m_spinLineWidth->GetValue(); }
|
||||||
|
|
||||||
void SetTextSize( int text_size )
|
void SetTextSize( int text_size ) { m_spinTextSize->SetValue( text_size ); }
|
||||||
{
|
|
||||||
m_spinTextSize->SetValue( text_size );
|
|
||||||
}
|
|
||||||
int GetTextSize( void ) { return m_spinTextSize->GetValue(); }
|
int GetTextSize( void ) { return m_spinTextSize->GetValue(); }
|
||||||
|
|
||||||
void SetRepeatHorizontal( int displacement )
|
void SetRepeatHorizontal( int displacement )
|
||||||
{
|
{
|
||||||
m_spinRepeatHorizontal->SetValue( displacement );
|
m_spinRepeatHorizontal->SetValue( displacement );
|
||||||
}
|
}
|
||||||
int GetRepeatHorizontal( void )
|
int GetRepeatHorizontal( void ) { return m_spinRepeatHorizontal->GetValue(); }
|
||||||
{
|
void SetRepeatVertical( int displacement ) { m_spinRepeatVertical->SetValue( displacement ); }
|
||||||
return m_spinRepeatHorizontal->GetValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetRepeatVertical( int displacement )
|
|
||||||
{
|
|
||||||
m_spinRepeatVertical->SetValue( displacement );
|
|
||||||
}
|
|
||||||
int GetRepeatVertical( void ) { return m_spinRepeatVertical->GetValue(); }
|
int GetRepeatVertical( void ) { return m_spinRepeatVertical->GetValue(); }
|
||||||
|
void SetRepeatLabel( int increment ) { m_spinRepeatLabel->SetValue( increment ); }
|
||||||
void SetRepeatLabel( int increment )
|
|
||||||
{
|
|
||||||
m_spinRepeatLabel->SetValue( increment );
|
|
||||||
}
|
|
||||||
int GetRepeatLabel( void ) { return m_spinRepeatLabel->GetValue(); }
|
int GetRepeatLabel( void ) { return m_spinRepeatLabel->GetValue(); }
|
||||||
|
|
||||||
void SetAutoSaveInterval( int aInterval ) { m_spinAutoSaveInterval->SetValue( aInterval ); }
|
void SetAutoSaveInterval( int aInterval ) { m_spinAutoSaveInterval->SetValue( aInterval ); }
|
||||||
|
@ -87,14 +86,8 @@ public:
|
||||||
void SetShowGrid( bool show ) { m_checkShowGrid->SetValue( show ); }
|
void SetShowGrid( bool show ) { m_checkShowGrid->SetValue( show ); }
|
||||||
bool GetShowGrid( void ) { return m_checkShowGrid->GetValue(); }
|
bool GetShowGrid( void ) { return m_checkShowGrid->GetValue(); }
|
||||||
|
|
||||||
void SetShowHiddenPins( bool show )
|
void SetShowHiddenPins( bool show ) { m_checkShowHiddenPins->SetValue( show ); }
|
||||||
{
|
bool GetShowHiddenPins( void ) { return m_checkShowHiddenPins->GetValue(); }
|
||||||
m_checkShowHiddenPins->SetValue( show );
|
|
||||||
}
|
|
||||||
bool GetShowHiddenPins( void )
|
|
||||||
{
|
|
||||||
return m_checkShowHiddenPins->GetValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetEnableMiddleButtonPan( bool enable )
|
void SetEnableMiddleButtonPan( bool enable )
|
||||||
{
|
{
|
||||||
|
@ -106,7 +99,6 @@ public:
|
||||||
{
|
{
|
||||||
return m_checkEnableMiddleButtonPan->GetValue();
|
return m_checkEnableMiddleButtonPan->GetValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetMiddleButtonPanLimited( bool enable )
|
void SetMiddleButtonPanLimited( bool enable )
|
||||||
{
|
{
|
||||||
m_checkMiddleButtonPanLimited->SetValue( enable );
|
m_checkMiddleButtonPanLimited->SetValue( enable );
|
||||||
|
@ -116,30 +108,14 @@ public:
|
||||||
return m_checkMiddleButtonPanLimited->GetValue();
|
return m_checkMiddleButtonPanLimited->GetValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetEnableAutoPan( bool enable )
|
void SetEnableAutoPan( bool enable ) { m_checkAutoPan->SetValue( enable ); }
|
||||||
{
|
|
||||||
m_checkAutoPan->SetValue( enable );
|
|
||||||
}
|
|
||||||
bool GetEnableAutoPan( void ) { return m_checkAutoPan->GetValue(); }
|
bool GetEnableAutoPan( void ) { return m_checkAutoPan->GetValue(); }
|
||||||
|
|
||||||
void SetEnableHVBusOrientation( bool enable )
|
void SetEnableHVBusOrientation( bool enable ) { m_checkHVOrientation->SetValue( enable ); }
|
||||||
{
|
bool GetEnableHVBusOrientation( void ) { return m_checkHVOrientation->GetValue(); }
|
||||||
m_checkHVOrientation->SetValue( enable );
|
|
||||||
}
|
|
||||||
bool GetEnableHVBusOrientation( void )
|
|
||||||
{
|
|
||||||
return m_checkHVOrientation->GetValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetShowPageLimits( bool show )
|
|
||||||
{
|
|
||||||
m_checkPageLimits->SetValue( show );
|
|
||||||
}
|
|
||||||
bool GetShowPageLimits( void )
|
|
||||||
{
|
|
||||||
return m_checkPageLimits->GetValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
void SetShowPageLimits( bool show ) { m_checkPageLimits->SetValue( show ); }
|
||||||
|
bool GetShowPageLimits( void ) { return m_checkPageLimits->GetValue(); }
|
||||||
|
|
||||||
/** Set the field \a aNdx textctrl to \a aName */
|
/** Set the field \a aNdx textctrl to \a aName */
|
||||||
void SetFieldName( int aNdx, wxString aName );
|
void SetFieldName( int aNdx, wxString aName );
|
||||||
|
|
|
@ -1,297 +1,308 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Mar 17 2012)
|
// C++ code generated with wxFormBuilder (version Mar 17 2012)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "dialog_eeschema_options_base.h"
|
#include "dialog_eeschema_options_base.h"
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE( DIALOG_EESCHEMA_OPTIONS_BASE, wxDialog )
|
BEGIN_EVENT_TABLE( DIALOG_EESCHEMA_OPTIONS_BASE, wxDialog )
|
||||||
EVT_CHOICE( wxID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnChooseUnits )
|
EVT_CHOICE( wxID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnChooseUnits )
|
||||||
EVT_CHECKBOX( xwID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnMiddleBtnPanEnbl )
|
EVT_CHECKBOX( xwID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnMiddleBtnPanEnbl )
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
|
DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
|
||||||
{
|
{
|
||||||
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
|
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
|
||||||
|
|
||||||
wxBoxSizer* mainSizer;
|
wxBoxSizer* mainSizer;
|
||||||
mainSizer = new wxBoxSizer( wxVERTICAL );
|
mainSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxBoxSizer* bOptionsSizer;
|
wxBoxSizer* bOptionsSizer;
|
||||||
bOptionsSizer = new wxBoxSizer( wxVERTICAL );
|
bOptionsSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_notebook1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
|
m_notebook1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
|
||||||
|
|
||||||
m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
wxBoxSizer* p1mainSizer;
|
wxBoxSizer* p1mainSizer;
|
||||||
p1mainSizer = new wxBoxSizer( wxHORIZONTAL );
|
p1mainSizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
wxBoxSizer* bSizer3;
|
wxBoxSizer* bSizer3;
|
||||||
bSizer3 = new wxBoxSizer( wxVERTICAL );
|
bSizer3 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
wxFlexGridSizer* fgSizer1;
|
wxFlexGridSizer* fgSizer1;
|
||||||
fgSizer1 = new wxFlexGridSizer( 8, 3, 0, 0 );
|
fgSizer1 = new wxFlexGridSizer( 8, 3, 0, 0 );
|
||||||
fgSizer1->AddGrowableCol( 0 );
|
fgSizer1->AddGrowableCol( 0 );
|
||||||
fgSizer1->AddGrowableCol( 1 );
|
fgSizer1->AddGrowableCol( 1 );
|
||||||
fgSizer1->AddGrowableCol( 2 );
|
fgSizer1->AddGrowableCol( 2 );
|
||||||
fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
|
fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
|
||||||
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
||||||
m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _("Measurement &units:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText2 = new wxStaticText( m_panel1, wxID_ANY, _("Measurement &units:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText2->Wrap( -1 );
|
m_staticText2->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText2, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText2, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
wxArrayString m_choiceUnitsChoices;
|
wxArrayString m_choiceUnitsChoices;
|
||||||
m_choiceUnits = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitsChoices, 0 );
|
m_choiceUnits = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitsChoices, 0 );
|
||||||
m_choiceUnits->SetSelection( 0 );
|
m_choiceUnits->SetSelection( 0 );
|
||||||
fgSizer1->Add( m_choiceUnits, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_choiceUnits, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
|
|
||||||
fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
|
fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _("&Grid size:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText3 = new wxStaticText( m_panel1, wxID_ANY, _("&Grid size:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText3->Wrap( -1 );
|
m_staticText3->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText3, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText3, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
wxArrayString m_choiceGridSizeChoices;
|
wxArrayString m_choiceGridSizeChoices;
|
||||||
m_choiceGridSize = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeChoices, 0 );
|
m_choiceGridSize = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGridSizeChoices, 0 );
|
||||||
m_choiceGridSize->SetSelection( 0 );
|
m_choiceGridSize->SetSelection( 0 );
|
||||||
fgSizer1->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_choiceGridSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_staticGridUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticGridUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticGridUnits->Wrap( -1 );
|
m_staticGridUnits->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticGridUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticGridUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _("Default &line width:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText51 = new wxStaticText( m_panel1, wxID_ANY, _("Default &bus width:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText5->Wrap( -1 );
|
m_staticText51->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_spinLineWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 100, 0 );
|
m_spinBusWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 );
|
||||||
fgSizer1->Add( m_spinLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_spinBusWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_staticLineWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticBusWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticLineWidthUnits->Wrap( -1 );
|
m_staticBusWidthUnits->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticBusWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Default text &size:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _("Default &line width:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText7->Wrap( -1 );
|
m_staticText5->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_spinTextSize = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 1000, 0 );
|
m_spinLineWidth = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 1, 100, 1 );
|
||||||
fgSizer1->Add( m_spinTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_spinLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_staticTextSizeUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticLineWidthUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticTextSizeUnits->Wrap( -1 );
|
m_staticLineWidthUnits->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_staticText9 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &horizontal displacement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Default text &size:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText9->Wrap( -1 );
|
m_staticText7->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText7, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -500, 500, 0 );
|
m_spinTextSize = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 1000, 0 );
|
||||||
fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_spinTextSize, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_staticRepeatXUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextSizeUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticRepeatXUnits->Wrap( -1 );
|
m_staticTextSizeUnits->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticRepeatXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_staticText12 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &vertical displacement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText9 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &horizontal displacement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText12->Wrap( -1 );
|
m_staticText9->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText12, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText9, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -500, 500, 100 );
|
m_spinRepeatHorizontal = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -500, 500, 0 );
|
||||||
fgSizer1->Add( m_spinRepeatVertical, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_spinRepeatHorizontal, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_staticRepeatYUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticRepeatXUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticRepeatYUnits->Wrap( -1 );
|
m_staticRepeatXUnits->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticRepeatYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticRepeatXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_staticText16 = new wxStaticText( m_panel1, wxID_ANY, _("&Repeat label increment:"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText12 = new wxStaticText( m_panel1, wxID_ANY, _("Repeat draw item &vertical displacement:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText16->Wrap( -1 );
|
m_staticText12->Wrap( -1 );
|
||||||
fgSizer1->Add( m_staticText16, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( m_staticText12, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
|
|
||||||
m_spinRepeatLabel = new wxSpinCtrl( m_panel1, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 10, 1 );
|
m_spinRepeatVertical = new wxSpinCtrl( m_panel1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, -500, 500, 100 );
|
||||||
fgSizer1->Add( m_spinRepeatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
fgSizer1->Add( m_spinRepeatVertical, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
|
m_staticRepeatYUnits = new wxStaticText( m_panel1, wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
|
m_staticRepeatYUnits->Wrap( -1 );
|
||||||
|
fgSizer1->Add( m_staticRepeatYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save time interval:"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText221->Wrap( -1 );
|
m_staticText16 = new wxStaticText( m_panel1, wxID_ANY, _("&Repeat label increment:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
m_staticText16->Wrap( -1 );
|
||||||
|
fgSizer1->Add( m_staticText16, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
m_spinAutoSaveInterval = new wxSpinCtrl( m_panel1, ID_M_SPINAUTOSAVEINTERVAL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 10 );
|
|
||||||
fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_spinRepeatLabel = new wxSpinCtrl( m_panel1, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP, 0, 10, 1 );
|
||||||
|
fgSizer1->Add( m_spinRepeatLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
m_staticText23 = new wxStaticText( m_panel1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText23->Wrap( -1 );
|
|
||||||
fgSizer1->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
|
||||||
|
|
||||||
|
m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save time interval:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER|wxEXPAND, 0 );
|
m_staticText221->Wrap( -1 );
|
||||||
|
fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
wxBoxSizer* bSizer2;
|
|
||||||
bSizer2 = new wxBoxSizer( wxVERTICAL );
|
m_spinAutoSaveInterval = new wxSpinCtrl( m_panel1, ID_M_SPINAUTOSAVEINTERVAL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 10 );
|
||||||
|
fgSizer1->Add( m_spinAutoSaveInterval, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 );
|
m_staticText23 = new wxStaticText( m_panel1, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_staticText23->Wrap( -1 );
|
||||||
m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );
|
fgSizer1->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );
|
||||||
bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 );
|
|
||||||
|
|
||||||
m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer3->Add( fgSizer1, 0, wxALIGN_CENTER|wxEXPAND, 0 );
|
||||||
m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") );
|
|
||||||
|
wxBoxSizer* bSizer2;
|
||||||
bSizer2->Add( m_checkEnableMiddleButtonPan, 0, wxALL, 3 );
|
bSizer2 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("Middle mouse button panning limited"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_checkMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") );
|
bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
bSizer2->Add( m_checkMiddleButtonPanLimited, 0, wxALL, 3 );
|
m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 );
|
||||||
m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 );
|
m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") );
|
||||||
m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 );
|
bSizer2->Add( m_checkEnableMiddleButtonPan, 0, wxALL, 3 );
|
||||||
|
|
||||||
m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("Middle mouse button panning limited"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
|
m_checkMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") );
|
||||||
|
|
||||||
|
bSizer2->Add( m_checkMiddleButtonPanLimited, 0, wxALL, 3 );
|
||||||
bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
|
|
||||||
|
m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 );
|
||||||
bSizer3->Add( 0, 0, 1, wxALL|wxEXPAND, 10 );
|
|
||||||
|
m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 );
|
||||||
p1mainSizer->Add( bSizer3, 1, wxALL|wxEXPAND, 12 );
|
|
||||||
|
m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 );
|
||||||
m_panel1->SetSizer( p1mainSizer );
|
|
||||||
m_panel1->Layout();
|
|
||||||
p1mainSizer->Fit( m_panel1 );
|
bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );
|
||||||
m_notebook1->AddPage( m_panel1, _("General Options"), true );
|
|
||||||
m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
|
||||||
m_panel2->SetToolTip( _("User defined field names for schematic components. ") );
|
bSizer3->Add( 0, 0, 1, wxALL|wxEXPAND, 10 );
|
||||||
|
|
||||||
wxBoxSizer* bSizer6;
|
|
||||||
bSizer6 = new wxBoxSizer( wxVERTICAL );
|
p1mainSizer->Add( bSizer3, 1, wxALL|wxEXPAND, 12 );
|
||||||
|
|
||||||
wxBoxSizer* bSizer8;
|
|
||||||
bSizer8 = new wxBoxSizer( wxVERTICAL );
|
m_panel1->SetSizer( p1mainSizer );
|
||||||
|
m_panel1->Layout();
|
||||||
m_staticText211 = new wxStaticText( m_panel2, wxID_ANY, _("Please enter fieldnames which you want presented in the component fieldname (property) editors. Names may not include (, ), or \" characters."), wxDefaultPosition, wxDefaultSize, 0 );
|
p1mainSizer->Fit( m_panel1 );
|
||||||
m_staticText211->Wrap( 400 );
|
m_notebook1->AddPage( m_panel1, _("General Options"), true );
|
||||||
bSizer8->Add( m_staticText211, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||||
|
m_panel2->SetToolTip( _("User defined field names for schematic components. ") );
|
||||||
|
|
||||||
bSizer6->Add( bSizer8, 0, wxEXPAND, 5 );
|
wxBoxSizer* bSizer6;
|
||||||
|
bSizer6 = new wxBoxSizer( wxVERTICAL );
|
||||||
wxBoxSizer* bSizer7;
|
|
||||||
bSizer7 = new wxBoxSizer( wxVERTICAL );
|
wxBoxSizer* bSizer8;
|
||||||
|
bSizer8 = new wxBoxSizer( wxVERTICAL );
|
||||||
wxFlexGridSizer* fgSizer2;
|
|
||||||
fgSizer2 = new wxFlexGridSizer( 8, 2, 0, 0 );
|
m_staticText211 = new wxStaticText( m_panel2, wxID_ANY, _("Please enter fieldnames which you want presented in the component fieldname (property) editors. Names may not include (, ), or \" characters."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->AddGrowableCol( 1 );
|
m_staticText211->Wrap( 400 );
|
||||||
fgSizer2->SetFlexibleDirection( wxHORIZONTAL );
|
bSizer8->Add( m_staticText211, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
||||||
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
|
||||||
|
|
||||||
m_staticText15 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 1"), wxDefaultPosition, wxDefaultSize, 0 );
|
bSizer6->Add( bSizer8, 0, wxEXPAND, 5 );
|
||||||
m_staticText15->Wrap( -1 );
|
|
||||||
fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
wxBoxSizer* bSizer7;
|
||||||
|
bSizer7 = new wxBoxSizer( wxVERTICAL );
|
||||||
m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
wxFlexGridSizer* fgSizer2;
|
||||||
|
fgSizer2 = new wxFlexGridSizer( 8, 2, 0, 0 );
|
||||||
m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 );
|
fgSizer2->AddGrowableCol( 1 );
|
||||||
m_staticText161->Wrap( -1 );
|
fgSizer2->SetFlexibleDirection( wxHORIZONTAL );
|
||||||
fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
||||||
m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText15 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 1"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText15->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText17->Wrap( -1 );
|
m_fieldName1 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->Add( m_fieldName1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText161 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 2"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText161->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText18->Wrap( -1 );
|
m_fieldName2 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->Add( m_fieldName2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_fieldName4 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 3"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText17->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 5"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText19->Wrap( -1 );
|
m_fieldName3 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->Add( m_fieldName3, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_fieldName5 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText18 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 4"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText18->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_staticText20 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 6"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText20->Wrap( -1 );
|
m_fieldName4 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->Add( m_fieldName4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_fieldName6 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 5"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText19->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 7"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText21->Wrap( -1 );
|
m_fieldName5 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->Add( m_fieldName5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_fieldName7 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText20 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 6"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName7, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText20->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_staticText22 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 8"), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_staticText22->Wrap( -1 );
|
m_fieldName6 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
fgSizer2->Add( m_fieldName6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
m_fieldName8 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 7"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
fgSizer2->Add( m_fieldName8, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
m_staticText21->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
|
|
||||||
bSizer7->Add( fgSizer2, 1, wxALIGN_CENTER|wxEXPAND, 5 );
|
m_fieldName7 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
fgSizer2->Add( m_fieldName7, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
|
|
||||||
bSizer6->Add( bSizer7, 1, wxALL|wxEXPAND, 12 );
|
m_staticText22 = new wxStaticText( m_panel2, wxID_ANY, _("Custom field 8"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_staticText22->Wrap( -1 );
|
||||||
|
fgSizer2->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 3 );
|
||||||
m_panel2->SetSizer( bSizer6 );
|
|
||||||
m_panel2->Layout();
|
m_fieldName8 = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
bSizer6->Fit( m_panel2 );
|
fgSizer2->Add( m_fieldName8, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 );
|
||||||
m_notebook1->AddPage( m_panel2, _("Template Field Names"), false );
|
|
||||||
|
|
||||||
bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 );
|
bSizer7->Add( fgSizer2, 1, wxALIGN_CENTER|wxEXPAND, 5 );
|
||||||
|
|
||||||
m_sdbSizer1 = new wxStdDialogButtonSizer();
|
|
||||||
m_sdbSizer1OK = new wxButton( this, wxID_OK );
|
bSizer6->Add( bSizer7, 1, wxALL|wxEXPAND, 12 );
|
||||||
m_sdbSizer1->AddButton( m_sdbSizer1OK );
|
|
||||||
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
|
|
||||||
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
|
m_panel2->SetSizer( bSizer6 );
|
||||||
m_sdbSizer1->Realize();
|
m_panel2->Layout();
|
||||||
|
bSizer6->Fit( m_panel2 );
|
||||||
bOptionsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 12 );
|
m_notebook1->AddPage( m_panel2, _("Template Field Names"), false );
|
||||||
|
|
||||||
|
bOptionsSizer->Add( m_notebook1, 1, wxEXPAND, 0 );
|
||||||
mainSizer->Add( bOptionsSizer, 1, 0, 12 );
|
|
||||||
|
m_sdbSizer1 = new wxStdDialogButtonSizer();
|
||||||
|
m_sdbSizer1OK = new wxButton( this, wxID_OK );
|
||||||
this->SetSizer( mainSizer );
|
m_sdbSizer1->AddButton( m_sdbSizer1OK );
|
||||||
this->Layout();
|
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
|
||||||
mainSizer->Fit( this );
|
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
|
||||||
|
m_sdbSizer1->Realize();
|
||||||
this->Centre( wxBOTH );
|
|
||||||
}
|
bOptionsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 12 );
|
||||||
|
|
||||||
DIALOG_EESCHEMA_OPTIONS_BASE::~DIALOG_EESCHEMA_OPTIONS_BASE()
|
|
||||||
{
|
mainSizer->Add( bOptionsSizer, 1, 0, 12 );
|
||||||
}
|
|
||||||
|
|
||||||
|
this->SetSizer( mainSizer );
|
||||||
|
this->Layout();
|
||||||
|
mainSizer->Fit( this );
|
||||||
|
|
||||||
|
this->Centre( wxBOTH );
|
||||||
|
}
|
||||||
|
|
||||||
|
DIALOG_EESCHEMA_OPTIONS_BASE::~DIALOG_EESCHEMA_OPTIONS_BASE()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,120 +1,123 @@
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Mar 17 2012)
|
// C++ code generated with wxFormBuilder (version Mar 17 2012)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef __DIALOG_EESCHEMA_OPTIONS_BASE_H__
|
#ifndef __DIALOG_EESCHEMA_OPTIONS_BASE_H__
|
||||||
#define __DIALOG_EESCHEMA_OPTIONS_BASE_H__
|
#define __DIALOG_EESCHEMA_OPTIONS_BASE_H__
|
||||||
|
|
||||||
#include <wx/artprov.h>
|
#include <wx/artprov.h>
|
||||||
#include <wx/xrc/xmlres.h>
|
#include <wx/xrc/xmlres.h>
|
||||||
#include <wx/intl.h>
|
#include <wx/intl.h>
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/stattext.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/font.h>
|
#include <wx/font.h>
|
||||||
#include <wx/colour.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/settings.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/choice.h>
|
#include <wx/choice.h>
|
||||||
#include <wx/spinctrl.h>
|
#include <wx/spinctrl.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/checkbox.h>
|
#include <wx/checkbox.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/bitmap.h>
|
#include <wx/bitmap.h>
|
||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
||||||
#include <wx/icon.h>
|
#include <wx/icon.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/notebook.h>
|
#include <wx/notebook.h>
|
||||||
#include <wx/button.h>
|
#include <wx/button.h>
|
||||||
#include <wx/dialog.h>
|
#include <wx/dialog.h>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class DIALOG_EESCHEMA_OPTIONS_BASE
|
/// Class DIALOG_EESCHEMA_OPTIONS_BASE
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog
|
class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog
|
||||||
{
|
{
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
private:
|
private:
|
||||||
|
|
||||||
// Private event handlers
|
// Private event handlers
|
||||||
void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); }
|
void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); }
|
||||||
void _wxFB_OnMiddleBtnPanEnbl( wxCommandEvent& event ){ OnMiddleBtnPanEnbl( event ); }
|
void _wxFB_OnMiddleBtnPanEnbl( wxCommandEvent& event ){ OnMiddleBtnPanEnbl( event ); }
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
ID_M_SPINAUTOSAVEINTERVAL = 1000,
|
ID_M_SPINAUTOSAVEINTERVAL = 1000,
|
||||||
xwID_ANY
|
xwID_ANY
|
||||||
};
|
};
|
||||||
|
|
||||||
wxNotebook* m_notebook1;
|
wxNotebook* m_notebook1;
|
||||||
wxPanel* m_panel1;
|
wxPanel* m_panel1;
|
||||||
wxStaticText* m_staticText2;
|
wxStaticText* m_staticText2;
|
||||||
wxChoice* m_choiceUnits;
|
wxChoice* m_choiceUnits;
|
||||||
wxStaticText* m_staticText3;
|
wxStaticText* m_staticText3;
|
||||||
wxChoice* m_choiceGridSize;
|
wxChoice* m_choiceGridSize;
|
||||||
wxStaticText* m_staticGridUnits;
|
wxStaticText* m_staticGridUnits;
|
||||||
wxStaticText* m_staticText5;
|
wxStaticText* m_staticText51;
|
||||||
wxSpinCtrl* m_spinLineWidth;
|
wxSpinCtrl* m_spinBusWidth;
|
||||||
wxStaticText* m_staticLineWidthUnits;
|
wxStaticText* m_staticBusWidthUnits;
|
||||||
wxStaticText* m_staticText7;
|
wxStaticText* m_staticText5;
|
||||||
wxSpinCtrl* m_spinTextSize;
|
wxSpinCtrl* m_spinLineWidth;
|
||||||
wxStaticText* m_staticTextSizeUnits;
|
wxStaticText* m_staticLineWidthUnits;
|
||||||
wxStaticText* m_staticText9;
|
wxStaticText* m_staticText7;
|
||||||
wxSpinCtrl* m_spinRepeatHorizontal;
|
wxSpinCtrl* m_spinTextSize;
|
||||||
wxStaticText* m_staticRepeatXUnits;
|
wxStaticText* m_staticTextSizeUnits;
|
||||||
wxStaticText* m_staticText12;
|
wxStaticText* m_staticText9;
|
||||||
wxSpinCtrl* m_spinRepeatVertical;
|
wxSpinCtrl* m_spinRepeatHorizontal;
|
||||||
wxStaticText* m_staticRepeatYUnits;
|
wxStaticText* m_staticRepeatXUnits;
|
||||||
wxStaticText* m_staticText16;
|
wxStaticText* m_staticText12;
|
||||||
wxSpinCtrl* m_spinRepeatLabel;
|
wxSpinCtrl* m_spinRepeatVertical;
|
||||||
wxStaticText* m_staticText221;
|
wxStaticText* m_staticRepeatYUnits;
|
||||||
wxSpinCtrl* m_spinAutoSaveInterval;
|
wxStaticText* m_staticText16;
|
||||||
wxStaticText* m_staticText23;
|
wxSpinCtrl* m_spinRepeatLabel;
|
||||||
wxCheckBox* m_checkShowGrid;
|
wxStaticText* m_staticText221;
|
||||||
wxCheckBox* m_checkShowHiddenPins;
|
wxSpinCtrl* m_spinAutoSaveInterval;
|
||||||
wxCheckBox* m_checkEnableMiddleButtonPan;
|
wxStaticText* m_staticText23;
|
||||||
wxCheckBox* m_checkMiddleButtonPanLimited;
|
wxCheckBox* m_checkShowGrid;
|
||||||
wxCheckBox* m_checkAutoPan;
|
wxCheckBox* m_checkShowHiddenPins;
|
||||||
wxCheckBox* m_checkHVOrientation;
|
wxCheckBox* m_checkEnableMiddleButtonPan;
|
||||||
wxCheckBox* m_checkPageLimits;
|
wxCheckBox* m_checkMiddleButtonPanLimited;
|
||||||
wxPanel* m_panel2;
|
wxCheckBox* m_checkAutoPan;
|
||||||
wxStaticText* m_staticText211;
|
wxCheckBox* m_checkHVOrientation;
|
||||||
wxStaticText* m_staticText15;
|
wxCheckBox* m_checkPageLimits;
|
||||||
wxTextCtrl* m_fieldName1;
|
wxPanel* m_panel2;
|
||||||
wxStaticText* m_staticText161;
|
wxStaticText* m_staticText211;
|
||||||
wxTextCtrl* m_fieldName2;
|
wxStaticText* m_staticText15;
|
||||||
wxStaticText* m_staticText17;
|
wxTextCtrl* m_fieldName1;
|
||||||
wxTextCtrl* m_fieldName3;
|
wxStaticText* m_staticText161;
|
||||||
wxStaticText* m_staticText18;
|
wxTextCtrl* m_fieldName2;
|
||||||
wxTextCtrl* m_fieldName4;
|
wxStaticText* m_staticText17;
|
||||||
wxStaticText* m_staticText19;
|
wxTextCtrl* m_fieldName3;
|
||||||
wxTextCtrl* m_fieldName5;
|
wxStaticText* m_staticText18;
|
||||||
wxStaticText* m_staticText20;
|
wxTextCtrl* m_fieldName4;
|
||||||
wxTextCtrl* m_fieldName6;
|
wxStaticText* m_staticText19;
|
||||||
wxStaticText* m_staticText21;
|
wxTextCtrl* m_fieldName5;
|
||||||
wxTextCtrl* m_fieldName7;
|
wxStaticText* m_staticText20;
|
||||||
wxStaticText* m_staticText22;
|
wxTextCtrl* m_fieldName6;
|
||||||
wxTextCtrl* m_fieldName8;
|
wxStaticText* m_staticText21;
|
||||||
wxStdDialogButtonSizer* m_sdbSizer1;
|
wxTextCtrl* m_fieldName7;
|
||||||
wxButton* m_sdbSizer1OK;
|
wxStaticText* m_staticText22;
|
||||||
wxButton* m_sdbSizer1Cancel;
|
wxTextCtrl* m_fieldName8;
|
||||||
|
wxStdDialogButtonSizer* m_sdbSizer1;
|
||||||
// Virtual event handlers, overide them in your derived class
|
wxButton* m_sdbSizer1OK;
|
||||||
virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); }
|
wxButton* m_sdbSizer1Cancel;
|
||||||
virtual void OnMiddleBtnPanEnbl( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); }
|
||||||
public:
|
virtual void OnMiddleBtnPanEnbl( wxCommandEvent& event ) { event.Skip(); }
|
||||||
|
|
||||||
DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
|
||||||
~DIALOG_EESCHEMA_OPTIONS_BASE();
|
public:
|
||||||
|
|
||||||
};
|
DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||||
|
~DIALOG_EESCHEMA_OPTIONS_BASE();
|
||||||
#endif //__DIALOG_EESCHEMA_OPTIONS_BASE_H__
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif //__DIALOG_EESCHEMA_OPTIONS_BASE_H__
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
|
|
||||||
#define FR_HISTORY_LIST_CNT 10 ///< Maximum number of find and replace strings.
|
#define FR_HISTORY_LIST_CNT 10 ///< Maximum number of find and replace strings.
|
||||||
|
|
||||||
|
int g_DefaultBusWidth = 9;
|
||||||
|
|
||||||
void LIB_EDIT_FRAME::InstallConfigFrame( wxCommandEvent& event )
|
void LIB_EDIT_FRAME::InstallConfigFrame( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
|
@ -207,6 +208,7 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event )
|
||||||
|
|
||||||
dlg.SetUnits( units, g_UserUnit );
|
dlg.SetUnits( units, g_UserUnit );
|
||||||
dlg.SetGridSizes( grid_list, GetScreen()->GetGridId() );
|
dlg.SetGridSizes( grid_list, GetScreen()->GetGridId() );
|
||||||
|
dlg.SetBusWidth( g_DefaultBusWidth );
|
||||||
dlg.SetLineWidth( g_DrawDefaultLineThickness );
|
dlg.SetLineWidth( g_DrawDefaultLineThickness );
|
||||||
dlg.SetTextSize( g_DefaultTextLabelSize );
|
dlg.SetTextSize( g_DefaultTextLabelSize );
|
||||||
dlg.SetRepeatHorizontal( g_RepeatStep.x );
|
dlg.SetRepeatHorizontal( g_RepeatStep.x );
|
||||||
|
@ -240,6 +242,7 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event )
|
||||||
|
|
||||||
GetScreen()->SetGrid( grid_list[ (size_t) dlg.GetGridSelection() ].m_Size );
|
GetScreen()->SetGrid( grid_list[ (size_t) dlg.GetGridSelection() ].m_Size );
|
||||||
|
|
||||||
|
g_DefaultBusWidth = dlg.GetBusWidth();
|
||||||
g_DrawDefaultLineThickness = dlg.GetLineWidth();
|
g_DrawDefaultLineThickness = dlg.GetLineWidth();
|
||||||
g_DefaultTextLabelSize = dlg.GetTextSize();
|
g_DefaultTextLabelSize = dlg.GetTextSize();
|
||||||
g_RepeatStep.x = dlg.GetRepeatHorizontal();
|
g_RepeatStep.x = dlg.GetRepeatHorizontal();
|
||||||
|
@ -420,7 +423,7 @@ void SCH_EDIT_FRAME::SaveProjectFile()
|
||||||
wxGetApp().WriteProjectConfig( fn.GetFullPath(), GROUP, GetProjectFileParameters() );
|
wxGetApp().WriteProjectConfig( fn.GetFullPath(), GROUP, GetProjectFileParameters() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const wxString DefaultBusWidthEntry( wxT( "DefaultBusWidth" ) );
|
||||||
static const wxString DefaultDrawLineWidthEntry( wxT( "DefaultDrawLineWidth" ) );
|
static const wxString DefaultDrawLineWidthEntry( wxT( "DefaultDrawLineWidth" ) );
|
||||||
static const wxString ShowHiddenPinsEntry( wxT( "ShowHiddenPins" ) );
|
static const wxString ShowHiddenPinsEntry( wxT( "ShowHiddenPins" ) );
|
||||||
static const wxString HorzVertLinesOnlyEntry( wxT( "HorizVertLinesOnly" ) );
|
static const wxString HorzVertLinesOnlyEntry( wxT( "HorizVertLinesOnly" ) );
|
||||||
|
@ -553,6 +556,7 @@ void SCH_EDIT_FRAME::LoadSettings()
|
||||||
// This is required until someone gets rid of the global variable g_LayerDescription().
|
// This is required until someone gets rid of the global variable g_LayerDescription().
|
||||||
m_GridColor = g_LayerDescr.LayerColor[LAYER_GRID];
|
m_GridColor = g_LayerDescr.LayerColor[LAYER_GRID];
|
||||||
|
|
||||||
|
g_DefaultBusWidth = cfg->Read( DefaultBusWidthEntry, (long) 8 );
|
||||||
g_DrawDefaultLineThickness = cfg->Read( DefaultDrawLineWidthEntry,(long) 6 );
|
g_DrawDefaultLineThickness = cfg->Read( DefaultDrawLineWidthEntry,(long) 6 );
|
||||||
cfg->Read( ShowHiddenPinsEntry, &m_showAllPins, false );
|
cfg->Read( ShowHiddenPinsEntry, &m_showAllPins, false );
|
||||||
cfg->Read( HorzVertLinesOnlyEntry, &g_HVLines, true );
|
cfg->Read( HorzVertLinesOnlyEntry, &g_HVLines, true );
|
||||||
|
@ -644,6 +648,7 @@ void SCH_EDIT_FRAME::SaveSettings()
|
||||||
|
|
||||||
wxGetApp().SaveCurrentSetupValues( GetConfigurationSettings() );
|
wxGetApp().SaveCurrentSetupValues( GetConfigurationSettings() );
|
||||||
|
|
||||||
|
cfg->Write( DefaultBusWidthEntry, (long) g_DefaultBusWidth );
|
||||||
cfg->Write( DefaultDrawLineWidthEntry, (long) g_DrawDefaultLineThickness );
|
cfg->Write( DefaultDrawLineWidthEntry, (long) g_DrawDefaultLineThickness );
|
||||||
cfg->Write( ShowHiddenPinsEntry, m_showAllPins );
|
cfg->Write( ShowHiddenPinsEntry, m_showAllPins );
|
||||||
cfg->Write( HorzVertLinesOnlyEntry, g_HVLines );
|
cfg->Write( HorzVertLinesOnlyEntry, g_HVLines );
|
||||||
|
|
|
@ -8,7 +8,17 @@
|
||||||
#define GROUPCOMMON wxT( "/common" )
|
#define GROUPCOMMON wxT( "/common" )
|
||||||
#define GROUPLIB wxT( "libraries" )
|
#define GROUPLIB wxT( "libraries" )
|
||||||
|
|
||||||
extern int g_PenMinWidth;
|
/**
|
||||||
|
* The width given to bus drawings that do not have a specific width
|
||||||
|
*/
|
||||||
|
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
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <richio.h>
|
#include <richio.h>
|
||||||
#include <plot_common.h>
|
#include <plot_common.h>
|
||||||
|
|
||||||
|
#include <eeschema_config.h>
|
||||||
#include <general.h>
|
#include <general.h>
|
||||||
#include <protos.h>
|
#include <protos.h>
|
||||||
#include <sch_bus_entry.h>
|
#include <sch_bus_entry.h>
|
||||||
|
@ -167,10 +168,9 @@ int SCH_BUS_ENTRY::GetPenSize() const
|
||||||
{
|
{
|
||||||
int pensize = ( m_width == 0 ) ? g_DrawDefaultLineThickness : m_width;
|
int pensize = ( m_width == 0 ) ? g_DrawDefaultLineThickness : m_width;
|
||||||
|
|
||||||
if( m_Layer == LAYER_BUS && m_width == 0 )
|
if( m_Layer == LAYER_BUS )
|
||||||
{
|
{
|
||||||
pensize = KiROUND( g_DrawDefaultLineThickness * BUS_WIDTH_EXPAND );
|
pensize = ( m_width == 0 ) ? g_DefaultBusWidth : m_width;
|
||||||
pensize = MAX( pensize, 3 );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return pensize;
|
return pensize;
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <richio.h>
|
#include <richio.h>
|
||||||
#include <plot_common.h>
|
#include <plot_common.h>
|
||||||
#include <base_units.h>
|
#include <base_units.h>
|
||||||
|
#include <eeschema_config.h>
|
||||||
#include <general.h>
|
#include <general.h>
|
||||||
#include <protos.h>
|
#include <protos.h>
|
||||||
#include <sch_line.h>
|
#include <sch_line.h>
|
||||||
|
@ -212,10 +212,13 @@ int SCH_LINE::GetPenSize() const
|
||||||
{
|
{
|
||||||
int pensize = ( m_width == 0 ) ? g_DrawDefaultLineThickness : m_width;
|
int pensize = ( m_width == 0 ) ? g_DrawDefaultLineThickness : m_width;
|
||||||
|
|
||||||
if( m_Layer == LAYER_BUS && m_width == 0 )
|
if( m_Layer == LAYER_BUS )
|
||||||
{
|
{
|
||||||
pensize = KiROUND( g_DrawDefaultLineThickness * BUS_WIDTH_EXPAND );
|
#if defined(KICAD_GOST)
|
||||||
pensize = MAX( pensize, 3 );
|
pensize = GOST_BUS_WIDTH;
|
||||||
|
#else
|
||||||
|
pensize = ( m_width == 0 ) ? g_DefaultBusWidth : m_width;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
return pensize;
|
return pensize;
|
||||||
|
|
|
@ -50,16 +50,6 @@ typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
|
||||||
typedef vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
|
typedef vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
|
||||||
|
|
||||||
|
|
||||||
/* used to calculate the pen size from default value
|
|
||||||
* the actual pen size is default value * BUS_WIDTH_EXPAND
|
|
||||||
*/
|
|
||||||
#if defined(KICAD_GOST)
|
|
||||||
#define BUS_WIDTH_EXPAND 3.6
|
|
||||||
#else
|
|
||||||
#define BUS_WIDTH_EXPAND 1.4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#define FMT_IU SCH_ITEM::FormatInternalUnits
|
#define FMT_IU SCH_ITEM::FormatInternalUnits
|
||||||
#define FMT_ANGLE SCH_ITEM::FormatAngle
|
#define FMT_ANGLE SCH_ITEM::FormatAngle
|
||||||
|
|
||||||
|
|
|
@ -986,11 +986,8 @@ bool DIALOG_DESIGN_RULES::TestDataValidity()
|
||||||
int minUViaDia = ReturnValueFromTextCtrl( *m_SetMicroViasMinSizeCtrl );
|
int minUViaDia = ReturnValueFromTextCtrl( *m_SetMicroViasMinSizeCtrl );
|
||||||
int minUViaDrill = ReturnValueFromTextCtrl( *m_SetMicroViasMinDrillCtrl );
|
int minUViaDrill = ReturnValueFromTextCtrl( *m_SetMicroViasMinDrillCtrl );
|
||||||
int minTrackWidth = ReturnValueFromTextCtrl( *m_SetTrackMinWidthCtrl );
|
int minTrackWidth = ReturnValueFromTextCtrl( *m_SetTrackMinWidthCtrl );
|
||||||
#if defined( USE_PCBNEW_NANOMETRES )
|
int maxval = 1000 * IU_PER_MILS; // a max value for tracks and vias sizes (1 inch)
|
||||||
int maxval = 25400000;
|
|
||||||
#else
|
|
||||||
int maxval = 10000;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
for( int row = 0; row < m_grid->GetNumberRows(); row++ )
|
for( int row = 0; row < m_grid->GetNumberRows(); row++ )
|
||||||
|
|
Loading…
Reference in New Issue