From 55b3776f421b04378c6034b54cc12fef84228b8a Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 10 Mar 2012 14:00:31 +0100 Subject: [PATCH] Pcbnew: Fix Bug #951414 (Windows specific) Ckecks more pad parameters in pad editor dialog (previously not tested, so a pad could have some very incorrect parameters) --- pcbnew/dialogs/dialog_pad_properties.cpp | 166 +- pcbnew/dialogs/dialog_pad_properties_base.cpp | 59 +- pcbnew/dialogs/dialog_pad_properties_base.fbp | 1700 ++++++++--------- pcbnew/dialogs/dialog_pad_properties_base.h | 9 +- 4 files changed, 959 insertions(+), 975 deletions(-) diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp index 4998b8c16f..b1031fd3f5 100644 --- a/pcbnew/dialogs/dialog_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_properties.cpp @@ -21,6 +21,7 @@ #include #include +#include // list of pad shapes. @@ -84,6 +85,7 @@ private: static wxSize prevSize; void initValues(); + bool PadValuesOK(); // test if all values are acceptable for the pad void OnPadShapeSelection( wxCommandEvent& event ); void OnDrillShapeSelected( wxCommandEvent& event ); void PadOrientEvent( wxCommandEvent& event ); @@ -93,7 +95,7 @@ private: void OnSetLayers( wxCommandEvent& event ); void OnCancelButtonClick( wxCommandEvent& event ); void OnPaintShowPanel( wxPaintEvent& event ); - bool TransfertDataToPad( D_PAD* aPad, bool aPromptOnError = false ); + bool TransfertDataToPad( D_PAD* aPad ); void OnValuesChanged( wxCommandEvent& event ); }; @@ -209,6 +211,23 @@ void DIALOG_PAD_PROPERTIES::initValues() wxString msg; double angle; + // Setup layers names from board + // Should be made first, before calling m_rbCopperLayersSel->SetSelection() + m_rbCopperLayersSel->SetString( 0, m_Board->GetLayerName( LAYER_N_FRONT ) ); + m_rbCopperLayersSel->SetString( 1, m_Board->GetLayerName( LAYER_N_BACK ) ); + + m_PadLayerAdhCmp->SetLabel( m_Board->GetLayerName( ADHESIVE_N_FRONT ) ); + m_PadLayerAdhCu->SetLabel( m_Board->GetLayerName( ADHESIVE_N_BACK ) ); + m_PadLayerPateCmp->SetLabel( m_Board->GetLayerName( SOLDERPASTE_N_FRONT ) ); + m_PadLayerPateCu->SetLabel( m_Board->GetLayerName( SOLDERPASTE_N_BACK ) ); + m_PadLayerSilkCmp->SetLabel( m_Board->GetLayerName( SILKSCREEN_N_FRONT ) ); + m_PadLayerSilkCu->SetLabel( m_Board->GetLayerName( SILKSCREEN_N_BACK ) ); + m_PadLayerMaskCmp->SetLabel( m_Board->GetLayerName( SOLDERMASK_N_FRONT ) ); + m_PadLayerMaskCu->SetLabel( m_Board->GetLayerName( SOLDERMASK_N_BACK ) ); + m_PadLayerECO1->SetLabel( m_Board->GetLayerName( ECO1_N ) ); + m_PadLayerECO2->SetLabel( m_Board->GetLayerName( ECO2_N ) ); + m_PadLayerDraft->SetLabel( m_Board->GetLayerName( DRAW_N ) ); + m_isFlipped = false; if( m_CurrentPad ) @@ -424,26 +443,9 @@ void DIALOG_PAD_PROPERTIES::initValues() else m_DrillShapeCtrl->SetSelection( 1 ); - // Setup layers names from board - - m_rbCopperLayersSel->SetString( 0, m_Board->GetLayerName( LAYER_N_FRONT ) ); - m_rbCopperLayersSel->SetString( 1, m_Board->GetLayerName( LAYER_N_BACK ) ); - - m_PadLayerAdhCmp->SetLabel( m_Board->GetLayerName( ADHESIVE_N_FRONT ) ); - m_PadLayerAdhCu->SetLabel( m_Board->GetLayerName( ADHESIVE_N_BACK ) ); - m_PadLayerPateCmp->SetLabel( m_Board->GetLayerName( SOLDERPASTE_N_FRONT ) ); - m_PadLayerPateCu->SetLabel( m_Board->GetLayerName( SOLDERPASTE_N_BACK ) ); - m_PadLayerSilkCmp->SetLabel( m_Board->GetLayerName( SILKSCREEN_N_FRONT ) ); - m_PadLayerSilkCu->SetLabel( m_Board->GetLayerName( SILKSCREEN_N_BACK ) ); - m_PadLayerMaskCmp->SetLabel( m_Board->GetLayerName( SOLDERMASK_N_FRONT ) ); - m_PadLayerMaskCu->SetLabel( m_Board->GetLayerName( SOLDERMASK_N_BACK ) ); - m_PadLayerECO1->SetLabel( m_Board->GetLayerName( ECO1_N ) ); - m_PadLayerECO2->SetLabel( m_Board->GetLayerName( ECO2_N ) ); - m_PadLayerDraft->SetLabel( m_Board->GetLayerName( DRAW_N ) ); - // Update some dialog widgets state (Enable/disable options): wxCommandEvent cmd_event; - OnPadShapeSelection( cmd_event ); + SetPadLayersList( m_dummyPad->GetLayerMask() ); OnDrillShapeSelected( cmd_event ); } @@ -623,23 +625,93 @@ void DIALOG_PAD_PROPERTIES::OnSetLayers( wxCommandEvent& event ) m_panelShowPad->Refresh(); } +// test if all values are acceptable for the pad +bool DIALOG_PAD_PROPERTIES::PadValuesOK() +{ + bool error = TransfertDataToPad( m_dummyPad ); + + wxArrayString error_msgs; + wxString msg; + + // Test for incorrect values + if( (m_dummyPad->GetSize().x < m_dummyPad->GetDrillSize().x) || + (m_dummyPad->GetSize().y < m_dummyPad->GetDrillSize().y) ) + { + error_msgs.Add( _( "Incorrect value for pad drill: pad drill bigger than pad size" ) ); + } + + int padlayers_mask = m_dummyPad->GetLayerMask(); + if( ( padlayers_mask == 0 ) && ( m_dummyPad->GetAttribute() != PAD_HOLE_NOT_PLATED ) ) + error_msgs.Add( _( "Error: pad has no layer and is not a mechanical pad" ) ); + + padlayers_mask &= (LAYER_BACK | LAYER_FRONT); + if( padlayers_mask == 0 ) + { + if( m_dummyPad->GetDrillSize().x || m_dummyPad->GetDrillSize().y ) + { + msg = _( "Error: pad is not on a copper layer and has a hole" ); + if( m_dummyPad->GetAttribute() == PAD_HOLE_NOT_PLATED ) + { + msg += wxT("\n"); + msg += _( "For NPTH pad, set pad drill value to pad size value,\n\ +if you do not want this pad plotted in gerber files"); + } + error_msgs.Add( msg ); + } + } + + if( m_dummyPad->GetSize().x / 2 <= ABS( m_dummyPad->GetOffset().x ) || + m_dummyPad->GetSize().y / 2 <= ABS( m_dummyPad->GetOffset().y ) ) + { + error_msgs.Add( _( "Incorrect value for pad offset" ) ); + } + + if( error ) + { + error_msgs.Add( _( "Too large value for pad delta size" ) ); + } + + switch( m_dummyPad->GetAttribute() ) + { + case PAD_STANDARD : // Pad through hole, a hole is expected + if( m_dummyPad->GetDrillSize().x <= 0 ) + error_msgs.Add( _( "Incorrect value for pad drill (too small value)" ) ); + break; + + case PAD_SMD: // SMD and Connector pads (One external copper layer only) + case PAD_CONN: + if( (padlayers_mask & LAYER_BACK) && (padlayers_mask & LAYER_FRONT) ) + error_msgs.Add( _( "Error: only one copper layer allowed for this pad" ) ); + break; + + case PAD_HOLE_NOT_PLATED: // Not plated + break; + } + + if( error_msgs.GetCount() ) + { + HTML_MESSAGE_BOX dlg( this, _("Pad setup errors list" ) ); + dlg.ListSet( error_msgs ); + dlg.ShowModal(); + } + return error_msgs.GetCount() == 0; +} void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event ) /* Updates the different parameters for the component being edited. */ { + if( ! PadValuesOK() ) + return; + bool rastnestIsChanged = false; int isign = m_isFlipped ? -1 : 1; prevPosition = GetPosition(); prevSize = GetSize(); - bool success = TransfertDataToPad( m_dummyPad, true ); - if( !success ) // An error on parameters has occured - return; - - TransfertDataToPad( &m_Pad_Master, false ); + TransfertDataToPad( &m_Pad_Master ); if( m_CurrentPad ) // Set current Pad parameters { @@ -745,9 +817,7 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event ) } // Copy values from dialog to aPad parameters. -// If aPromptOnError is true, and an incorrect value is detected, -// user will be prompted for an error -bool DIALOG_PAD_PROPERTIES::TransfertDataToPad( D_PAD* aPad, bool aPromptOnError ) +bool DIALOG_PAD_PROPERTIES::TransfertDataToPad( D_PAD* aPad ) { long padLayerMask; int internalUnits = m_Parent->GetInternalUnits(); @@ -980,47 +1050,7 @@ bool DIALOG_PAD_PROPERTIES::TransfertDataToPad( D_PAD* aPad, bool aPromptOnError aPad->SetLayerMask( padLayerMask ); - // Test for incorrect values - if( aPromptOnError ) - { - if( (aPad->GetSize().x < aPad->GetDrillSize().x) || (aPad->GetSize().y < aPad->GetDrillSize().y) ) - { - DisplayError( NULL, _( "Incorrect value for pad drill: pad drill bigger than pad size" ) ); - return false; - } - - int padlayers_mask = padLayerMask & (LAYER_BACK | LAYER_FRONT); - if( padlayers_mask == 0 ) - { - if( aPad->GetDrillSize().x || aPad->GetDrillSize().y ) - { - msg = _( "Error: pad is not on a copper layer and has a hole" ); - if( aPad->GetAttribute() == PAD_HOLE_NOT_PLATED ) - { - msg += wxT("\n"); - msg += _( "For NPTH pad, set pad drill value to pad size value,\n\ -if you do not want this pad plotted in gerber files"); - } - DisplayError( NULL, msg ); - return false; - } - } - - if( aPad->GetSize().x / 2 <= ABS( aPad->GetOffset().x ) || - aPad->GetSize().y / 2 <= ABS( aPad->GetOffset().y ) ) - { - DisplayError( NULL, _( "Incorrect value for pad offset" ) ); - return false; - } - - if( error ) - { - DisplayError( NULL, _( "Too large value for pad delta size" ) ); - return false; - } - } - - return true; + return error; } diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 722503d919..02f196d276 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Feb 9 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -54,6 +54,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadType->SetSelection( 0 ); fgSizer5->Add( m_PadType, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_LeftBoxSizer->Add( fgSizer5, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxFlexGridSizer* fgSizer6; @@ -61,20 +62,6 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText45 = new wxStaticText( m_panel2, wxID_ANY, _("Shape:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText45->Wrap( -1 ); - fgSizer6->Add( m_staticText45, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - wxString m_PadShapeChoices[] = { _("Circular"), _("Oval"), _("Rectangular"), _("Trapezoidal") }; - int m_PadShapeNChoices = sizeof( m_PadShapeChoices ) / sizeof( wxString ); - m_PadShape = new wxChoice( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadShapeNChoices, m_PadShapeChoices, 0 ); - m_PadShape->SetSelection( 0 ); - fgSizer6->Add( m_PadShape, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_staticText46 = new wxStaticText( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText46->Wrap( -1 ); - fgSizer6->Add( m_staticText46, 0, wxALL, 5 ); - m_staticText4 = new wxStaticText( m_panel2, wxID_ANY, _("Position X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizer6->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); @@ -88,14 +75,27 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticText41 = new wxStaticText( m_panel2, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText41->Wrap( -1 ); - fgSizer6->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizer6->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_PadPosition_Y_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_PadPosition_Y_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer6->Add( m_PadPosition_Y_Ctrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_PadPosY_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosY_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadPosY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizer6->Add( m_PadPosY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + m_staticText45 = new wxStaticText( m_panel2, wxID_ANY, _("Shape:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText45->Wrap( -1 ); + fgSizer6->Add( m_staticText45, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_PadShapeChoices[] = { _("Circular"), _("Oval"), _("Rectangular"), _("Trapezoidal") }; + int m_PadShapeNChoices = sizeof( m_PadShapeChoices ) / sizeof( wxString ); + m_PadShape = new wxChoice( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadShapeNChoices, m_PadShapeChoices, 0 ); + m_PadShape->SetSelection( 0 ); + fgSizer6->Add( m_PadShape, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + + fgSizer6->Add( 0, 0, 0, wxEXPAND, 5 ); m_staticText12 = new wxStaticText( m_panel2, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); @@ -200,6 +200,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_trapDeltaDirChoice->SetSelection( 0 ); fgSizer6->Add( m_trapDeltaDirChoice, 0, wxEXPAND|wxALL, 5 ); + m_LeftBoxSizer->Add( fgSizer6, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxBoxSizer* bMiddleUpperSizer; @@ -207,13 +208,16 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_DrillShapeBoxSizer = new wxBoxSizer( wxVERTICAL ); + bMiddleUpperSizer->Add( m_DrillShapeBoxSizer, 0, wxBOTTOM, 5 ); wxBoxSizer* m_MiddleRightBoxSizer; m_MiddleRightBoxSizer = new wxBoxSizer( wxVERTICAL ); + bMiddleUpperSizer->Add( m_MiddleRightBoxSizer, 0, wxBOTTOM, 5 ); + m_LeftBoxSizer->Add( bMiddleUpperSizer, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizeModuleInfo; @@ -241,6 +245,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticModuleSideValue->Wrap( -1 ); fgSizer4->Add( m_staticModuleSideValue, 0, wxALL|wxEXPAND, 5 ); + sbSizeModuleInfo->Add( fgSizer4, 1, wxEXPAND, 5 ); m_staticTextWarningPadFlipped = new wxStaticText( m_panel2, wxID_ANY, _("Warning:\nThis pad is flipped on board.\nBack and front layers will be swapped."), wxDefaultPosition, wxDefaultSize, 0 ); @@ -249,8 +254,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind sbSizeModuleInfo->Add( m_staticTextWarningPadFlipped, 0, wxALIGN_CENTER_VERTICAL, 5 ); + m_LeftBoxSizer->Add( sbSizeModuleInfo, 0, wxEXPAND|wxBOTTOM, 5 ); + bGeneralSizer->Add( m_LeftBoxSizer, 0, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer10; @@ -300,8 +307,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadDrill_Y_Unit->Wrap( -1 ); fgSizerGeometry->Add( m_PadDrill_Y_Unit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + sbSizer2->Add( fgSizerGeometry, 1, wxEXPAND, 5 ); + bSizer10->Add( sbSizer2, 0, wxALL, 5 ); wxStaticBoxSizer* m_LayersSizer; @@ -320,6 +329,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_rbCopperLayersSel->SetSelection( 0 ); bSizer11->Add( m_rbCopperLayersSel, 1, wxALL, 5 ); + m_LayersSizer->Add( bSizer11, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerTechlayers; @@ -358,10 +368,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_PadLayerECO2 = new wxCheckBox( m_panel2, wxID_ANY, _("E.C.O.2 layer"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerTechlayers->Add( m_PadLayerECO2, 0, wxALL, 5 ); + m_LayersSizer->Add( sbSizerTechlayers, 0, wxALL|wxEXPAND, 5 ); + bSizer10->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 5 ); + bGeneralSizer->Add( bSizer10, 0, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer13x; @@ -372,8 +385,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind bSizer13x->Add( m_panelShowPad, 1, wxEXPAND|wxRIGHT|wxSHAPED|wxTOP, 5 ); + bGeneralSizer->Add( bSizer13x, 1, wxEXPAND, 5 ); + m_panel2->SetSizer( bGeneralSizer ); m_panel2->Layout(); bGeneralSizer->Fit( m_panel2 ); @@ -448,8 +463,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_SolderPasteRatioMarginUnits->Wrap( -1 ); fgClearancesGridSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + sbClearancesSizer->Add( fgClearancesGridSizer, 1, wxEXPAND, 5 ); + bSizer13->Add( sbClearancesSizer, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer7; @@ -496,8 +513,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_ThermalGapUnits->Wrap( -1 ); fgSizer41->Add( m_ThermalGapUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); + sbSizer7->Add( fgSizer41, 1, wxEXPAND, 5 ); + bSizer13->Add( sbSizer7, 1, wxEXPAND|wxALL, 5 ); m_staticTextWarning = new wxStaticText( m_localSettingsPanel, wxID_ANY, _("Set fields to 0 to use parent or global values"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -506,11 +525,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind bSizer13->Add( m_staticTextWarning, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); + bSizer14->Add( bSizer13, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizer14->Add( 0, 0, 1, wxEXPAND, 5 ); + m_localSettingsPanel->SetSizer( bSizer14 ); m_localSettingsPanel->Layout(); bSizer14->Fit( m_localSettingsPanel ); @@ -524,8 +545,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); + m_MainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + this->SetSizer( m_MainSizer ); this->Layout(); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index 7cd6b6ab16..df88164010 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -1,11 +1,12 @@ - + C++ 1 source_name + 0 0 res UTF-8 @@ -19,6 +20,7 @@ . 1 + 1 1 1 0 @@ -27,8 +29,11 @@ 1 1 1 + 0 + + @@ -51,7 +56,6 @@ 0 0 wxID_DIALOG_EDIT_PAD - 0 @@ -65,9 +69,7 @@ 1 - Resizable - 1 857,618 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER @@ -132,7 +134,10 @@ 1 1 1 + + + @@ -153,7 +158,6 @@ 0 0 wxID_ANY - 0 @@ -168,9 +172,7 @@ protected 1 - Resizable - 1 @@ -218,7 +220,10 @@ 1 1 1 + + + @@ -238,7 +243,6 @@ 0 0 wxID_ANY - 0 @@ -253,9 +257,7 @@ protected 1 - Resizable - 1 @@ -300,7 +302,7 @@ 5 wxALL|wxEXPAND 0 - + m_LeftBoxSizer wxVERTICAL @@ -330,7 +332,10 @@ 1 1 1 + + + @@ -351,7 +356,6 @@ 0 wxID_ANY Pad number: - 0 @@ -366,9 +370,7 @@ protected 1 - Resizable - 1 @@ -417,7 +419,10 @@ 1 1 1 + + + @@ -437,7 +442,6 @@ 0 0 wxID_PADNUMCTRL - 0 @@ -453,9 +457,7 @@ protected 1 - Resizable - 1 @@ -508,7 +510,10 @@ 1 1 1 + + + @@ -529,7 +534,6 @@ 0 wxID_ANY Net name: - 0 @@ -544,9 +548,7 @@ protected 1 - Resizable - 1 @@ -595,7 +597,10 @@ 1 1 1 + + + @@ -615,7 +620,6 @@ 0 0 wxID_PADNETNAMECTRL - 0 @@ -631,9 +635,7 @@ protected 1 - Resizable - 1 @@ -686,7 +688,10 @@ 1 1 1 + + + @@ -707,7 +712,6 @@ 0 wxID_ANY Pad type: - 0 @@ -722,9 +726,7 @@ protected 1 - Resizable - 1 @@ -773,7 +775,10 @@ 1 1 1 + + + @@ -794,7 +799,6 @@ 0 0 wxID_ANY - 0 @@ -809,12 +813,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -853,11 +856,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 3 wxBOTH @@ -871,14 +874,17 @@ 0 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 0 1 1 1 1 + + + @@ -898,8 +904,7 @@ 0 0 wxID_ANY - Shape: - + Position X: 0 @@ -907,16 +912,457 @@ 0 1 - m_staticText45 + m_staticText4 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_PadPosition_X_Ctrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Inch + + 0 + + + 0 + + 1 + m_PadPosX_Unit + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Position Y: + + 0 + + + 0 + + 1 + m_staticText41 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_PadPosition_Y_Ctrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Inch + + 0 + + + 0 + + 1 + m_PadPosY_Unit 1 protected 1 - Resizable - 1 @@ -960,12 +1406,102 @@ 5 wxALL|wxALIGN_CENTER_VERTICAL 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Shape: + + 0 + + + 0 + + 1 + m_staticText45 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 1 1 1 1 + + + @@ -986,7 +1522,6 @@ 0 0 wxID_ANY - 0 @@ -1001,12 +1536,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -1043,621 +1577,14 @@ - + 5 - wxALL + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - - 0 - - - 0 - - 1 - m_staticText46 - 1 - - + + 0 protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Position X: - - - 0 - - - 0 - - 1 - m_staticText4 - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - 0 - - 0 - - 1 - m_PadPosition_X_Ctrl - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Inch - - - 0 - - - 0 - - 1 - m_PadPosX_Unit - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Position Y: - - - 0 - - - 0 - - 1 - m_staticText41 - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - 0 - - 0 - - 1 - m_PadPosition_Y_Ctrl - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Inch - - - 0 - - - 0 - - 1 - m_PadPosY_Unit - 1 - - - protected - 1 - - - Resizable - - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - + 0 @@ -1669,7 +1596,10 @@ 1 1 1 + + + @@ -1690,7 +1620,6 @@ 0 wxID_ANY Size X: - 0 @@ -1705,9 +1634,7 @@ protected 1 - Resizable - 1 @@ -1756,7 +1683,10 @@ 1 1 1 + + + @@ -1776,7 +1706,6 @@ 0 0 wxID_ANY - 0 @@ -1792,9 +1721,7 @@ protected 1 - Resizable - 1 @@ -1847,7 +1774,10 @@ 1 1 1 + + + @@ -1868,7 +1798,6 @@ 0 wxID_ANY Inch - 0 @@ -1883,9 +1812,7 @@ protected 1 - Resizable - 1 @@ -1934,7 +1861,10 @@ 1 1 1 + + + @@ -1955,7 +1885,6 @@ 0 wxID_ANY Size Y: - 0 @@ -1970,9 +1899,7 @@ protected 1 - Resizable - 1 @@ -2021,7 +1948,10 @@ 1 1 1 + + + @@ -2041,7 +1971,6 @@ 0 0 wxID_ANY - 0 @@ -2057,9 +1986,7 @@ protected 1 - Resizable - 1 @@ -2112,7 +2039,10 @@ 1 1 1 + + + @@ -2133,7 +2063,6 @@ 0 wxID_ANY Inch - 0 @@ -2148,9 +2077,7 @@ protected 1 - Resizable - 1 @@ -2199,7 +2126,10 @@ 1 1 1 + + + @@ -2220,7 +2150,6 @@ 0 wxID_ANY Orientation: - 0 @@ -2235,9 +2164,7 @@ protected 1 - Resizable - 1 @@ -2286,7 +2213,10 @@ 1 1 1 + + + @@ -2307,7 +2237,6 @@ 0 0 wxID_ANY - 0 @@ -2322,12 +2251,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -2373,7 +2301,10 @@ 1 1 1 + + + @@ -2394,7 +2325,6 @@ 0 wxID_ANY deg - 0 @@ -2409,9 +2339,7 @@ protected 1 - Resizable - 1 @@ -2460,7 +2388,10 @@ 1 1 1 + + + @@ -2481,7 +2412,6 @@ 0 wxID_ANY - 0 @@ -2496,9 +2426,7 @@ protected 1 - Resizable - 1 @@ -2547,7 +2475,10 @@ 1 1 1 + + + @@ -2567,7 +2498,6 @@ 0 0 wxID_ANY - 0 @@ -2583,9 +2513,7 @@ protected 1 - Resizable - 1 @@ -2638,7 +2566,10 @@ 1 1 1 + + + @@ -2659,7 +2590,6 @@ 0 wxID_ANY 0.1 deg - 0 @@ -2674,9 +2604,7 @@ protected 1 - Resizable - 1 @@ -2725,7 +2653,10 @@ 1 1 1 + + + @@ -2746,7 +2677,6 @@ 0 wxID_ANY Shape offset X: - 0 @@ -2761,9 +2691,7 @@ protected 1 - Resizable - 1 @@ -2812,7 +2740,10 @@ 1 1 1 + + + @@ -2832,7 +2763,6 @@ 0 0 wxID_ANY - 0 @@ -2848,9 +2778,7 @@ protected 1 - Resizable - 1 @@ -2903,7 +2831,10 @@ 1 1 1 + + + @@ -2924,7 +2855,6 @@ 0 wxID_ANY Inch - 0 @@ -2939,9 +2869,7 @@ protected 1 - Resizable - 1 @@ -2990,7 +2918,10 @@ 1 1 1 + + + @@ -3011,7 +2942,6 @@ 0 wxID_ANY Shape offset Y: - 0 @@ -3026,9 +2956,7 @@ protected 1 - Resizable - 1 @@ -3077,7 +3005,10 @@ 1 1 1 + + + @@ -3097,7 +3028,6 @@ 0 0 wxID_ANY - 0 @@ -3113,9 +3043,7 @@ protected 1 - Resizable - 1 @@ -3168,7 +3096,10 @@ 1 1 1 + + + @@ -3189,7 +3120,6 @@ 0 wxID_ANY Inch - 0 @@ -3204,9 +3134,7 @@ protected 1 - Resizable - 1 @@ -3255,7 +3183,10 @@ 1 1 1 + + + @@ -3276,7 +3207,6 @@ 0 wxID_ANY Die length: - 0 @@ -3291,9 +3221,7 @@ protected 1 - Resizable - 1 @@ -3342,7 +3270,10 @@ 1 1 1 + + + @@ -3362,7 +3293,6 @@ 0 0 wxID_ANY - 0 @@ -3378,9 +3308,7 @@ protected 1 - Resizable - 1 @@ -3433,7 +3361,10 @@ 1 1 1 + + + @@ -3454,7 +3385,6 @@ 0 wxID_ANY Inch - 0 @@ -3469,9 +3399,7 @@ protected 1 - Resizable - 1 @@ -3520,7 +3448,10 @@ 1 1 1 + + + @@ -3541,7 +3472,6 @@ 0 wxID_ANY Trap. delta dim: - 0 @@ -3556,9 +3486,7 @@ protected 1 - Resizable - 1 @@ -3607,7 +3535,10 @@ 1 1 1 + + + @@ -3627,7 +3558,6 @@ 0 0 wxID_ANY - 0 @@ -3643,9 +3573,7 @@ protected 1 - Resizable - 1 @@ -3698,7 +3626,10 @@ 1 1 1 + + + @@ -3719,7 +3650,6 @@ 0 wxID_ANY Inch - 0 @@ -3734,9 +3664,7 @@ protected 1 - Resizable - 1 @@ -3785,7 +3713,10 @@ 1 1 1 + + + @@ -3806,7 +3737,6 @@ 0 wxID_ANY Trap. direction: - 0 @@ -3821,9 +3751,7 @@ protected 1 - Resizable - 1 @@ -3872,7 +3800,10 @@ 1 1 1 + + + @@ -3893,7 +3824,6 @@ 0 0 wxID_ANY - 0 @@ -3908,12 +3838,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -4022,7 +3951,10 @@ 1 1 1 + + + @@ -4043,7 +3975,6 @@ 0 wxID_ANY Rotation: - 0 @@ -4058,9 +3989,7 @@ protected 1 - Resizable - 1 @@ -4109,7 +4038,10 @@ 1 1 1 + + + @@ -4130,7 +4062,6 @@ 0 wxID_ANY 0 - 0 @@ -4145,9 +4076,7 @@ protected 1 - Resizable - 1 @@ -4196,7 +4125,10 @@ 1 1 1 + + + @@ -4217,7 +4149,6 @@ 0 wxID_ANY Board side: - 0 @@ -4232,9 +4163,7 @@ protected 1 - Resizable - 1 @@ -4283,7 +4212,10 @@ 1 1 1 + + + @@ -4304,7 +4236,6 @@ 0 wxID_ANY Front side - 0 @@ -4319,9 +4250,7 @@ protected 1 - Resizable - 1 @@ -4372,7 +4301,10 @@ 1 1 1 + + + @@ -4393,7 +4325,6 @@ 0 wxID_ANY Warning: This pad is flipped on board. Back and front layers will be swapped. - 0 @@ -4408,9 +4339,7 @@ protected 1 - Resizable - 1 @@ -4458,7 +4387,7 @@ 5 wxALL|wxEXPAND 0 - + bSizer10 wxVERTICAL @@ -4500,7 +4429,10 @@ 1 1 1 + + + @@ -4521,7 +4453,6 @@ 0 wxID_ANY Shape: - 0 @@ -4536,9 +4467,7 @@ protected 1 - Resizable - 1 @@ -4587,7 +4516,10 @@ 1 1 1 + + + @@ -4608,7 +4540,6 @@ 0 0 wxID_ANY - 0 @@ -4623,12 +4554,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -4674,7 +4604,10 @@ 1 1 1 + + + @@ -4695,7 +4628,6 @@ 0 wxID_ANY - 0 @@ -4710,9 +4642,7 @@ protected 1 - Resizable - 1 @@ -4761,7 +4691,10 @@ 1 1 1 + + + @@ -4782,7 +4715,6 @@ 0 wxID_ANY Size X: - 0 @@ -4797,9 +4729,7 @@ protected 1 - Resizable - 1 @@ -4848,7 +4778,10 @@ 1 1 1 + + + @@ -4868,7 +4801,6 @@ 0 0 wxID_ANY - 0 @@ -4884,9 +4816,7 @@ protected 1 - Resizable - 1 @@ -4939,7 +4869,10 @@ 1 1 1 + + + @@ -4960,7 +4893,6 @@ 0 wxID_ANY Inch - 0 @@ -4975,9 +4907,7 @@ protected 1 - Resizable - 1 @@ -5026,7 +4956,10 @@ 1 1 1 + + + @@ -5047,7 +4980,6 @@ 0 wxID_ANY Size Y: - 0 @@ -5062,9 +4994,7 @@ protected 1 - Resizable - 1 @@ -5113,7 +5043,10 @@ 1 1 1 + + + @@ -5133,7 +5066,6 @@ 0 0 wxID_ANY - 0 @@ -5149,9 +5081,7 @@ protected 1 - Resizable - 1 @@ -5204,7 +5134,10 @@ 1 1 1 + + + @@ -5225,7 +5158,6 @@ 0 wxID_ANY Inch - 0 @@ -5240,9 +5172,7 @@ protected 1 - Resizable - 1 @@ -5316,7 +5246,10 @@ 1 1 1 + + + @@ -5337,7 +5270,6 @@ 0 wxID_ANY Copper: - 0 @@ -5352,9 +5284,7 @@ protected 1 - Resizable - 1 @@ -5403,7 +5333,10 @@ 1 1 1 + + + @@ -5424,7 +5357,6 @@ 0 0 wxID_ANY - 0 @@ -5439,12 +5371,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -5504,7 +5435,10 @@ 1 1 1 + + + @@ -5526,7 +5460,6 @@ 0 wxID_ANY Adhesive Cmp - 0 @@ -5541,9 +5474,7 @@ protected 1 - Resizable - 1 @@ -5592,7 +5523,10 @@ 1 1 1 + + + @@ -5614,7 +5548,6 @@ 0 wxID_ANY Adhesive Copper - 0 @@ -5629,9 +5562,7 @@ protected 1 - Resizable - 1 @@ -5680,7 +5611,10 @@ 1 1 1 + + + @@ -5702,7 +5636,6 @@ 0 wxID_ANY Solder paste Cmp - 0 @@ -5717,9 +5650,7 @@ protected 1 - Resizable - 1 @@ -5768,7 +5699,10 @@ 1 1 1 + + + @@ -5790,7 +5724,6 @@ 0 wxID_ANY Solder paste Copper - 0 @@ -5805,9 +5738,7 @@ protected 1 - Resizable - 1 @@ -5856,7 +5787,10 @@ 1 1 1 + + + @@ -5878,7 +5812,6 @@ 0 wxID_ANY Silkscreen Cmp - 0 @@ -5893,9 +5826,7 @@ protected 1 - Resizable - 1 @@ -5944,7 +5875,10 @@ 1 1 1 + + + @@ -5966,7 +5900,6 @@ 0 wxID_ANY Silkscreen Copper - 0 @@ -5981,9 +5914,7 @@ protected 1 - Resizable - 1 @@ -6032,7 +5963,10 @@ 1 1 1 + + + @@ -6054,7 +5988,6 @@ 0 wxID_ANY Solder mask Cmp - 0 @@ -6069,9 +6002,7 @@ protected 1 - Resizable - 1 @@ -6120,7 +6051,10 @@ 1 1 1 + + + @@ -6142,7 +6076,6 @@ 0 wxID_ANY Solder mask Copper - 0 @@ -6157,9 +6090,7 @@ protected 1 - Resizable - 1 @@ -6208,7 +6139,10 @@ 1 1 1 + + + @@ -6230,7 +6164,6 @@ 0 wxID_ANY Draft layer - 0 @@ -6245,9 +6178,7 @@ protected 1 - Resizable - 1 @@ -6296,7 +6227,10 @@ 1 1 1 + + + @@ -6318,7 +6252,6 @@ 0 wxID_ANY E.C.O.1 layer - 0 @@ -6333,9 +6266,7 @@ protected 1 - Resizable - 1 @@ -6384,7 +6315,10 @@ 1 1 1 + + + @@ -6406,7 +6340,6 @@ 0 wxID_ANY E.C.O.2 layer - 0 @@ -6421,9 +6354,7 @@ protected 1 - Resizable - 1 @@ -6487,7 +6418,10 @@ 1 1 1 + + + 0,0,0 @@ -6507,7 +6441,6 @@ 0 0 wxID_ANY - 0 @@ -6522,9 +6455,7 @@ protected 1 - Resizable - 1 200,200 @@ -6576,7 +6507,10 @@ 1 1 1 + + + @@ -6596,7 +6530,6 @@ 0 0 wxID_ANY - 0 @@ -6611,9 +6544,7 @@ protected 1 - Resizable - 1 @@ -6710,7 +6641,10 @@ 1 1 1 + + + @@ -6731,7 +6665,6 @@ 0 wxID_ANY Net pad clearance: - 0 @@ -6746,9 +6679,7 @@ protected 1 - Resizable - 1 @@ -6797,7 +6728,10 @@ 1 1 1 + + + @@ -6817,7 +6751,6 @@ 0 0 wxID_ANY - 0 @@ -6833,9 +6766,7 @@ protected 1 - Resizable - 1 @@ -6888,7 +6819,10 @@ 1 1 1 + + + @@ -6909,7 +6843,6 @@ 0 wxID_ANY Inch - 0 @@ -6924,9 +6857,7 @@ protected 1 - Resizable - 1 @@ -6975,7 +6906,10 @@ 1 1 1 + + + @@ -6996,7 +6930,6 @@ 0 wxID_ANY Solder mask clearance: - 0 @@ -7011,9 +6944,7 @@ protected 1 - Resizable - 1 @@ -7062,7 +6993,10 @@ 1 1 1 + + + @@ -7082,7 +7016,6 @@ 0 0 wxID_ANY - 0 @@ -7098,9 +7031,7 @@ protected 1 - Resizable - 1 @@ -7153,7 +7084,10 @@ 1 1 1 + + + @@ -7174,7 +7108,6 @@ 0 wxID_ANY Inch - 0 @@ -7189,9 +7122,7 @@ protected 1 - Resizable - 1 @@ -7240,7 +7171,10 @@ 1 1 1 + + + @@ -7261,7 +7195,6 @@ 0 wxID_ANY Solder paste clearance: - 0 @@ -7276,9 +7209,7 @@ protected 1 - Resizable - 1 @@ -7327,7 +7258,10 @@ 1 1 1 + + + @@ -7347,7 +7281,6 @@ 0 0 wxID_ANY - 0 @@ -7363,9 +7296,7 @@ protected 1 - Resizable - 1 @@ -7418,7 +7349,10 @@ 1 1 1 + + + @@ -7439,7 +7373,6 @@ 0 wxID_ANY Inch - 0 @@ -7454,9 +7387,7 @@ protected 1 - Resizable - 1 @@ -7505,7 +7436,10 @@ 1 1 1 + + + @@ -7526,7 +7460,6 @@ 0 wxID_ANY Solder mask ratio clearance: - 0 @@ -7541,9 +7474,7 @@ protected 1 - Resizable - 1 @@ -7592,7 +7523,10 @@ 1 1 1 + + + @@ -7612,7 +7546,6 @@ 0 0 wxID_ANY - 0 @@ -7628,9 +7561,7 @@ protected 1 - Resizable - 1 @@ -7683,7 +7614,10 @@ 1 1 1 + + + @@ -7704,7 +7638,6 @@ 0 wxID_ANY % - 0 @@ -7719,9 +7652,7 @@ protected 1 - Resizable - 1 @@ -7802,7 +7733,10 @@ 1 1 1 + + + @@ -7823,7 +7757,6 @@ 0 wxID_ANY Pad connection: - 0 @@ -7838,9 +7771,7 @@ protected 1 - Resizable - 1 @@ -7889,7 +7820,10 @@ 1 1 1 + + + @@ -7910,7 +7844,6 @@ 0 0 wxID_ANY - 0 @@ -7925,12 +7858,11 @@ protected 1 - Resizable - 0 1 + 0 @@ -7976,7 +7908,10 @@ 1 1 1 + + + @@ -7997,7 +7932,6 @@ 0 wxID_ANY - 0 @@ -8012,9 +7946,7 @@ protected 1 - Resizable - 1 @@ -8063,7 +7995,10 @@ 1 1 1 + + + @@ -8084,7 +8019,6 @@ 0 wxID_ANY Thermal relief width: - 0 @@ -8099,9 +8033,7 @@ protected 1 - Resizable - 1 @@ -8150,7 +8082,10 @@ 1 1 1 + + + @@ -8170,7 +8105,6 @@ 0 0 wxID_ANY - 0 @@ -8186,9 +8120,7 @@ protected 1 - Resizable - 1 @@ -8241,7 +8173,10 @@ 1 1 1 + + + @@ -8262,7 +8197,6 @@ 0 wxID_ANY Inch - 0 @@ -8277,9 +8211,7 @@ protected 1 - Resizable - 1 @@ -8328,7 +8260,10 @@ 1 1 1 + + + @@ -8349,7 +8284,6 @@ 0 wxID_ANY Thermal relief gap: - 0 @@ -8364,9 +8298,7 @@ protected 1 - Resizable - 1 @@ -8415,7 +8347,10 @@ 1 1 1 + + + @@ -8435,7 +8370,6 @@ 0 0 wxID_ANY - 0 @@ -8451,9 +8385,7 @@ protected 1 - Resizable - 1 @@ -8506,7 +8438,10 @@ 1 1 1 + + + @@ -8527,7 +8462,6 @@ 0 wxID_ANY Inch - 0 @@ -8542,9 +8476,7 @@ protected 1 - Resizable - 1 @@ -8597,7 +8529,10 @@ 1 1 1 + + + @@ -8618,7 +8553,6 @@ 0 wxID_ANY Set fields to 0 to use parent or global values - 0 @@ -8633,9 +8567,7 @@ protected 1 - Resizable - 1 diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h index bcfaa069fc..60993c6e97 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.h +++ b/pcbnew/dialogs/dialog_pad_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 30 2011) +// C++ code generated with wxFormBuilder (version Feb 9 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -44,7 +44,7 @@ class DIALOG_PAD_PROPERTIES_BASE : public wxDialog { wxID_DIALOG_EDIT_PAD = 1000, wxID_PADNUMCTRL, - wxID_PADNETNAMECTRL, + wxID_PADNETNAMECTRL }; wxNotebook* m_notebook1; @@ -55,15 +55,14 @@ class DIALOG_PAD_PROPERTIES_BASE : public wxDialog wxTextCtrl* m_PadNetNameCtrl; wxStaticText* m_staticText44; wxChoice* m_PadType; - wxStaticText* m_staticText45; - wxChoice* m_PadShape; - wxStaticText* m_staticText46; wxStaticText* m_staticText4; wxTextCtrl* m_PadPosition_X_Ctrl; wxStaticText* m_PadPosX_Unit; wxStaticText* m_staticText41; wxTextCtrl* m_PadPosition_Y_Ctrl; wxStaticText* m_PadPosY_Unit; + wxStaticText* m_staticText45; + wxChoice* m_PadShape; wxStaticText* m_staticText12; wxTextCtrl* m_ShapeSize_X_Ctrl; wxStaticText* m_PadShapeSizeX_Unit;