Gerbview: export_to_pcbnew enhancement and fixes. (57604b0a) · Commits · Elphel / kicad-source-mirror

common/build_version.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	#endif		#endif

	#ifndef KICAD_BUILD_VERSION		#ifndef KICAD_BUILD_VERSION
	#define KICAD_BUILD_VERSION "(2011-04-17)"		#define KICAD_BUILD_VERSION "(2011-04-24)"
	#endif		#endif

gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp

+37 −18

Original line number	Original line	Diff line number	Diff line
	@@ -9,15 +9,16 @@

	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////

	BEGIN_EVENT_TABLE( LAYERS_TABLE_DIALOG_BASE, wxDialog )		BEGIN_EVENT_TABLE( LAYERS_MAP_DIALOG_BASE, wxDialog )
	EVT_BUTTON( ID_STORE_CHOICE, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnStoreSetup )		EVT_COMBOBOX( ID_M_COMBOCOPPERLAYERSCOUNT, LAYERS_MAP_DIALOG_BASE::_wxFB_OnBrdLayersCountSelection )
	EVT_BUTTON( ID_GET_PREVIOUS_CHOICE, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnGetSetup )		EVT_BUTTON( ID_STORE_CHOICE, LAYERS_MAP_DIALOG_BASE::_wxFB_OnStoreSetup )
	EVT_BUTTON( ID_RESET_CHOICE, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnResetClick )		EVT_BUTTON( ID_GET_PREVIOUS_CHOICE, LAYERS_MAP_DIALOG_BASE::_wxFB_OnGetSetup )
	EVT_BUTTON( wxID_CANCEL, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnCancelClick )		EVT_BUTTON( ID_RESET_CHOICE, LAYERS_MAP_DIALOG_BASE::_wxFB_OnResetClick )
	EVT_BUTTON( wxID_OK, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnOkClick )		EVT_BUTTON( wxID_CANCEL, LAYERS_MAP_DIALOG_BASE::_wxFB_OnCancelClick )
			EVT_BUTTON( wxID_OK, LAYERS_MAP_DIALOG_BASE::_wxFB_OnOkClick )
	END_EVENT_TABLE()		END_EVENT_TABLE()

	LAYERS_TABLE_DIALOG_BASE::LAYERS_TABLE_DIALOG_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )		LAYERS_MAP_DIALOG_BASE::LAYERS_MAP_DIALOG_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 );

	@@ -42,17 +43,33 @@ LAYERS_TABLE_DIALOG_BASE::LAYERS_TABLE_DIALOG_BASE( wxWindow* parent, wxWindowID
	m_staticlineSep = new wxStaticLine( this, ID_M_STATICLINESEP, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );		m_staticlineSep = new wxStaticLine( this, ID_M_STATICLINESEP, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
	sbSizerLayersTable->Add( m_staticlineSep, 0, wxEXPAND \| wxALL, 5 );		sbSizerLayersTable->Add( m_staticlineSep, 0, wxEXPAND \| wxALL, 5 );

	m_flexRightColumnBoxSizer = new wxFlexGridSizer( 16, 4, 0, 0 );		sbUpperSizer->Add( sbSizerLayersTable, 1, wxEXPAND, 5 );
	m_flexRightColumnBoxSizer->AddGrowableCol( 0 );
	m_flexRightColumnBoxSizer->AddGrowableCol( 1 );
	m_flexRightColumnBoxSizer->AddGrowableCol( 2 );
	m_flexRightColumnBoxSizer->AddGrowableCol( 3 );
	m_flexRightColumnBoxSizer->SetFlexibleDirection( wxBOTH );
	m_flexRightColumnBoxSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	sbSizerLayersTable->Add( m_flexRightColumnBoxSizer, 1, wxEXPAND, 5 );		wxBoxSizer* bRightSizer;
			bRightSizer = new wxBoxSizer( wxVERTICAL );

	sbUpperSizer->Add( sbSizerLayersTable, 1, wxEXPAND, 5 );		wxBoxSizer* bSizerLyrCnt;
			bSizerLyrCnt = new wxBoxSizer( wxVERTICAL );

			m_staticTextCopperlayerCount = new wxStaticText( this, ID_M_STATICTEXTCOPPERLAYERCOUNT, _("Copper layers count:"), wxDefaultPosition, wxDefaultSize, 0 );
			m_staticTextCopperlayerCount->Wrap( -1 );
			bSizerLyrCnt->Add( m_staticTextCopperlayerCount, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

			m_comboCopperLayersCount = new wxComboBox( this, ID_M_COMBOCOPPERLAYERSCOUNT, _("2 Layers"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
			m_comboCopperLayersCount->Append( _("2 Layers") );
			m_comboCopperLayersCount->Append( _("4 Layers") );
			m_comboCopperLayersCount->Append( _("6 Layers") );
			m_comboCopperLayersCount->Append( _("8 Layers") );
			m_comboCopperLayersCount->Append( _("10 Layers") );
			m_comboCopperLayersCount->Append( _("12 Layers") );
			m_comboCopperLayersCount->Append( _("14 Layers") );
			m_comboCopperLayersCount->Append( _("16 Layers") );
			bSizerLyrCnt->Add( m_comboCopperLayersCount, 0, wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

			bRightSizer->Add( bSizerLyrCnt, 0, wxEXPAND, 5 );


			bRightSizer->Add( 5, 15, 1, wxEXPAND, 5 );

	wxBoxSizer* bSizerButtons;		wxBoxSizer* bSizerButtons;
	bSizerButtons = new wxBoxSizer( wxVERTICAL );		bSizerButtons = new wxBoxSizer( wxVERTICAL );
	@@ -66,7 +83,9 @@ LAYERS_TABLE_DIALOG_BASE::LAYERS_TABLE_DIALOG_BASE( wxWindow* parent, wxWindowID
	m_buttonReset = new wxButton( this, ID_RESET_CHOICE, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonReset = new wxButton( this, ID_RESET_CHOICE, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
	bSizerButtons->Add( m_buttonReset, 0, wxALL\|wxEXPAND, 5 );		bSizerButtons->Add( m_buttonReset, 0, wxALL\|wxEXPAND, 5 );

	sbUpperSizer->Add( bSizerButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );		bRightSizer->Add( bSizerButtons, 0, wxEXPAND, 5 );

			sbUpperSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );

	bSizerMain->Add( sbUpperSizer, 1, wxEXPAND, 5 );		bSizerMain->Add( sbUpperSizer, 1, wxEXPAND, 5 );

	@@ -87,6 +106,6 @@ LAYERS_TABLE_DIALOG_BASE::LAYERS_TABLE_DIALOG_BASE( wxWindow* parent, wxWindowID
	this->Centre( wxBOTH );		this->Centre( wxBOTH );
	}		}

	LAYERS_TABLE_DIALOG_BASE::~LAYERS_TABLE_DIALOG_BASE()		LAYERS_MAP_DIALOG_BASE::~LAYERS_MAP_DIALOG_BASE()
	{		{
	}		}

gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp

+444 −259

Original line number	Original line	Diff line number	Diff line
	@@ -48,14 +48,14 @@
	<property name="font"></property>		<property name="font"></property>
	<property name="gripper">0</property>		<property name="gripper">0</property>
	<property name="hidden">0</property>		<property name="hidden">0</property>
	<property name="id">wxID_ANY</property>		<property name="id">ID_LAYERS_MAP_DIALOG_BASE</property>
	<property name="layer"></property>		<property name="layer"></property>
	<property name="maximize_button">0</property>		<property name="maximize_button">0</property>
	<property name="maximum_size"></property>		<property name="maximum_size"></property>
	<property name="minimize_button">0</property>		<property name="minimize_button">0</property>
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="moveable">1</property>		<property name="moveable">1</property>
	<property name="name">LAYERS_TABLE_DIALOG_BASE</property>		<property name="name">LAYERS_MAP_DIALOG_BASE</property>
	<property name="pane_border">1</property>		<property name="pane_border">1</property>
	<property name="pane_position"></property>		<property name="pane_position"></property>
	<property name="pane_size"></property>		<property name="pane_size"></property>
	@@ -234,29 +234,212 @@
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
			</object>
			</object>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxALIGN_CENTER_VERTICAL</property>
			<property name="proportion">0</property>
			<object class="wxBoxSizer" expanded="1">
			<property name="minimum_size"></property>
			<property name="name">bRightSizer</property>
			<property name="orient">wxVERTICAL</property>
			<property name="permission">none</property>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND</property>
	<property name="proportion">1</property>		<property name="proportion">0</property>
	<object class="wxFlexGridSizer" expanded="1">		<object class="wxBoxSizer" expanded="1">
	<property name="cols">4</property>
	<property name="flexible_direction">wxBOTH</property>
	<property name="growablecols">0,1,2,3</property>
	<property name="growablerows"></property>
	<property name="hgap">0</property>
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">m_flexRightColumnBoxSizer</property>		<property name="name">bSizerLyrCnt</property>
	<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>		<property name="orient">wxVERTICAL</property>
			<property name="permission">none</property>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxTOP\|wxRIGHT\|wxLEFT</property>
			<property name="proportion">0</property>
			<object class="wxStaticText" expanded="1">
			<property name="BottomDockable">1</property>
			<property name="LeftDockable">1</property>
			<property name="RightDockable">1</property>
			<property name="TopDockable">1</property>
			<property name="aui_name"></property>
			<property name="bg"></property>
			<property name="caption"></property>
			<property name="caption_visible">1</property>
			<property name="center_pane">0</property>
			<property name="close_button">1</property>
			<property name="context_help"></property>
			<property name="context_menu">1</property>
			<property name="default_pane">0</property>
			<property name="dock">Dock</property>
			<property name="dock_fixed">0</property>
			<property name="docking">Left</property>
			<property name="enabled">1</property>
			<property name="fg"></property>
			<property name="floatable">1</property>
			<property name="font"></property>
			<property name="gripper">0</property>
			<property name="hidden">0</property>
			<property name="id">ID_M_STATICTEXTCOPPERLAYERCOUNT</property>
			<property name="label">Copper layers count:</property>
			<property name="layer"></property>
			<property name="maximize_button">0</property>
			<property name="maximum_size"></property>
			<property name="minimize_button">0</property>
			<property name="minimum_size"></property>
			<property name="moveable">1</property>
			<property name="name">m_staticTextCopperlayerCount</property>
			<property name="pane_border">1</property>
			<property name="pane_position"></property>
			<property name="pane_size"></property>
	<property name="permission">protected</property>		<property name="permission">protected</property>
	<property name="rows">16</property>		<property name="pin_button">1</property>
	<property name="vgap">0</property>		<property name="pos"></property>
			<property name="position"></property>
			<property name="resize">Resizable</property>
			<property name="row"></property>
			<property name="show">1</property>
			<property name="size"></property>
			<property name="style"></property>
			<property name="subclass"></property>
			<property name="toolbar_pane">0</property>
			<property name="tooltip"></property>
			<property name="validator_data_type"></property>
			<property name="validator_style">wxFILTER_NONE</property>
			<property name="validator_type">wxDefaultValidator</property>
			<property name="validator_variable"></property>
			<property name="window_extra_style"></property>
			<property name="window_name"></property>
			<property name="window_style"></property>
			<property name="wrap">-1</property>
			<event name="OnChar"></event>
			<event name="OnEnterWindow"></event>
			<event name="OnEraseBackground"></event>
			<event name="OnKeyDown"></event>
			<event name="OnKeyUp"></event>
			<event name="OnKillFocus"></event>
			<event name="OnLeaveWindow"></event>
			<event name="OnLeftDClick"></event>
			<event name="OnLeftDown"></event>
			<event name="OnLeftUp"></event>
			<event name="OnMiddleDClick"></event>
			<event name="OnMiddleDown"></event>
			<event name="OnMiddleUp"></event>
			<event name="OnMotion"></event>
			<event name="OnMouseEvents"></event>
			<event name="OnMouseWheel"></event>
			<event name="OnPaint"></event>
			<event name="OnRightDClick"></event>
			<event name="OnRightDown"></event>
			<event name="OnRightUp"></event>
			<event name="OnSetFocus"></event>
			<event name="OnSize"></event>
			<event name="OnUpdateUI"></event>
			</object>
			</object>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxEXPAND\|wxBOTTOM\|wxRIGHT\|wxLEFT</property>
			<property name="proportion">0</property>
			<object class="wxComboBox" expanded="1">
			<property name="BottomDockable">1</property>
			<property name="LeftDockable">1</property>
			<property name="RightDockable">1</property>
			<property name="TopDockable">1</property>
			<property name="aui_name"></property>
			<property name="bg"></property>
			<property name="caption"></property>
			<property name="caption_visible">1</property>
			<property name="center_pane">0</property>
			<property name="choices">"2 Layers" "4 Layers" "6 Layers" "8 Layers" "10 Layers" "12 Layers" "14 Layers" "16 Layers"</property>
			<property name="close_button">1</property>
			<property name="context_help"></property>
			<property name="context_menu">1</property>
			<property name="default_pane">0</property>
			<property name="dock">Dock</property>
			<property name="dock_fixed">0</property>
			<property name="docking">Left</property>
			<property name="enabled">1</property>
			<property name="fg"></property>
			<property name="floatable">1</property>
			<property name="font"></property>
			<property name="gripper">0</property>
			<property name="hidden">0</property>
			<property name="id">ID_M_COMBOCOPPERLAYERSCOUNT</property>
			<property name="layer"></property>
			<property name="maximize_button">0</property>
			<property name="maximum_size"></property>
			<property name="minimize_button">0</property>
			<property name="minimum_size"></property>
			<property name="moveable">1</property>
			<property name="name">m_comboCopperLayersCount</property>
			<property name="pane_border">1</property>
			<property name="pane_position"></property>
			<property name="pane_size"></property>
			<property name="permission">protected</property>
			<property name="pin_button">1</property>
			<property name="pos"></property>
			<property name="position"></property>
			<property name="resize">Resizable</property>
			<property name="row"></property>
			<property name="show">1</property>
			<property name="size"></property>
			<property name="style"></property>
			<property name="subclass"></property>
			<property name="toolbar_pane">0</property>
			<property name="tooltip"></property>
			<property name="validator_data_type"></property>
			<property name="validator_style">wxFILTER_NONE</property>
			<property name="validator_type">wxDefaultValidator</property>
			<property name="validator_variable"></property>
			<property name="value">2 Layers</property>
			<property name="window_extra_style"></property>
			<property name="window_name"></property>
			<property name="window_style"></property>
			<event name="OnChar"></event>
			<event name="OnCombobox">OnBrdLayersCountSelection</event>
			<event name="OnEnterWindow"></event>
			<event name="OnEraseBackground"></event>
			<event name="OnKeyDown"></event>
			<event name="OnKeyUp"></event>
			<event name="OnKillFocus"></event>
			<event name="OnLeaveWindow"></event>
			<event name="OnLeftDClick"></event>
			<event name="OnLeftDown"></event>
			<event name="OnLeftUp"></event>
			<event name="OnMiddleDClick"></event>
			<event name="OnMiddleDown"></event>
			<event name="OnMiddleUp"></event>
			<event name="OnMotion"></event>
			<event name="OnMouseEvents"></event>
			<event name="OnMouseWheel"></event>
			<event name="OnPaint"></event>
			<event name="OnRightDClick"></event>
			<event name="OnRightDown"></event>
			<event name="OnRightUp"></event>
			<event name="OnSetFocus"></event>
			<event name="OnSize"></event>
			<event name="OnText"></event>
			<event name="OnTextEnter"></event>
			<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
	</object>		</object>
	</object>		</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxALIGN_CENTER_VERTICAL</property>		<property name="flag">wxEXPAND</property>
			<property name="proportion">1</property>
			<object class="spacer" expanded="1">
			<property name="height">15</property>
			<property name="permission">protected</property>
			<property name="width">5</property>
			</object>
			</object>
			<object class="sizeritem" expanded="1">
			<property name="border">5</property>
			<property name="flag">wxEXPAND</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxBoxSizer" expanded="1">		<object class="wxBoxSizer" expanded="1">
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	@@ -522,6 +705,8 @@
	</object>		</object>
	</object>		</object>
	</object>		</object>
			</object>
			</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND\|wxTOP\|wxRIGHT\|wxLEFT</property>		<property name="flag">wxEXPAND\|wxTOP\|wxRIGHT\|wxLEFT</property>

Admin message