Commit 57604b0a authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Gerbview: export_to_pcbnew enhancement and fixes.

parent 81947a4f

common/build_version.cpp

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



#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-04-17)"

#define KICAD_BUILD_VERSION "(2011-04-24)"

#endif

gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp

+37 −18
Original line number Diff line number Diff line
@@ -9,15 +9,16 @@ 


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



BEGIN_EVENT_TABLE( LAYERS_TABLE_DIALOG_BASE, wxDialog )

	EVT_BUTTON( ID_STORE_CHOICE, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnStoreSetup )

	EVT_BUTTON( ID_GET_PREVIOUS_CHOICE, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnGetSetup )

	EVT_BUTTON( ID_RESET_CHOICE, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnResetClick )

	EVT_BUTTON( wxID_CANCEL, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnCancelClick )

	EVT_BUTTON( wxID_OK, LAYERS_TABLE_DIALOG_BASE::_wxFB_OnOkClick )

BEGIN_EVENT_TABLE( LAYERS_MAP_DIALOG_BASE, wxDialog )

	EVT_COMBOBOX( ID_M_COMBOCOPPERLAYERSCOUNT, LAYERS_MAP_DIALOG_BASE::_wxFB_OnBrdLayersCountSelection )

	EVT_BUTTON( ID_STORE_CHOICE, LAYERS_MAP_DIALOG_BASE::_wxFB_OnStoreSetup )

	EVT_BUTTON( ID_GET_PREVIOUS_CHOICE, LAYERS_MAP_DIALOG_BASE::_wxFB_OnGetSetup )

	EVT_BUTTON( ID_RESET_CHOICE, LAYERS_MAP_DIALOG_BASE::_wxFB_OnResetClick )

	EVT_BUTTON( wxID_CANCEL, LAYERS_MAP_DIALOG_BASE::_wxFB_OnCancelClick )

	EVT_BUTTON( wxID_OK, LAYERS_MAP_DIALOG_BASE::_wxFB_OnOkClick )

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 );
@@ -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 );

	sbSizerLayersTable->Add( m_staticlineSep, 0, wxEXPAND | wxALL, 5 );

	

	m_flexRightColumnBoxSizer = new wxFlexGridSizer( 16, 4, 0, 0 );

	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 );

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

	

	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;

	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 );

	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 );
@@ -87,6 +106,6 @@ LAYERS_TABLE_DIALOG_BASE::LAYERS_TABLE_DIALOG_BASE( wxWindow* parent, wxWindowID 
	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

File changed.

Preview size limit exceeded, changes collapsed.

gerbview/dialogs/dialog_layers_select_to_pcb_base.h

+15 −6

File changed.

Preview size limit exceeded, changes collapsed.

gerbview/export_to_pcbnew.cpp

+25 −21

File changed.

Preview size limit exceeded, changes collapsed.