diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 654042e42c..02a07d1ec7 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -1381,13 +1381,10 @@ NETINFO_ITEM* BOARD::FindNet( int aNetcode ) const
NETINFO_ITEM* net = m_NetInfo.GetNetItem( aNetcode );
#if defined(DEBUG)
- if( net ) // item can be NULL if anetcode is not valid
+ if( net && aNetcode != net->GetNet()) // item can be NULL if anetcode is not valid
{
- if( aNetcode != net->GetNet() )
- {
- printf( "FindNet() anetcode %d != GetNet() %d (net: %s)\n",
- aNetcode, net->GetNet(), TO_UTF8( net->GetNetname() ) );
- }
+ wxLogError( wxT( "FindNet() anetcode %d != GetNet() %d (net: %s)\n" ),
+ aNetcode, net->GetNet(), TO_UTF8( net->GetNetname() ) );
}
#endif
@@ -1440,7 +1437,7 @@ NETINFO_ITEM* BOARD::FindNet( const wxString& aNetname ) const
if( item == NULL )
return NULL;
- int icmp = item->GetNetname().Cmp( aNetname );
+ int icmp = item->GetNetname().Cmp( aNetname );
if( icmp == 0 ) // found !
{
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp
index 2c49c73cac..7c8c4790d9 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp
@@ -1,342 +1,364 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Aug 24 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_edit_module_for_BoardEditor_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_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 );
-
- m_GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
-
- m_NoteBook = new wxNotebook( this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize, 0 );
- m_PanelProperties = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
- wxBoxSizer* m_PanelPropertiesBoxSizer;
- m_PanelPropertiesBoxSizer = new wxBoxSizer( wxHORIZONTAL );
-
- wxBoxSizer* bSizer13;
- bSizer13 = new wxBoxSizer( wxVERTICAL );
-
- wxStaticBoxSizer* sbSizerRef;
- sbSizerRef = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Reference") ), wxHORIZONTAL );
-
- m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
- sbSizerRef->Add( m_ReferenceCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
-
- m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
- sbSizerRef->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );
-
- bSizer13->Add( sbSizerRef, 0, wxALL|wxEXPAND, 5 );
-
- wxStaticBoxSizer* sbSizerValue;
- sbSizerValue = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Value") ), wxHORIZONTAL );
-
- m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
- sbSizerValue->Add( m_ValueCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
-
- m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
- sbSizerValue->Add( m_button5, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );
-
- bSizer13->Add( sbSizerValue, 0, wxALL|wxEXPAND, 5 );
-
- wxString m_LayerCtrlChoices[] = { _("Top"), _("Bottom") };
- int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString );
- m_LayerCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, 0 );
- m_LayerCtrl->SetSelection( 0 );
- bSizer13->Add( m_LayerCtrl, 0, wxALL|wxEXPAND, 5 );
-
- wxStaticBoxSizer* sbSizerOrientation;
- sbSizerOrientation = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Orientation") ), wxVERTICAL );
-
- wxString m_OrientCtrlChoices[] = { _("Normal"), _("+90.0"), _("-90.0"), _("180.0"), _("User") };
- int m_OrientCtrlNChoices = sizeof( m_OrientCtrlChoices ) / sizeof( wxString );
- m_OrientCtrl = new wxRadioBox( m_PanelProperties, ID_LISTBOX_ORIENT_SELECT, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientCtrlNChoices, m_OrientCtrlChoices, 1, wxRA_SPECIFY_COLS );
- m_OrientCtrl->SetSelection( 1 );
- sbSizerOrientation->Add( m_OrientCtrl, 0, wxALL|wxEXPAND, 5 );
-
- m_staticText4 = new wxStaticText( m_PanelProperties, wxID_ANY, _("User orientation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText4->Wrap( -1 );
- sbSizerOrientation->Add( m_staticText4, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_OrientValue = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- sbSizerOrientation->Add( m_OrientValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
-
- bSizer13->Add( sbSizerOrientation, 0, wxALL|wxEXPAND, 5 );
-
- wxStaticBoxSizer* sbSizerPosition;
- sbSizerPosition = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Position") ), wxVERTICAL );
-
- wxFlexGridSizer* fgSizer2;
- fgSizer2 = new wxFlexGridSizer( 2, 2, 0, 0 );
- fgSizer2->AddGrowableCol( 1 );
- fgSizer2->AddGrowableRow( 2 );
- fgSizer2->SetFlexibleDirection( wxHORIZONTAL );
- fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
- XPositionStatic = new wxStaticText( m_PanelProperties, wxID_ANY, _("X"), wxDefaultPosition, wxDefaultSize, 0 );
- XPositionStatic->Wrap( -1 );
- fgSizer2->Add( XPositionStatic, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxLEFT|wxRIGHT|wxTOP, 5 );
-
- m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizer2->Add( m_ModPositionX, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
-
- YPositionStatic = new wxStaticText( m_PanelProperties, wxID_ANY, _("Y"), wxDefaultPosition, wxDefaultSize, 0 );
- YPositionStatic->Wrap( -1 );
- fgSizer2->Add( YPositionStatic, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
- m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizer2->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
-
- sbSizerPosition->Add( fgSizer2, 1, wxEXPAND, 5 );
-
- bSizer13->Add( sbSizerPosition, 0, wxALL|wxEXPAND, 5 );
-
- m_PanelPropertiesBoxSizer->Add( bSizer13, 1, wxEXPAND, 5 );
-
- m_PropRightSizer = new wxBoxSizer( wxVERTICAL );
-
- m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Module(s)"), wxDefaultPosition, wxDefaultSize, 0 );
- m_PropRightSizer->Add( m_buttonExchange, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
- m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Module Editor"), wxDefaultPosition, wxDefaultSize, 0 );
- m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
- wxBoxSizer* bSizer12;
- bSizer12 = new wxBoxSizer( wxHORIZONTAL );
-
- wxString m_AttributsCtrlChoices[] = { _("Normal"), _("Normal+Insert"), _("Virtual") };
- int m_AttributsCtrlNChoices = sizeof( m_AttributsCtrlChoices ) / sizeof( wxString );
- m_AttributsCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Attributes"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS );
- m_AttributsCtrl->SetSelection( 0 );
- bSizer12->Add( m_AttributsCtrl, 1, wxALL|wxEXPAND, 5 );
-
- wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };
- int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );
- m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Auto Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );
- m_AutoPlaceCtrl->SetSelection( 0 );
- bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );
-
- m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 );
-
- wxStaticBoxSizer* sbSizerAutoplace;
- sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Move and Place") ), wxHORIZONTAL );
-
- wxBoxSizer* bSizerRotOpt;
- bSizerRotOpt = new wxBoxSizer( wxVERTICAL );
-
- m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText11->Wrap( -1 );
- bSizerRotOpt->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-
- m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
- bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
- sbSizerAutoplace->Add( bSizerRotOpt, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizerMoveOpt;
- bSizerMoveOpt = new wxBoxSizer( wxVERTICAL );
-
- m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText12->Wrap( -1 );
- bSizerMoveOpt->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-
- m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
- bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
- sbSizerAutoplace->Add( bSizerMoveOpt, 1, wxEXPAND, 5 );
-
- m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 );
-
- wxStaticBoxSizer* sbSizerLocalProperties;
- sbSizerLocalProperties = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Settings") ), wxVERTICAL );
-
- wxBoxSizer* bSizer11;
- bSizer11 = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* bSizer10;
- bSizer10 = new wxBoxSizer( wxHORIZONTAL );
-
- m_staticText16 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Pad connection to zones:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText16->Wrap( -1 );
- bSizer10->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
- wxString m_ZoneConnectionChoiceChoices[] = { _("Use zone setting"), _("Solid"), _("Thermal relief"), _("None") };
- int m_ZoneConnectionChoiceNChoices = sizeof( m_ZoneConnectionChoiceChoices ) / sizeof( wxString );
- m_ZoneConnectionChoice = new wxChoice( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 );
- m_ZoneConnectionChoice->SetSelection( 0 );
- bSizer10->Add( m_ZoneConnectionChoice, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
-
- bSizer11->Add( bSizer10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-
- m_staticTextInfo = new wxStaticText( m_PanelProperties, wxID_ANY, _("Set clearances to 0 to use global values"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextInfo->Wrap( -1 );
- m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-
- bSizer11->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
-
- sbSizerLocalProperties->Add( bSizer11, 0, 0, 5 );
-
- wxFlexGridSizer* fgSizerClearances;
- fgSizerClearances = new wxFlexGridSizer( 5, 3, 0, 0 );
- fgSizerClearances->SetFlexibleDirection( wxBOTH );
- fgSizerClearances->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
- m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("All pads nets clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextNetClearance->Wrap( -1 );
- m_staticTextNetClearance->SetToolTip( _("This is the local net clearance for all pad of this footprint\nIf 0, the Netclass values are used\nThis value can be superseded by a pad local value.") );
-
- fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
- m_NetClearanceValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerClearances->Add( m_NetClearanceValueCtrl, 0, wxALL|wxEXPAND, 5 );
-
- m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
- m_NetClearanceUnits->Wrap( -1 );
- fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- m_staticline1 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- fgSizerClearances->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
- m_staticline2 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- fgSizerClearances->Add( m_staticline2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
- m_staticline3 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- fgSizerClearances->Add( m_staticline3, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
- m_MaskClearanceTitle = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_MaskClearanceTitle->Wrap( -1 );
- m_MaskClearanceTitle->SetToolTip( _("This is the local clearance between pads and the solder mask\nfor this footprint\nThis value can be superseded by a pad local value.\nIf 0, the global value is used") );
-
- fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
- m_SolderMaskMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerClearances->Add( m_SolderMaskMarginCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
-
- m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
- m_SolderMaskMarginUnits->Wrap( -1 );
- fgSizerClearances->Add( m_SolderMaskMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- m_staticTextSolderPaste = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextSolderPaste->Wrap( -1 );
- m_staticTextSolderPaste->SetToolTip( _("This is the local clearance between pads and the solder paste\nfor this footprint.\nThis value can be superseded by a pad local values.\nThe final clearance value is the sum of this value and the clearance value ratio\nA negative value means a smaller mask size than pad size") );
-
- fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_SolderPasteMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerClearances->Add( m_SolderPasteMarginCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
-
- m_SolderPasteMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
- m_SolderPasteMarginUnits->Wrap( -1 );
- fgSizerClearances->Add( m_SolderPasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
-
- m_staticTextRatio = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextRatio->Wrap( -1 );
- m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between pads and the solder paste\nfor this footprint.\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by a pad local value.\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") );
-
- fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
- m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
-
- m_SolderPasteRatioMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
- m_SolderPasteRatioMarginUnits->Wrap( -1 );
- fgSizerClearances->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
- sbSizerLocalProperties->Add( fgSizerClearances, 1, wxEXPAND, 5 );
-
- m_PropRightSizer->Add( sbSizerLocalProperties, 0, wxALL|wxEXPAND, 5 );
-
- m_PanelPropertiesBoxSizer->Add( m_PropRightSizer, 0, 0, 5 );
-
- m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer );
- m_PanelProperties->Layout();
- m_PanelPropertiesBoxSizer->Fit( m_PanelProperties );
- m_NoteBook->AddPage( m_PanelProperties, _("Properties"), true );
- m_Panel3D = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
- wxBoxSizer* bSizerMain3D;
- bSizerMain3D = new wxBoxSizer( wxVERTICAL );
-
- m_staticText3Dname = new wxStaticText( m_Panel3D, wxID_ANY, _("3D Shape Name"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText3Dname->Wrap( -1 );
- bSizerMain3D->Add( m_staticText3Dname, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
- m_3D_ShapeNameListBox = new wxListBox( m_Panel3D, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE );
- bSizerMain3D->Add( m_3D_ShapeNameListBox, 0, wxALL|wxEXPAND, 5 );
-
- wxBoxSizer* bLowerSizer3D;
- bLowerSizer3D = new wxBoxSizer( wxHORIZONTAL );
-
- m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Position") ), wxVERTICAL );
-
- bLowerSizer3D->Add( m_Sizer3DValues, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizer3DButtons;
- bSizer3DButtons = new wxBoxSizer( wxVERTICAL );
-
- m_buttonBrowse = new wxButton( m_Panel3D, ID_BROWSE_3D_LIB, _("Browse Shapes"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer3DButtons->Add( m_buttonBrowse, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
- m_buttonAdd = new wxButton( m_Panel3D, ID_ADD_3D_SHAPE, _("Add 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer3DButtons->Add( m_buttonAdd, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
- m_buttonRemove = new wxButton( m_Panel3D, ID_REMOVE_3D_SHAPE, _("Remove 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer3DButtons->Add( m_buttonRemove, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
- bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
- bSizerMain3D->Add( bLowerSizer3D, 1, wxEXPAND, 5 );
-
- m_Panel3D->SetSizer( bSizerMain3D );
- m_Panel3D->Layout();
- bSizerMain3D->Fit( m_Panel3D );
- m_NoteBook->AddPage( m_Panel3D, _("3D settings"), false );
-
- m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );
-
- m_sdbSizerStdButtons = new wxStdDialogButtonSizer();
- m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK );
- m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK );
- m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL );
- m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel );
- m_sdbSizerStdButtons->Realize();
- m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
-
- this->SetSizer( m_GeneralBoxSizer );
- this->Layout();
-
- // Connect Events
- m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this );
- m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditValue ), NULL, this );
- m_OrientCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this );
- m_buttonExchange->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this );
- m_buttonModuleEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this );
- m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this );
- m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Browse3DLib ), NULL, this );
- m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Add3DShape ), NULL, this );
- m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
- m_sdbSizerStdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnCancelClick ), NULL, this );
- m_sdbSizerStdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnOkClick ), NULL, this );
-}
-
-DIALOG_MODULE_BOARD_EDITOR_BASE::~DIALOG_MODULE_BOARD_EDITOR_BASE()
-{
- // Disconnect Events
- m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this );
- m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditValue ), NULL, this );
- m_OrientCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this );
- m_buttonExchange->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this );
- m_buttonModuleEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this );
- m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this );
- m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Browse3DLib ), NULL, this );
- m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Add3DShape ), NULL, this );
- m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
- m_sdbSizerStdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnCancelClick ), NULL, this );
- m_sdbSizerStdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnOkClick ), NULL, this );
-
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_edit_module_for_BoardEditor_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_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 );
+
+ m_GeneralBoxSizer = new wxBoxSizer( wxVERTICAL );
+
+ m_NoteBook = new wxNotebook( this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize, 0 );
+ m_PanelProperties = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* m_PanelPropertiesBoxSizer;
+ m_PanelPropertiesBoxSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ wxBoxSizer* bSizer13;
+ bSizer13 = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBoxSizer* sbSizerRef;
+ sbSizerRef = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Reference") ), wxHORIZONTAL );
+
+ m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+ sbSizerRef->Add( m_ReferenceCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+
+ m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+ sbSizerRef->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );
+
+
+ bSizer13->Add( sbSizerRef, 0, wxALL|wxEXPAND, 5 );
+
+ wxStaticBoxSizer* sbSizerValue;
+ sbSizerValue = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Value") ), wxHORIZONTAL );
+
+ m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+ sbSizerValue->Add( m_ValueCtrl, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+
+ m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+ sbSizerValue->Add( m_button5, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );
+
+
+ bSizer13->Add( sbSizerValue, 0, wxALL|wxEXPAND, 5 );
+
+ wxString m_LayerCtrlChoices[] = { _("Top"), _("Bottom") };
+ int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString );
+ m_LayerCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, 0 );
+ m_LayerCtrl->SetSelection( 0 );
+ bSizer13->Add( m_LayerCtrl, 0, wxALL|wxEXPAND, 5 );
+
+ wxStaticBoxSizer* sbSizerOrientation;
+ sbSizerOrientation = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Orientation") ), wxVERTICAL );
+
+ wxString m_OrientCtrlChoices[] = { _("Normal"), _("+90.0"), _("-90.0"), _("180.0"), _("User") };
+ int m_OrientCtrlNChoices = sizeof( m_OrientCtrlChoices ) / sizeof( wxString );
+ m_OrientCtrl = new wxRadioBox( m_PanelProperties, ID_LISTBOX_ORIENT_SELECT, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientCtrlNChoices, m_OrientCtrlChoices, 1, wxRA_SPECIFY_COLS );
+ m_OrientCtrl->SetSelection( 1 );
+ sbSizerOrientation->Add( m_OrientCtrl, 0, wxALL|wxEXPAND, 5 );
+
+ m_staticText4 = new wxStaticText( m_PanelProperties, wxID_ANY, _("User orientation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText4->Wrap( -1 );
+ sbSizerOrientation->Add( m_staticText4, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_OrientValue = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ sbSizerOrientation->Add( m_OrientValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+
+
+ bSizer13->Add( sbSizerOrientation, 0, wxALL|wxEXPAND, 5 );
+
+ wxStaticBoxSizer* sbSizerPosition;
+ sbSizerPosition = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Position") ), wxVERTICAL );
+
+ wxFlexGridSizer* fgSizer2;
+ fgSizer2 = new wxFlexGridSizer( 2, 2, 0, 0 );
+ fgSizer2->AddGrowableCol( 1 );
+ fgSizer2->SetFlexibleDirection( wxHORIZONTAL );
+ fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+ XPositionStatic = new wxStaticText( m_PanelProperties, wxID_ANY, _("X"), wxDefaultPosition, wxDefaultSize, 0 );
+ XPositionStatic->Wrap( -1 );
+ fgSizer2->Add( XPositionStatic, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxLEFT|wxRIGHT|wxTOP, 5 );
+
+ m_ModPositionX = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizer2->Add( m_ModPositionX, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+
+ YPositionStatic = new wxStaticText( m_PanelProperties, wxID_ANY, _("Y"), wxDefaultPosition, wxDefaultSize, 0 );
+ YPositionStatic->Wrap( -1 );
+ fgSizer2->Add( YPositionStatic, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+ m_ModPositionY = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizer2->Add( m_ModPositionY, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+
+
+ sbSizerPosition->Add( fgSizer2, 1, wxEXPAND, 5 );
+
+
+ bSizer13->Add( sbSizerPosition, 0, wxALL|wxEXPAND, 5 );
+
+
+ m_PanelPropertiesBoxSizer->Add( bSizer13, 1, wxEXPAND, 5 );
+
+ m_PropRightSizer = new wxBoxSizer( wxVERTICAL );
+
+ m_buttonExchange = new wxButton( m_PanelProperties, ID_MODULE_PROPERTIES_EXCHANGE, _("Change Module(s)"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_PropRightSizer->Add( m_buttonExchange, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+ m_buttonModuleEditor = new wxButton( m_PanelProperties, ID_GOTO_MODULE_EDITOR, _("Module Editor"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_PropRightSizer->Add( m_buttonModuleEditor, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+ wxBoxSizer* bSizer12;
+ bSizer12 = new wxBoxSizer( wxHORIZONTAL );
+
+ wxString m_AttributsCtrlChoices[] = { _("Normal"), _("Normal+Insert"), _("Virtual") };
+ int m_AttributsCtrlNChoices = sizeof( m_AttributsCtrlChoices ) / sizeof( wxString );
+ m_AttributsCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Attributes"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS );
+ m_AttributsCtrl->SetSelection( 0 );
+ bSizer12->Add( m_AttributsCtrl, 1, wxALL|wxEXPAND, 5 );
+
+ wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };
+ int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );
+ m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Auto Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );
+ m_AutoPlaceCtrl->SetSelection( 0 );
+ bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );
+
+
+ m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 );
+
+ wxStaticBoxSizer* sbSizerAutoplace;
+ sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Move and Place") ), wxHORIZONTAL );
+
+ wxBoxSizer* bSizerRotOpt;
+ bSizerRotOpt = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText11 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 90 degree"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText11->Wrap( -1 );
+ bSizerRotOpt->Add( m_staticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+ m_CostRot90Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
+ bSizerRotOpt->Add( m_CostRot90Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+ sbSizerAutoplace->Add( bSizerRotOpt, 1, wxEXPAND, 5 );
+
+ wxBoxSizer* bSizerMoveOpt;
+ bSizerMoveOpt = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText12->Wrap( -1 );
+ bSizerMoveOpt->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+ m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS );
+ bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+ sbSizerAutoplace->Add( bSizerMoveOpt, 1, wxEXPAND, 5 );
+
+
+ m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 );
+
+ wxStaticBoxSizer* sbSizerLocalProperties;
+ sbSizerLocalProperties = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Settings") ), wxVERTICAL );
+
+ wxBoxSizer* bSizer11;
+ bSizer11 = new wxBoxSizer( wxVERTICAL );
+
+ wxBoxSizer* bSizer10;
+ bSizer10 = new wxBoxSizer( wxHORIZONTAL );
+
+ m_staticText16 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Pad connection to zones:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText16->Wrap( -1 );
+ bSizer10->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+ wxString m_ZoneConnectionChoiceChoices[] = { _("Use zone setting"), _("Solid"), _("Thermal relief"), _("None") };
+ int m_ZoneConnectionChoiceNChoices = sizeof( m_ZoneConnectionChoiceChoices ) / sizeof( wxString );
+ m_ZoneConnectionChoice = new wxChoice( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 );
+ m_ZoneConnectionChoice->SetSelection( 0 );
+ bSizer10->Add( m_ZoneConnectionChoice, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+
+
+ bSizer11->Add( bSizer10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+ m_staticTextInfo = new wxStaticText( m_PanelProperties, wxID_ANY, _("Set clearances to 0 to use global values"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextInfo->Wrap( -1 );
+ m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+ bSizer11->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
+
+
+ sbSizerLocalProperties->Add( bSizer11, 0, 0, 5 );
+
+ wxFlexGridSizer* fgSizerClearances;
+ fgSizerClearances = new wxFlexGridSizer( 5, 3, 0, 0 );
+ fgSizerClearances->AddGrowableCol( 1 );
+ fgSizerClearances->SetFlexibleDirection( wxBOTH );
+ fgSizerClearances->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+ m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("All pads nets clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextNetClearance->Wrap( -1 );
+ m_staticTextNetClearance->SetToolTip( _("This is the local net clearance for all pad of this footprint\nIf 0, the Netclass values are used\nThis value can be superseded by a pad local value.") );
+
+ fgSizerClearances->Add( m_staticTextNetClearance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+ m_NetClearanceValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerClearances->Add( m_NetClearanceValueCtrl, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+ m_NetClearanceUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_NetClearanceUnits->Wrap( -1 );
+ fgSizerClearances->Add( m_NetClearanceUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+ m_staticline1 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ fgSizerClearances->Add( m_staticline1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+ m_staticline2 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ fgSizerClearances->Add( m_staticline2, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+ m_staticline3 = new wxStaticLine( m_PanelProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ fgSizerClearances->Add( m_staticline3, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+ m_MaskClearanceTitle = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_MaskClearanceTitle->Wrap( -1 );
+ m_MaskClearanceTitle->SetToolTip( _("This is the local clearance between pads and the solder mask\nfor this footprint\nThis value can be superseded by a pad local value.\nIf 0, the global value is used") );
+
+ fgSizerClearances->Add( m_MaskClearanceTitle, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+ m_SolderMaskMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerClearances->Add( m_SolderMaskMarginCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+
+ m_SolderMaskMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_SolderMaskMarginUnits->Wrap( -1 );
+ fgSizerClearances->Add( m_SolderMaskMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+ m_staticTextSolderPaste = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextSolderPaste->Wrap( -1 );
+ m_staticTextSolderPaste->SetToolTip( _("This is the local clearance between pads and the solder paste\nfor this footprint.\nThis value can be superseded by a pad local values.\nThe final clearance value is the sum of this value and the clearance value ratio\nA negative value means a smaller mask size than pad size") );
+
+ fgSizerClearances->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_SolderPasteMarginCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerClearances->Add( m_SolderPasteMarginCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
+
+ m_SolderPasteMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_SolderPasteMarginUnits->Wrap( -1 );
+ fgSizerClearances->Add( m_SolderPasteMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
+
+ m_staticTextRatio = new wxStaticText( m_PanelProperties, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextRatio->Wrap( -1 );
+ m_staticTextRatio->SetToolTip( _("This is the local clearance ratio in per cent between pads and the solder paste\nfor this footprint.\nA value of 10 means the clearance value is 10 per cent of the pad size\nThis value can be superseded by a pad local value.\nThe final clearance value is the sum of this value and the clearance value\nA negative value means a smaller mask size than pad size.") );
+
+ fgSizerClearances->Add( m_staticTextRatio, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+ m_SolderPasteMarginRatioCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerClearances->Add( m_SolderPasteMarginRatioCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+
+ m_SolderPasteRatioMarginUnits = new wxStaticText( m_PanelProperties, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_SolderPasteRatioMarginUnits->Wrap( -1 );
+ fgSizerClearances->Add( m_SolderPasteRatioMarginUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+ sbSizerLocalProperties->Add( fgSizerClearances, 1, wxEXPAND, 5 );
+
+
+ m_PropRightSizer->Add( sbSizerLocalProperties, 0, wxALL|wxEXPAND, 5 );
+
+
+ m_PanelPropertiesBoxSizer->Add( m_PropRightSizer, 0, 0, 5 );
+
+
+ m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer );
+ m_PanelProperties->Layout();
+ m_PanelPropertiesBoxSizer->Fit( m_PanelProperties );
+ m_NoteBook->AddPage( m_PanelProperties, _("Properties"), true );
+ m_Panel3D = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+ wxBoxSizer* bSizerMain3D;
+ bSizerMain3D = new wxBoxSizer( wxVERTICAL );
+
+ m_staticText3Dname = new wxStaticText( m_Panel3D, wxID_ANY, _("3D Shape Name"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText3Dname->Wrap( -1 );
+ bSizerMain3D->Add( m_staticText3Dname, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+ m_3D_ShapeNameListBox = new wxListBox( m_Panel3D, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE );
+ bSizerMain3D->Add( m_3D_ShapeNameListBox, 0, wxALL|wxEXPAND, 5 );
+
+ wxBoxSizer* bLowerSizer3D;
+ bLowerSizer3D = new wxBoxSizer( wxHORIZONTAL );
+
+ m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Position") ), wxVERTICAL );
+
+
+ bLowerSizer3D->Add( m_Sizer3DValues, 1, wxEXPAND, 5 );
+
+ wxBoxSizer* bSizer3DButtons;
+ bSizer3DButtons = new wxBoxSizer( wxVERTICAL );
+
+ m_buttonBrowse = new wxButton( m_Panel3D, ID_BROWSE_3D_LIB, _("Browse Shapes"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer3DButtons->Add( m_buttonBrowse, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+ m_buttonAdd = new wxButton( m_Panel3D, ID_ADD_3D_SHAPE, _("Add 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer3DButtons->Add( m_buttonAdd, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+ m_buttonRemove = new wxButton( m_Panel3D, ID_REMOVE_3D_SHAPE, _("Remove 3D Shape"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer3DButtons->Add( m_buttonRemove, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+
+ bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+ bSizerMain3D->Add( bLowerSizer3D, 1, wxEXPAND, 5 );
+
+
+ m_Panel3D->SetSizer( bSizerMain3D );
+ m_Panel3D->Layout();
+ bSizerMain3D->Fit( m_Panel3D );
+ m_NoteBook->AddPage( m_Panel3D, _("3D settings"), false );
+
+ m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );
+
+ m_sdbSizerStdButtons = new wxStdDialogButtonSizer();
+ m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK );
+ m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsOK );
+ m_sdbSizerStdButtonsCancel = new wxButton( this, wxID_CANCEL );
+ m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel );
+ m_sdbSizerStdButtons->Realize();
+
+ m_GeneralBoxSizer->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
+
+
+ this->SetSizer( m_GeneralBoxSizer );
+ this->Layout();
+
+ // Connect Events
+ m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this );
+ m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditValue ), NULL, this );
+ m_OrientCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this );
+ m_buttonExchange->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this );
+ m_buttonModuleEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this );
+ m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this );
+ m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Browse3DLib ), NULL, this );
+ m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Add3DShape ), NULL, this );
+ m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
+ m_sdbSizerStdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnCancelClick ), NULL, this );
+ m_sdbSizerStdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnOkClick ), NULL, this );
+}
+
+DIALOG_MODULE_BOARD_EDITOR_BASE::~DIALOG_MODULE_BOARD_EDITOR_BASE()
+{
+ // Disconnect Events
+ m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this );
+ m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditValue ), NULL, this );
+ m_OrientCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this );
+ m_buttonExchange->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this );
+ m_buttonModuleEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this );
+ m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this );
+ m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Browse3DLib ), NULL, this );
+ m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Add3DShape ), NULL, this );
+ m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this );
+ m_sdbSizerStdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnCancelClick ), NULL, this );
+ m_sdbSizerStdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnOkClick ), NULL, this );
+
+}
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp
index 97752a50c5..8528a0780f 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp
@@ -1,4489 +1,4370 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h
index 8b25ef71cb..e2894069f2 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h
@@ -1,128 +1,128 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Aug 24 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
-#define __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-///////////////////////////////////////////////////////////////////////////
-
-#define ID_NOTEBOOK 1000
-#define ID_LISTBOX_ORIENT_SELECT 1001
-#define ID_MODULE_PROPERTIES_EXCHANGE 1002
-#define ID_GOTO_MODULE_EDITOR 1003
-#define ID_BROWSE_3D_LIB 1004
-#define ID_ADD_3D_SHAPE 1005
-#define ID_REMOVE_3D_SHAPE 1006
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_MODULE_BOARD_EDITOR_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog
-{
- private:
- wxBoxSizer* m_GeneralBoxSizer;
- wxBoxSizer* m_PropRightSizer;
-
- protected:
- wxNotebook* m_NoteBook;
- wxPanel* m_PanelProperties;
- wxTextCtrl* m_ReferenceCtrl;
- wxButton* m_button4;
- wxTextCtrl* m_ValueCtrl;
- wxButton* m_button5;
- wxRadioBox* m_LayerCtrl;
- wxRadioBox* m_OrientCtrl;
- wxStaticText* m_staticText4;
- wxTextCtrl* m_OrientValue;
- wxStaticText* XPositionStatic;
- wxTextCtrl* m_ModPositionX;
- wxStaticText* YPositionStatic;
- wxTextCtrl* m_ModPositionY;
- wxButton* m_buttonExchange;
- wxButton* m_buttonModuleEditor;
- wxRadioBox* m_AttributsCtrl;
- wxRadioBox* m_AutoPlaceCtrl;
- wxStaticText* m_staticText11;
- wxSlider* m_CostRot90Ctrl;
- wxStaticText* m_staticText12;
- wxSlider* m_CostRot180Ctrl;
- wxStaticText* m_staticText16;
- wxChoice* m_ZoneConnectionChoice;
- wxStaticText* m_staticTextInfo;
- wxStaticText* m_staticTextNetClearance;
- wxTextCtrl* m_NetClearanceValueCtrl;
- wxStaticText* m_NetClearanceUnits;
- wxStaticLine* m_staticline1;
- wxStaticLine* m_staticline2;
- wxStaticLine* m_staticline3;
- wxStaticText* m_MaskClearanceTitle;
- wxTextCtrl* m_SolderMaskMarginCtrl;
- wxStaticText* m_SolderMaskMarginUnits;
- wxStaticText* m_staticTextSolderPaste;
- wxTextCtrl* m_SolderPasteMarginCtrl;
- wxStaticText* m_SolderPasteMarginUnits;
- wxStaticText* m_staticTextRatio;
- wxTextCtrl* m_SolderPasteMarginRatioCtrl;
- wxStaticText* m_SolderPasteRatioMarginUnits;
- wxPanel* m_Panel3D;
- wxStaticText* m_staticText3Dname;
- wxListBox* m_3D_ShapeNameListBox;
- wxButton* m_buttonBrowse;
- wxButton* m_buttonAdd;
- wxButton* m_buttonRemove;
- wxStdDialogButtonSizer* m_sdbSizerStdButtons;
- wxButton* m_sdbSizerStdButtonsOK;
- wxButton* m_sdbSizerStdButtonsCancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnEditReference( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnEditValue( wxCommandEvent& event ) { event.Skip(); }
- virtual void ModuleOrientEvent( wxCommandEvent& event ) { event.Skip(); }
- virtual void ExchangeModule( wxCommandEvent& event ) { event.Skip(); }
- virtual void GotoModuleEditor( wxCommandEvent& event ) { event.Skip(); }
- virtual void On3DShapeNameSelected( wxCommandEvent& event ) { event.Skip(); }
- virtual void Browse3DLib( wxCommandEvent& event ) { event.Skip(); }
- virtual void Add3DShape( wxCommandEvent& event ) { event.Skip(); }
- virtual void Remove3DShape( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
-
-
- public:
- wxStaticBoxSizer* m_Sizer3DValues;
-
- DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,800 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_MODULE_BOARD_EDITOR_BASE();
-
-};
-
-#endif //__DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
+#define __DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+///////////////////////////////////////////////////////////////////////////
+
+#define ID_NOTEBOOK 1000
+#define ID_LISTBOX_ORIENT_SELECT 1001
+#define ID_MODULE_PROPERTIES_EXCHANGE 1002
+#define ID_GOTO_MODULE_EDITOR 1003
+#define ID_BROWSE_3D_LIB 1004
+#define ID_ADD_3D_SHAPE 1005
+#define ID_REMOVE_3D_SHAPE 1006
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_MODULE_BOARD_EDITOR_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_MODULE_BOARD_EDITOR_BASE : public wxDialog
+{
+ private:
+ wxBoxSizer* m_GeneralBoxSizer;
+ wxBoxSizer* m_PropRightSizer;
+
+ protected:
+ wxNotebook* m_NoteBook;
+ wxPanel* m_PanelProperties;
+ wxTextCtrl* m_ReferenceCtrl;
+ wxButton* m_button4;
+ wxTextCtrl* m_ValueCtrl;
+ wxButton* m_button5;
+ wxRadioBox* m_LayerCtrl;
+ wxRadioBox* m_OrientCtrl;
+ wxStaticText* m_staticText4;
+ wxTextCtrl* m_OrientValue;
+ wxStaticText* XPositionStatic;
+ wxTextCtrl* m_ModPositionX;
+ wxStaticText* YPositionStatic;
+ wxTextCtrl* m_ModPositionY;
+ wxButton* m_buttonExchange;
+ wxButton* m_buttonModuleEditor;
+ wxRadioBox* m_AttributsCtrl;
+ wxRadioBox* m_AutoPlaceCtrl;
+ wxStaticText* m_staticText11;
+ wxSlider* m_CostRot90Ctrl;
+ wxStaticText* m_staticText12;
+ wxSlider* m_CostRot180Ctrl;
+ wxStaticText* m_staticText16;
+ wxChoice* m_ZoneConnectionChoice;
+ wxStaticText* m_staticTextInfo;
+ wxStaticText* m_staticTextNetClearance;
+ wxTextCtrl* m_NetClearanceValueCtrl;
+ wxStaticText* m_NetClearanceUnits;
+ wxStaticLine* m_staticline1;
+ wxStaticLine* m_staticline2;
+ wxStaticLine* m_staticline3;
+ wxStaticText* m_MaskClearanceTitle;
+ wxTextCtrl* m_SolderMaskMarginCtrl;
+ wxStaticText* m_SolderMaskMarginUnits;
+ wxStaticText* m_staticTextSolderPaste;
+ wxTextCtrl* m_SolderPasteMarginCtrl;
+ wxStaticText* m_SolderPasteMarginUnits;
+ wxStaticText* m_staticTextRatio;
+ wxTextCtrl* m_SolderPasteMarginRatioCtrl;
+ wxStaticText* m_SolderPasteRatioMarginUnits;
+ wxPanel* m_Panel3D;
+ wxStaticText* m_staticText3Dname;
+ wxListBox* m_3D_ShapeNameListBox;
+ wxButton* m_buttonBrowse;
+ wxButton* m_buttonAdd;
+ wxButton* m_buttonRemove;
+ wxStdDialogButtonSizer* m_sdbSizerStdButtons;
+ wxButton* m_sdbSizerStdButtonsOK;
+ wxButton* m_sdbSizerStdButtonsCancel;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnEditReference( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnEditValue( wxCommandEvent& event ) { event.Skip(); }
+ virtual void ModuleOrientEvent( wxCommandEvent& event ) { event.Skip(); }
+ virtual void ExchangeModule( wxCommandEvent& event ) { event.Skip(); }
+ virtual void GotoModuleEditor( wxCommandEvent& event ) { event.Skip(); }
+ virtual void On3DShapeNameSelected( wxCommandEvent& event ) { event.Skip(); }
+ virtual void Browse3DLib( wxCommandEvent& event ) { event.Skip(); }
+ virtual void Add3DShape( wxCommandEvent& event ) { event.Skip(); }
+ virtual void Remove3DShape( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+ public:
+ wxStaticBoxSizer* m_Sizer3DValues;
+
+ DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Module properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 544,599 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_MODULE_BOARD_EDITOR_BASE();
+
+};
+
+#endif //__DIALOG_EDIT_MODULE_FOR_BOARDEDITOR_BASE_H__
diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp
index fd56d27267..3ddc148331 100644
--- a/pcbnew/legacy_plugin.cpp
+++ b/pcbnew/legacy_plugin.cpp
@@ -1713,13 +1713,11 @@ void LEGACY_PLUGIN::loadPCB_LINE()
THROW_IO_ERROR( "Missing '$EndDRAWSEGMENT'" );
}
-
void LEGACY_PLUGIN::loadNETINFO_ITEM()
{
char buf[1024];
NETINFO_ITEM* net = new NETINFO_ITEM( m_board );
- m_board->AppendNet( net );
while( READLINE( m_reader ) )
{
@@ -1738,7 +1736,15 @@ void LEGACY_PLUGIN::loadNETINFO_ITEM()
}
else if( TESTLINE( "$EndEQUIPOT" ) )
+ {
+ // net 0 should be already in list, so store this net
+ // if it is not the net 0, or if the net 0 does not exists.
+ if( net->GetNet() > 0 || m_board->FindNet( 0 ) == NULL )
+ m_board->AppendNet( net );
+ else
+ delete net;
return; // preferred exit
+ }
}
THROW_IO_ERROR( "Missing '$EndEQUIPOT'" );
@@ -2135,8 +2141,11 @@ void LEGACY_PLUGIN::loadZONE_CONTAINER()
}
zc->SetTimeStamp( timestamp );
- zc->SetNet( netcode );
- zc->SetNetName( FROM_UTF8( buf ) );
+ // Init the net code only, not the netname, to be sure
+ // the zone net name is the name read in file.
+ // (When mismatch, the user will be prompted in DRC, to fix the actual name)
+ zc->BOARD_CONNECTED_ITEM::SetNet( netcode );
+ zc->SetNetName( FROM_UTF8( buf ) ); // init the net name here
}
else if( TESTLINE( "ZLayer" ) ) // layer found
diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp
index 0419f62587..2334f7fd7c 100644
--- a/pcbnew/pcb_parser.cpp
+++ b/pcbnew/pcb_parser.cpp
@@ -605,7 +605,7 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
default:
wxString err;
- err.Printf( _( "%d is not a valid title block comment number" ), commentNumber );
+ err.Printf( wxT( "%d is not a valid title block comment number" ), commentNumber );
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
}
@@ -705,7 +705,7 @@ int PCB_PARSER::lookUpLayer() throw( PARSE_ERROR, IO_ERROR )
if( it == m_layerMap.end() )
{
wxString error;
- error.Printf( _( "Layer '%s' in file <%s> at line %d, position %d was not defined in the layers section" ),
+ error.Printf( wxT( "Layer '%s' in file <%s> at line %d, position %d was not defined in the layers section" ),
GetChars( name ), GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
@@ -720,7 +720,7 @@ int PCB_PARSER::lookUpLayer() throw( PARSE_ERROR, IO_ERROR )
if( !m_board->IsLayerEnabled( layerIndex ) )
{
wxString error;
- error.Printf( _( "Layer index %d in file <%s> at line %d, offset %d was not defined in the layers section" ),
+ error.Printf( wxT( "Layer index %d in file <%s> at line %d, offset %d was not defined in the layers section" ),
layerIndex, GetChars( CurSource() ), CurLineNumber(), CurOffset() );
THROW_IO_ERROR( error );
}
@@ -1003,10 +1003,16 @@ void PCB_PARSER::parseNETINFO_ITEM() throw( IO_ERROR, PARSE_ERROR )
wxString name = FromUTF8();
NeedRIGHT();
- NETINFO_ITEM* net = new NETINFO_ITEM( m_board );
- net->SetNet( number );
- net->SetNetname( name );
- m_board->AppendNet( net );
+ // net 0 should be already in list, so store this net
+ // if it is not the net 0, or if the net 0 does not exists.
+ // (TODO: a better test.)
+ if( number > 0 || m_board->FindNet( 0 ) == NULL )
+ {
+ NETINFO_ITEM* net = new NETINFO_ITEM( m_board );
+ net->SetNet( number );
+ net->SetNetname( name );
+ m_board->AppendNet( net );
+ }
}
@@ -2322,7 +2328,10 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER() throw( IO_ERROR, PARSE_ERROR )
switch( token )
{
case T_net:
- zone->SetNet( parseInt( "net number" ) );
+ // Init the net code only, not the netname, to be sure
+ // the zone net name is the name read in file.
+ // (When mismatch, the user will be prompted in DRC, to fix the actual name)
+ zone->BOARD_CONNECTED_ITEM::SetNet( parseInt( "net number" ) );
NeedRIGHT();
break;