diff --git a/pcb_calculator/calculator_panels/panel_cable_size_base.cpp b/pcb_calculator/calculator_panels/panel_cable_size_base.cpp index d035a97030..48fa4d41d3 100644 --- a/pcb_calculator/calculator_panels/panel_cable_size_base.cpp +++ b/pcb_calculator/calculator_panels/panel_cable_size_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -33,34 +33,34 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextSize = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Standard Size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSize->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextSize, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextSize, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxArrayString m_sizeChoiceChoices; m_sizeChoice = new wxChoice( sbSizerLeft->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_sizeChoiceChoices, 0 ); m_sizeChoice->SetSelection( 0 ); - fgSizerLeft->Add( m_sizeChoice, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerLeft->Add( m_sizeChoice, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizerLeft->Add( 0, 0, 1, wxEXPAND, 5 ); m_staticTextDiameter = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Diameter:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDiameter->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextDiameter, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextDiameter, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_diameterCtrl = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLeft->Add( m_diameterCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerLeft->Add( m_diameterCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_diameterUnitChoices; m_diameterUnit = new UNIT_SELECTOR_LEN( sbSizerLeft->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_diameterUnitChoices, 0 ); m_diameterUnit->SetSelection( 0 ); - fgSizerLeft->Add( m_diameterUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizerLeft->Add( m_diameterUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticTextArea = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Area:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextArea, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextArea, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_areaCtrl = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLeft->Add( m_areaCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerLeft->Add( m_areaCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_stUnitmmSq = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("mm^2"), wxDefaultPosition, wxDefaultSize, 0 ); m_stUnitmmSq->Wrap( -1 ); @@ -70,7 +70,7 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextResitivity->Wrap( -1 ); m_staticTextResitivity->SetToolTip( _("Specific resistance in Ohm*m at 20 deg C") ); - fgSizerLeft->Add( m_staticTextResitivity, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextResitivity, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); wxBoxSizer* bSizerResistivity; bSizerResistivity = new wxBoxSizer( wxHORIZONTAL ); @@ -78,10 +78,10 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_textCtrlConductorResistivity = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlConductorResistivity->SetMinSize( wxSize( 100,-1 ) ); - bSizerResistivity->Add( m_textCtrlConductorResistivity, 1, wxTOP|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerResistivity->Add( m_textCtrlConductorResistivity, 1, wxEXPAND|wxLEFT|wxTOP, 5 ); m_button_ResistivityConductor = new wxButton( sbSizerLeft->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizerResistivity->Add( m_button_ResistivityConductor, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + bSizerResistivity->Add( m_button_ResistivityConductor, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); fgSizerLeft->Add( bSizerResistivity, 0, wxEXPAND, 5 ); @@ -94,16 +94,16 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextTempCoeff->Wrap( -1 ); m_staticTextTempCoeff->SetToolTip( _("Thermal coefficient at 20 deg C") ); - fgSizerLeft->Add( m_staticTextTempCoeff, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextTempCoeff, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); wxBoxSizer* bSizerTempCoeff; bSizerTempCoeff = new wxBoxSizer( wxHORIZONTAL ); m_textCtrlConductorThermCoef = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerTempCoeff->Add( m_textCtrlConductorThermCoef, 1, wxTOP|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizerTempCoeff->Add( m_textCtrlConductorThermCoef, 1, wxEXPAND|wxLEFT|wxTOP, 5 ); m_button_Temp_Coef_Conductor = new wxButton( sbSizerLeft->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizerTempCoeff->Add( m_button_Temp_Coef_Conductor, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + bSizerTempCoeff->Add( m_button_Temp_Coef_Conductor, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); fgSizerLeft->Add( bSizerTempCoeff, 0, wxEXPAND, 5 ); @@ -113,34 +113,34 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextLinRes = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Linear resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLinRes->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextLinRes, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextLinRes, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_linResistanceCtrl = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLeft->Add( m_linResistanceCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerLeft->Add( m_linResistanceCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_linResistanceUnitChoices; m_linResistanceUnit = new UNIT_SELECTOR_LINEAR_RESISTANCE( sbSizerLeft->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_linResistanceUnitChoices, 0 ); m_linResistanceUnit->SetSelection( 0 ); - fgSizerLeft->Add( m_linResistanceUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizerLeft->Add( m_linResistanceUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticTextSkin = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Frequency for 100% skin depth:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSkin->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextSkin, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextSkin, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_frequencyCtrl = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLeft->Add( m_frequencyCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerLeft->Add( m_frequencyCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_frequencyUnitChoices; m_frequencyUnit = new UNIT_SELECTOR_FREQUENCY( sbSizerLeft->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_frequencyUnitChoices, 0 ); m_frequencyUnit->SetSelection( 0 ); - fgSizerLeft->Add( m_frequencyUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizerLeft->Add( m_frequencyUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticTextAmpacity = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Ampacity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAmpacity->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextAmpacity, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerLeft->Add( m_staticTextAmpacity, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_AmpacityCtrl = new wxTextCtrl( sbSizerLeft->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerLeft->Add( m_AmpacityCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerLeft->Add( m_AmpacityCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticText16421 = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16421->Wrap( -1 ); @@ -148,17 +148,17 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextDensity = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("Current density"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDensity->Wrap( -1 ); - fgSizerLeft->Add( m_staticTextDensity, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerLeft->Add( m_staticTextDensity, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_slCurrentDensity = new wxSlider( sbSizerLeft->GetStaticBox(), wxID_ANY, 3, 3, 12, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS|wxSL_VALUE_LABEL ); - fgSizerLeft->Add( m_slCurrentDensity, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + fgSizerLeft->Add( m_slCurrentDensity, 0, wxEXPAND|wxRIGHT|wxTOP, 5 ); m_stUnitAmp_mmSq = new wxStaticText( sbSizerLeft->GetStaticBox(), wxID_ANY, _("A/mm^2"), wxDefaultPosition, wxDefaultSize, 0 ); m_stUnitAmp_mmSq->Wrap( -1 ); - fgSizerLeft->Add( m_stUnitAmp_mmSq, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerLeft->Add( m_stUnitAmp_mmSq, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); - sbSizerLeft->Add( fgSizerLeft, 0, wxEXPAND, 5 ); + sbSizerLeft->Add( fgSizerLeft, 0, wxALL|wxEXPAND, 5 ); bSizer4->Add( sbSizerLeft, 0, wxALL|wxEXPAND, 5 ); @@ -176,12 +176,12 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextCableTemp->Wrap( -1 ); m_staticTextCableTemp->SetToolTip( _("Off-Load max conductor temp. Reference: 20 deg C") ); - fgSizerRight->Add( m_staticTextCableTemp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerRight->Add( m_staticTextCableTemp, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_conductorTempCtrl = new wxTextCtrl( sbSizerRight->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_conductorTempCtrl->SetMinSize( wxSize( 120,-1 ) ); - fgSizerRight->Add( m_conductorTempCtrl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerRight->Add( m_conductorTempCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_stUnitDegC = new wxStaticText( sbSizerRight->GetStaticBox(), wxID_ANY, _("deg C"), wxDefaultPosition, wxDefaultSize, 0 ); m_stUnitDegC->Wrap( -1 ); @@ -189,10 +189,10 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextCurrent = new wxStaticText( sbSizerRight->GetStaticBox(), wxID_ANY, _("Current:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCurrent->Wrap( -1 ); - fgSizerRight->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerRight->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_currentCtrl = new wxTextCtrl( sbSizerRight->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRight->Add( m_currentCtrl, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerRight->Add( m_currentCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticText = new wxStaticText( sbSizerRight->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText->Wrap( -1 ); @@ -202,10 +202,10 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextLen->Wrap( -1 ); m_staticTextLen->SetToolTip( _("Length includes the return path") ); - fgSizerRight->Add( m_staticTextLen, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerRight->Add( m_staticTextLen, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_lengthCtrl = new wxTextCtrl( sbSizerRight->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRight->Add( m_lengthCtrl, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerRight->Add( m_lengthCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_lengthUnitChoices; m_lengthUnit = new UNIT_SELECTOR_LEN_CABLE( sbSizerRight->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_lengthUnitChoices, 0 ); @@ -216,10 +216,10 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextResDC->Wrap( -1 ); m_staticTextResDC->SetToolTip( _("DC Resistance of the conductor") ); - fgSizerRight->Add( m_staticTextResDC, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerRight->Add( m_staticTextResDC, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_resistanceDcCtrl = new wxTextCtrl( sbSizerRight->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRight->Add( m_resistanceDcCtrl, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerRight->Add( m_resistanceDcCtrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_stUnitOhm = new wxStaticText( sbSizerRight->GetStaticBox(), wxID_ANY, _("ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_stUnitOhm->Wrap( -1 ); @@ -227,30 +227,30 @@ PANEL_CABLE_SIZE_BASE::PANEL_CABLE_SIZE_BASE( wxWindow* parent, wxWindowID id, c m_staticTextDrop = new wxStaticText( sbSizerRight->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDrop->Wrap( -1 ); - fgSizerRight->Add( m_staticTextDrop, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerRight->Add( m_staticTextDrop, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_vDropCtrl = new wxTextCtrl( sbSizerRight->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRight->Add( m_vDropCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerRight->Add( m_vDropCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_vDropUnitChoices; m_vDropUnit = new UNIT_SELECTOR_VOLTAGE( sbSizerRight->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_vDropUnitChoices, 0 ); m_vDropUnit->SetSelection( 0 ); - fgSizerRight->Add( m_vDropUnit, 0, wxTOP|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerRight->Add( m_vDropUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticTextPower = new wxStaticText( sbSizerRight->GetStaticBox(), wxID_ANY, _("Dissipated power:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPower->Wrap( -1 ); - fgSizerRight->Add( m_staticTextPower, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerRight->Add( m_staticTextPower, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 ); m_powerCtrl = new wxTextCtrl( sbSizerRight->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRight->Add( m_powerCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerRight->Add( m_powerCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_powerUnitChoices; m_powerUnit = new UNIT_SELECTOR_POWER( sbSizerRight->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_powerUnitChoices, 0 ); m_powerUnit->SetSelection( 0 ); - fgSizerRight->Add( m_powerUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizerRight->Add( m_powerUnit, 0, wxEXPAND|wxTOP, 5 ); - sbSizerRight->Add( fgSizerRight, 1, 0, 5 ); + sbSizerRight->Add( fgSizerRight, 1, wxALL, 5 ); bSizer4->Add( sbSizerRight, 1, wxALL|wxEXPAND, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_cable_size_base.fbp b/pcb_calculator/calculator_panels/panel_cable_size_base.fbp index af4c91ffad..2cbc1e9117 100644 --- a/pcb_calculator/calculator_panels/panel_cable_size_base.fbp +++ b/pcb_calculator/calculator_panels/panel_cable_size_base.fbp @@ -35,7 +35,6 @@ 1 - 0 1 impl_virtual @@ -80,7 +79,7 @@ 5 wxALL|wxEXPAND 0 - + wxID_ANY Wire properties @@ -88,11 +87,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND + wxALL|wxEXPAND 0 - + 3 wxBOTH 1 @@ -106,7 +105,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -129,7 +128,6 @@ Dock 0 Left - 0 1 1 @@ -168,7 +166,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -192,7 +190,6 @@ Dock 0 Left - 0 1 1 @@ -244,7 +241,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -267,7 +264,6 @@ Dock 0 Left - 0 1 1 @@ -306,7 +302,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -329,7 +325,6 @@ Dock 0 Left - 0 1 1 @@ -372,7 +367,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -396,7 +391,6 @@ Dock 0 Left - 0 1 1 @@ -438,7 +432,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -461,7 +455,6 @@ Dock 0 Left - 0 1 1 @@ -500,7 +493,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -523,7 +516,6 @@ Dock 0 Left - 0 1 1 @@ -589,7 +581,6 @@ Dock 0 Left - 0 1 1 @@ -626,11 +617,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -651,7 +642,6 @@ Dock 0 Left - 0 1 1 @@ -688,18 +678,18 @@ -1 - + 5 wxEXPAND 0 - + bSizerResistivity wxHORIZONTAL none 5 - wxTOP|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxTOP 1 1 @@ -722,7 +712,6 @@ Dock 0 Left - 0 1 1 @@ -765,7 +754,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -793,7 +782,6 @@ Dock 0 Left - 0 1 1 @@ -840,11 +828,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxTOP 0 - + 1 1 1 @@ -865,7 +853,6 @@ Dock 0 Left - 0 1 1 @@ -902,11 +889,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -927,7 +914,6 @@ Dock 0 Left - 0 1 1 @@ -964,20 +950,20 @@ -1 - + 5 wxEXPAND 0 - + bSizerTempCoeff wxHORIZONTAL none - + 5 - wxTOP|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxTOP 1 - + 1 1 1 @@ -998,7 +984,6 @@ Dock 0 Left - 0 1 1 @@ -1039,11 +1024,11 @@ OnConductorThermCoefChange - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -1069,7 +1054,6 @@ Dock 0 Left - 0 1 1 @@ -1116,11 +1100,11 @@ - + 5 wxEXPAND 1 - + 0 protected 0 @@ -1128,7 +1112,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -1151,7 +1135,6 @@ Dock 0 Left - 0 1 1 @@ -1190,7 +1173,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1213,7 +1196,6 @@ Dock 0 Left - 0 1 1 @@ -1256,7 +1238,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -1280,7 +1262,6 @@ Dock 0 Left - 0 1 1 @@ -1322,7 +1303,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -1345,7 +1326,6 @@ Dock 0 Left - 0 1 1 @@ -1384,7 +1364,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1407,7 +1387,6 @@ Dock 0 Left - 0 1 1 @@ -1450,7 +1429,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -1474,7 +1453,6 @@ Dock 0 Left - 0 1 1 @@ -1516,7 +1494,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 1 @@ -1539,7 +1517,6 @@ Dock 0 Left - 0 1 1 @@ -1578,7 +1555,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1601,7 +1578,6 @@ Dock 0 Left - 0 1 1 @@ -1667,7 +1643,6 @@ Dock 0 Left - 0 1 1 @@ -1704,11 +1679,11 @@ -1 - + 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -1729,7 +1704,6 @@ Dock 0 Left - 0 1 1 @@ -1766,11 +1740,11 @@ -1 - + 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + wxEXPAND|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -1791,7 +1765,6 @@ Dock 0 Left - 0 1 1 @@ -1833,11 +1806,11 @@ onUpdateCurrentDensity - + 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -1858,7 +1831,6 @@ Dock 0 Left - 0 1 1 @@ -1903,7 +1875,7 @@ 5 wxALL|wxEXPAND 1 - + wxID_ANY Application @@ -1911,11 +1883,11 @@ wxVERTICAL 1 none - + 5 - + wxALL 1 - + 3 wxBOTH 1 @@ -1927,11 +1899,11 @@ none 0 0 - + 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -1952,7 +1924,6 @@ Dock 0 Left - 0 1 1 @@ -1989,11 +1960,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -2014,7 +1985,6 @@ Dock 0 Left - 0 1 1 @@ -2055,11 +2025,11 @@ OnConductorTempChange - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT 0 - + 1 1 1 @@ -2080,7 +2050,6 @@ Dock 0 Left - 0 1 1 @@ -2117,11 +2086,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -2142,7 +2111,6 @@ Dock 0 Left - 0 1 1 @@ -2179,11 +2147,11 @@ -1 - + 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 - + 1 1 1 @@ -2204,7 +2172,6 @@ Dock 0 Left - 0 1 1 @@ -2245,11 +2212,11 @@ OnCurrentChange - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxTOP 0 - + 1 1 1 @@ -2270,7 +2237,6 @@ Dock 0 Left - 0 1 1 @@ -2307,11 +2273,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -2332,7 +2298,6 @@ Dock 0 Left - 0 1 1 @@ -2369,11 +2334,11 @@ -1 - + 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 - + 1 1 1 @@ -2394,7 +2359,6 @@ Dock 0 Left - 0 1 1 @@ -2435,11 +2399,11 @@ OnLengthChange - + 5 wxTOP|wxEXPAND 0 - + 1 1 1 @@ -2461,7 +2425,6 @@ Dock 0 Left - 0 1 1 @@ -2501,11 +2464,11 @@ OnUpdateUnit - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -2526,7 +2489,6 @@ Dock 0 Left - 0 1 1 @@ -2563,11 +2525,11 @@ -1 - + 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 - + 1 1 1 @@ -2588,7 +2550,6 @@ Dock 0 Left - 0 1 1 @@ -2629,11 +2590,11 @@ OnResistanceDcChange - + 5 wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -2654,7 +2615,6 @@ Dock 0 Left - 0 1 1 @@ -2691,11 +2651,11 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -2716,7 +2676,6 @@ Dock 0 Left - 0 1 1 @@ -2753,11 +2712,11 @@ -1 - + 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -2778,7 +2737,6 @@ Dock 0 Left - 0 1 1 @@ -2819,11 +2777,11 @@ OnVDropChange - + 5 - wxTOP|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND|wxTOP 0 - + 1 1 1 @@ -2845,7 +2803,6 @@ Dock 0 Left - 0 1 1 @@ -2885,11 +2842,11 @@ OnUpdateUnit - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP 0 - + 1 1 1 @@ -2910,7 +2867,6 @@ Dock 0 Left - 0 1 1 @@ -2947,11 +2903,11 @@ -1 - + 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -2972,7 +2928,6 @@ Dock 0 Left - 0 1 1 @@ -3013,11 +2968,11 @@ OnPowerChange - + 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 - + 1 1 1 @@ -3039,7 +2994,6 @@ Dock 0 Left - 0 1 1 diff --git a/pcb_calculator/calculator_panels/panel_cable_size_base.h b/pcb_calculator/calculator_panels/panel_cable_size_base.h index d247107d17..ccc4f9cf7c 100644 --- a/pcb_calculator/calculator_panels/panel_cable_size_base.h +++ b/pcb_calculator/calculator_panels/panel_cable_size_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-282-g1fa54006) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp index 3e94581faf..9bddf0c245 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.cpp @@ -23,7 +23,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_stTitle = new wxStaticText( m_scrolledWindow, wxID_ANY, _("Insulation for equipment within low-voltage supply systems"), wxDefaultPosition, wxDefaultSize, 0 ); m_stTitle->Wrap( -1 ); - m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_stTitle->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); bSizerMain->Add( m_stTitle, 0, wxALIGN_CENTER|wxALL, 5 ); @@ -45,7 +45,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( fgSizer111->Add( m_staticText5211, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_ratedVoltage = new wxTextCtrl( sbSizerTop->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer111->Add( m_ratedVoltage, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer111->Add( m_ratedVoltage, 0, wxALL|wxEXPAND, 5 ); m_staticText52112 = new wxStaticText( sbSizerTop->GetStaticBox(), wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText52112->Wrap( -1 ); @@ -140,7 +140,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_transientOvervoltage = new wxTextCtrl( sbSizerMiddle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_transientOvervoltage->SetMinSize( wxSize( 100,-1 ) ); - fgSizer11->Add( m_transientOvervoltage, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer11->Add( m_transientOvervoltage, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText1121 = new wxStaticText( sbSizerMiddle->GetStaticBox(), wxID_ANY, _("kV"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1121->Wrap( -1 ); @@ -155,7 +155,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_peakVoltage = new wxTextCtrl( sbSizerMiddle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_peakVoltage->SetMinSize( wxSize( 100,-1 ) ); - fgSizer11->Add( m_peakVoltage, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer11->Add( m_peakVoltage, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText11211 = new wxStaticText( sbSizerMiddle->GetStaticBox(), wxID_ANY, _("kV"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11211->Wrap( -1 ); @@ -171,7 +171,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( int m_insulationTypeNChoices = sizeof( m_insulationTypeChoices ) / sizeof( wxString ); m_insulationType = new wxChoice( sbSizerMiddle->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_insulationTypeNChoices, m_insulationTypeChoices, 0 ); m_insulationType->SetSelection( 0 ); - fgSizer11->Add( m_insulationType, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer11->Add( m_insulationType, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizer11->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -186,7 +186,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( int m_pollutionDegreeNChoices = sizeof( m_pollutionDegreeChoices ) / sizeof( wxString ); m_pollutionDegree = new wxChoice( sbSizerMiddle->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_pollutionDegreeNChoices, m_pollutionDegreeChoices, 0 ); m_pollutionDegree->SetSelection( 1 ); - fgSizer11->Add( m_pollutionDegree, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer11->Add( m_pollutionDegree, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizer11->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -201,7 +201,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( int m_materialGroupNChoices = sizeof( m_materialGroupChoices ) / sizeof( wxString ); m_materialGroup = new wxChoice( sbSizerMiddle->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_materialGroupNChoices, m_materialGroupChoices, 0 ); m_materialGroup->SetSelection( 0 ); - fgSizer11->Add( m_materialGroup, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer11->Add( m_materialGroup, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizer11->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -227,7 +227,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_altitude = new wxTextCtrl( sbSizerMiddle->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_altitude->SetMinSize( wxSize( 100,-1 ) ); - fgSizer11->Add( m_altitude, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer11->Add( m_altitude, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText11121211 = new wxStaticText( sbSizerMiddle->GetStaticBox(), wxID_ANY, _("m"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11121211->Wrap( -1 ); @@ -273,7 +273,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_creepage->Enable( false ); m_creepage->SetMinSize( wxSize( 100,-1 ) ); - fgSizer6->Add( m_creepage, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer6->Add( m_creepage, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_staticText7111 = new wxStaticText( sbSizerMiddle->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7111->Wrap( -1 ); @@ -289,7 +289,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( m_minGrooveWidth->Enable( false ); m_minGrooveWidth->SetMinSize( wxSize( 100,-1 ) ); - fgSizer6->Add( m_minGrooveWidth, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer6->Add( m_minGrooveWidth, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_staticText711 = new wxStaticText( sbSizerMiddle->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText711->Wrap( -1 ); @@ -330,7 +330,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664_BASE::PANEL_ELECTRICAL_SPACING_IEC60664_BASE( sbSizerBottom = new wxStaticBoxSizer( new wxStaticBox( m_scrolledWindow, wxID_ANY, _("Help") ), wxVERTICAL ); m_panelHelp = new HTML_WINDOW( sbSizerBottom->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); - sbSizerBottom->Add( m_panelHelp, 1, wxEXPAND, 5 ); + sbSizerBottom->Add( m_panelHelp, 1, wxALL|wxEXPAND, 5 ); bSizerMain->Add( sbSizerBottom, 1, wxEXPAND|wxBOTTOM, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp index 517fe4ce55..107502e8e4 100644 --- a/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp +++ b/pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664_base.fbp @@ -280,7 +280,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1048,7 +1048,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1235,7 +1235,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1422,7 +1422,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1558,7 +1558,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1694,7 +1694,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1966,7 +1966,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2377,7 +2377,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -2563,7 +2563,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -2849,7 +2849,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 1 1 diff --git a/pcb_calculator/calculator_panels/panel_regulator_base.cpp b/pcb_calculator/calculator_panels/panel_regulator_base.cpp index 9ce484b26a..10d7632315 100644 --- a/pcb_calculator/calculator_panels/panel_regulator_base.cpp +++ b/pcb_calculator/calculator_panels/panel_regulator_base.cpp @@ -56,7 +56,7 @@ PANEL_REGULATOR_BASE::PANEL_REGULATOR_BASE( wxWindow* parent, wxWindowID id, con m_RegulFormula = new wxStaticText( sbSizerRegFormula->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_RegulFormula->Wrap( -1 ); - m_RegulFormula->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_RegulFormula->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); sbSizerRegFormula->Add( m_RegulFormula, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -143,7 +143,7 @@ PANEL_REGULATOR_BASE::PANEL_REGULATOR_BASE( wxWindow* parent, wxWindowID id, con fgSizerRegParams->Add( m_labelRegultR1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_RegulR1Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRegParams->Add( m_RegulR1Value, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerRegParams->Add( m_RegulR1Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_r1Units = new wxStaticText( this, wxID_ANY, _("kOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_r1Units->Wrap( -1 ); @@ -157,7 +157,7 @@ PANEL_REGULATOR_BASE::PANEL_REGULATOR_BASE( wxWindow* parent, wxWindowID id, con fgSizerRegParams->Add( m_labelRegultR2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_RegulR2Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRegParams->Add( m_RegulR2Value, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerRegParams->Add( m_RegulR2Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_r2Units = new wxStaticText( this, wxID_ANY, _("kOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_r2Units->Wrap( -1 ); @@ -171,7 +171,7 @@ PANEL_REGULATOR_BASE::PANEL_REGULATOR_BASE( wxWindow* parent, wxWindowID id, con fgSizerRegParams->Add( m_labelVout, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_RegulVoutValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRegParams->Add( m_RegulVoutValue, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerRegParams->Add( m_RegulVoutValue, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_unitsVout = new wxStaticText( this, wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitsVout->Wrap( -1 ); @@ -187,7 +187,7 @@ PANEL_REGULATOR_BASE::PANEL_REGULATOR_BASE( wxWindow* parent, wxWindowID id, con fgSizerRegParams->Add( m_labelVRef, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_RegulVrefValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRegParams->Add( m_RegulVrefValue, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerRegParams->Add( m_RegulVrefValue, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_unitsVref = new wxStaticText( this, wxID_ANY, _("V"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitsVref->Wrap( -1 ); @@ -203,7 +203,7 @@ PANEL_REGULATOR_BASE::PANEL_REGULATOR_BASE( wxWindow* parent, wxWindowID id, con fgSizerRegParams->Add( m_RegulIadjTitle, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_RegulIadjValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRegParams->Add( m_RegulIadjValue, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerRegParams->Add( m_RegulIadjValue, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_IadjUnitLabel = new wxStaticText( this, wxID_ANY, _("uA"), wxDefaultPosition, wxDefaultSize, 0 ); m_IadjUnitLabel->Wrap( -1 ); diff --git a/pcb_calculator/calculator_panels/panel_regulator_base.fbp b/pcb_calculator/calculator_panels/panel_regulator_base.fbp index 51f2bea832..d43c3725a4 100644 --- a/pcb_calculator/calculator_panels/panel_regulator_base.fbp +++ b/pcb_calculator/calculator_panels/panel_regulator_base.fbp @@ -1128,7 +1128,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1378,7 +1378,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1628,7 +1628,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1824,7 +1824,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2020,7 +2020,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp index b2e4b666a2..8ffb23511b 100644 --- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp +++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.cpp @@ -23,7 +23,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow wxString m_AttenuatorsSelectionChoices[] = { _("Pi"), _("Tee"), _("Bridged tee"), _("Resistive splitter") }; int m_AttenuatorsSelectionNChoices = sizeof( m_AttenuatorsSelectionChoices ) / sizeof( wxString ); m_AttenuatorsSelection = new wxRadioBox( this, wxID_ANY, _("Attenuators"), wxDefaultPosition, wxDefaultSize, m_AttenuatorsSelectionNChoices, m_AttenuatorsSelectionChoices, 1, wxRA_SPECIFY_COLS ); - m_AttenuatorsSelection->SetSelection( 2 ); + m_AttenuatorsSelection->SetSelection( 1 ); bLeftSizerAtt->Add( m_AttenuatorsSelection, 0, wxEXPAND|wxALL, 5 ); @@ -33,7 +33,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow bLeftSizerAtt->Add( m_attenuatorBitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 10 ); - bSizerAtt->Add( bLeftSizerAtt, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); + bSizerAtt->Add( bLeftSizerAtt, 0, wxBOTTOM|wxEXPAND|wxRIGHT, 5 ); wxBoxSizer* bMiddleSizerAtt; bMiddleSizerAtt = new wxBoxSizer( wxVERTICAL ); @@ -49,7 +49,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_attenuationLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Attenuation (a):"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuationLabel->Wrap( -1 ); - fgSizerAttPrms->Add( m_attenuationLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerAttPrms->Add( m_attenuationLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_AttValueCtrl = new wxTextCtrl( sbSizerAttPrms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_AttValueCtrl->SetMinSize( wxSize( 100,-1 ) ); @@ -62,7 +62,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_attenuationZinLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Zin:"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuationZinLabel->Wrap( -1 ); - fgSizerAttPrms->Add( m_attenuationZinLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerAttPrms->Add( m_attenuationZinLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ZinValueCtrl = new wxTextCtrl( sbSizerAttPrms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ZinValueCtrl->SetMinSize( wxSize( 100,-1 ) ); @@ -75,7 +75,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_ZoutLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Zout:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ZoutLabel->Wrap( -1 ); - fgSizerAttPrms->Add( m_ZoutLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerAttPrms->Add( m_ZoutLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ZoutValueCtrl = new wxTextCtrl( sbSizerAttPrms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ZoutValueCtrl->SetMinSize( wxSize( 100,-1 ) ); @@ -87,7 +87,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow fgSizerAttPrms->Add( m_attZoutUnit, 0, wxALIGN_CENTER_VERTICAL, 5 ); - sbSizerAttPrms->Add( fgSizerAttPrms, 0, wxEXPAND|wxBOTTOM, 5 ); + sbSizerAttPrms->Add( fgSizerAttPrms, 0, wxALL|wxEXPAND, 5 ); bMiddleSizerAtt->Add( sbSizerAttPrms, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -117,7 +117,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_attenuatorR1Label = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("R1:"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuatorR1Label->Wrap( -1 ); - fgSizerAttResults->Add( m_attenuatorR1Label, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerAttResults->Add( m_attenuatorR1Label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Att_R1_Value = new wxTextCtrl( sbSizerAttValues->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttResults->Add( m_Att_R1_Value, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 ); @@ -128,7 +128,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_attenuatorR2Label = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("R2:"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuatorR2Label->Wrap( -1 ); - fgSizerAttResults->Add( m_attenuatorR2Label, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerAttResults->Add( m_attenuatorR2Label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Att_R2_Value = new wxTextCtrl( sbSizerAttValues->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttResults->Add( m_Att_R2_Value, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 ); @@ -139,7 +139,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_attenuatorR3Label = new wxStaticText( sbSizerAttValues->GetStaticBox(), wxID_ANY, _("R3:"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuatorR3Label->Wrap( -1 ); - fgSizerAttResults->Add( m_attenuatorR3Label, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerAttResults->Add( m_attenuatorR3Label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Att_R3_Value = new wxTextCtrl( sbSizerAttValues->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerAttResults->Add( m_Att_R3_Value, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); @@ -149,7 +149,7 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow fgSizerAttResults->Add( m_attR3Unit, 0, wxALIGN_CENTER_VERTICAL, 5 ); - sbSizerAttValues->Add( fgSizerAttResults, 0, wxEXPAND|wxBOTTOM, 5 ); + sbSizerAttValues->Add( fgSizerAttResults, 0, wxALL|wxEXPAND, 5 ); bMiddleSizerAtt->Add( sbSizerAttValues, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -185,10 +185,10 @@ PANEL_RF_ATTENUATORS_BASE::PANEL_RF_ATTENUATORS_BASE( wxWindow* parent, wxWindow m_panelAttFormula = new HTML_WINDOW( sbRightSizerFormula->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); m_panelAttFormula->SetMinSize( wxSize( 200,-1 ) ); - sbRightSizerFormula->Add( m_panelAttFormula, 1, wxEXPAND|wxBOTTOM, 5 ); + sbRightSizerFormula->Add( m_panelAttFormula, 1, wxALL|wxEXPAND, 5 ); - bSizer7->Add( sbRightSizerFormula, 1, wxEXPAND|wxALL, 5 ); + bSizer7->Add( sbRightSizerFormula, 1, wxALL|wxEXPAND, 5 ); bSizerAtt->Add( bSizer7, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp index 5d0a0268f6..d88ebfbf0b 100644 --- a/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp +++ b/pcb_calculator/calculator_panels/panel_rf_attenuators_base.fbp @@ -59,7 +59,7 @@ none 5 - wxEXPAND|wxBOTTOM|wxRIGHT + wxBOTTOM|wxEXPAND|wxRIGHT 0 260,-1 @@ -116,7 +116,7 @@ 1 Resizable - 2 + 1 1 wxRA_SPECIFY_COLS @@ -226,7 +226,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 0 3 @@ -242,7 +242,7 @@ 3 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -428,7 +428,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -614,7 +614,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -961,11 +961,11 @@ - + 5 wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT 0 - + wxID_ANY Values @@ -973,11 +973,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 0 - + 3 wxBOTH 1 @@ -991,7 +991,7 @@ 3 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1177,7 +1177,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1363,7 +1363,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1705,7 +1705,7 @@ none 5 - wxEXPAND|wxALL + wxALL|wxEXPAND 1 wxID_ANY @@ -1717,7 +1717,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 1 1 diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.cpp b/pcb_calculator/calculator_panels/panel_track_width_base.cpp index 6ca350680a..620ab40365 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.cpp +++ b/pcb_calculator/calculator_panels/panel_track_width_base.cpp @@ -33,7 +33,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTWprms->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); m_TrackCurrentValue = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTWprms->Add( m_TrackCurrentValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_TrackCurrentValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText62 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText62->Wrap( -1 ); @@ -44,7 +44,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTWprms->Add( m_staticText63, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); m_TrackDeltaTValue = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTWprms->Add( m_TrackDeltaTValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_TrackDeltaTValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_trackTempUnits = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("deg C"), wxDefaultPosition, wxDefaultSize, 0 ); m_trackTempUnits->Wrap( -1 ); @@ -56,28 +56,28 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTWprms->Add( m_staticText66, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); m_TrackLengthValue = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTWprms->Add( m_TrackLengthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_TrackLengthValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_TW_CuLength_choiceUnitChoices; m_TW_CuLength_choiceUnit = new UNIT_SELECTOR_LEN( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_CuLength_choiceUnitChoices, 0 ); m_TW_CuLength_choiceUnit->SetSelection( 0 ); - fgSizerTWprms->Add( m_TW_CuLength_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 ); + fgSizerTWprms->Add( m_TW_CuLength_choiceUnit, 0, wxBOTTOM|wxEXPAND, 5 ); m_staticText103 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Copper resistivity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText103->Wrap( -1 ); - fgSizerTWprms->Add( m_staticText103, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizerTWprms->Add( m_staticText103, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_TWResistivity = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); m_TWResistivity->Enable( false ); - fgSizerTWprms->Add( m_TWResistivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_TWResistivity, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_resistivityUnits = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("ohm-meter"), wxDefaultPosition, wxDefaultSize, 0 ); m_resistivityUnits->Wrap( -1 ); - fgSizerTWprms->Add( m_resistivityUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizerTWprms->Add( m_resistivityUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); - sbSizerTW_Prms->Add( fgSizerTWprms, 0, wxEXPAND, 5 ); + sbSizerTW_Prms->Add( fgSizerTWprms, 0, wxALL|wxEXPAND, 5 ); bSizeLeft->Add( sbSizerTW_Prms, 0, wxALL|wxEXPAND, 5 ); @@ -102,27 +102,27 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticTextExtWidth = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextExtWidth->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticTextExtWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + fgSizerTW_Results->Add( m_staticTextExtWidth, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_ExtTrackWidthValue = new wxTextCtrl( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTW_Results->Add( m_ExtTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_ExtTrackWidthValue, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_TW_ExtTrackWidth_choiceUnitChoices; m_TW_ExtTrackWidth_choiceUnit = new UNIT_SELECTOR_LEN( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_ExtTrackWidth_choiceUnitChoices, 0 ); m_TW_ExtTrackWidth_choiceUnit->SetSelection( 0 ); - fgSizerTW_Results->Add( m_TW_ExtTrackWidth_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerTW_Results->Add( m_TW_ExtTrackWidth_choiceUnit, 0, wxEXPAND, 5 ); m_staticText65 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace thickness (H):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText65->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticText65, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_staticText65, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_ExtTrackThicknessValue = new wxTextCtrl( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTW_Results->Add( m_ExtTrackThicknessValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 ); + fgSizerTW_Results->Add( m_ExtTrackThicknessValue, 0, wxALL|wxEXPAND, 5 ); wxArrayString m_ExtTrackThicknessUnitChoices; m_ExtTrackThicknessUnit = new UNIT_SELECTOR_THICKNESS( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ExtTrackThicknessUnitChoices, 0 ); m_ExtTrackThicknessUnit->SetSelection( 0 ); - fgSizerTW_Results->Add( m_ExtTrackThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 ); + fgSizerTW_Results->Add( m_ExtTrackThicknessUnit, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_staticline3 = new wxStaticLine( sbSizerTW_Result->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); fgSizerTW_Results->Add( m_staticline3, 0, wxEXPAND|wxBOTTOM, 5 ); @@ -135,7 +135,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticTextArea = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Cross-section area:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticTextArea, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizerTW_Results->Add( m_staticTextArea, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_ExtTrackAreaValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackAreaValue->Wrap( -1 ); @@ -147,7 +147,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticText651 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText651->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticText651, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_staticText651, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); m_ExtTrackResistValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackResistValue->Wrap( -1 ); @@ -159,7 +159,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticText661 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText661->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticText661, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_staticText661, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); m_ExtTrackVDropValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackVDropValue->Wrap( -1 ); @@ -171,18 +171,18 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticText79 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Power loss:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText79->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticText79, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_staticText79, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_ExtTrackLossValue = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExtTrackLossValue->Wrap( -1 ); - fgSizerTW_Results->Add( m_ExtTrackLossValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results->Add( m_ExtTrackLossValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText791 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("W"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText791->Wrap( -1 ); - fgSizerTW_Results->Add( m_staticText791, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + fgSizerTW_Results->Add( m_staticText791, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - sbSizerTW_Result->Add( fgSizerTW_Results, 0, wxEXPAND, 5 ); + sbSizerTW_Result->Add( fgSizerTW_Results, 0, wxALL|wxEXPAND, 5 ); bSizeRight->Add( sbSizerTW_Result, 1, wxEXPAND|wxALL, 5 ); @@ -200,19 +200,19 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticTextIntWidth->Wrap( -1 ); m_staticTextIntWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - fgSizerTW_Results1->Add( m_staticTextIntWidth, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_staticTextIntWidth, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_IntTrackWidthValue = new wxTextCtrl( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTW_Results1->Add( m_IntTrackWidthValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_IntTrackWidthValue, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_TW_IntTrackWidth_choiceUnitChoices; m_TW_IntTrackWidth_choiceUnit = new UNIT_SELECTOR_LEN( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TW_IntTrackWidth_choiceUnitChoices, 0 ); m_TW_IntTrackWidth_choiceUnit->SetSelection( 0 ); - fgSizerTW_Results1->Add( m_TW_IntTrackWidth_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTW_Results1->Add( m_TW_IntTrackWidth_choiceUnit, 0, wxEXPAND, 5 ); m_staticText652 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace thickness (H):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText652->Wrap( -1 ); - fgSizerTW_Results1->Add( m_staticText652, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizerTW_Results1->Add( m_staticText652, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_IntTrackThicknessValue = new wxTextCtrl( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerTW_Results1->Add( m_IntTrackThicknessValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); @@ -220,7 +220,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, wxArrayString m_IntTrackThicknessUnitChoices; m_IntTrackThicknessUnit = new UNIT_SELECTOR_THICKNESS( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_IntTrackThicknessUnitChoices, 0 ); m_IntTrackThicknessUnit->SetSelection( 0 ); - fgSizerTW_Results1->Add( m_IntTrackThicknessUnit, 0, wxTOP|wxBOTTOM, 5 ); + fgSizerTW_Results1->Add( m_IntTrackThicknessUnit, 0, wxBOTTOM|wxTOP, 5 ); m_staticline8 = new wxStaticLine( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); fgSizerTW_Results1->Add( m_staticline8, 0, wxEXPAND|wxBOTTOM, 5 ); @@ -233,7 +233,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticTextArea1 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Cross-section area:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea1->Wrap( -1 ); - fgSizerTW_Results1->Add( m_staticTextArea1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizerTW_Results1->Add( m_staticTextArea1, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 ); m_IntTrackAreaValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackAreaValue->Wrap( -1 ); @@ -245,7 +245,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticText6511 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6511->Wrap( -1 ); - fgSizerTW_Results1->Add( m_staticText6511, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_staticText6511, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); m_IntTrackResistValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackResistValue->Wrap( -1 ); @@ -257,7 +257,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticText6611 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6611->Wrap( -1 ); - fgSizerTW_Results1->Add( m_staticText6611, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_staticText6611, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); m_IntTrackVDropValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackVDropValue->Wrap( -1 ); @@ -269,18 +269,18 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_staticText792 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Power loss:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText792->Wrap( -1 ); - fgSizerTW_Results1->Add( m_staticText792, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_staticText792, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_IntTrackLossValue = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackLossValue->Wrap( -1 ); - fgSizerTW_Results1->Add( m_IntTrackLossValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results1->Add( m_IntTrackLossValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText7911 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("W"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7911->Wrap( -1 ); - fgSizerTW_Results1->Add( m_staticText7911, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + fgSizerTW_Results1->Add( m_staticText7911, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - sbSizerTW_Result1->Add( fgSizerTW_Results1, 0, wxEXPAND, 5 ); + sbSizerTW_Result1->Add( fgSizerTW_Results1, 0, wxALL|wxEXPAND, 5 ); bSizeRight->Add( sbSizerTW_Result1, 1, wxEXPAND|wxALL, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.fbp b/pcb_calculator/calculator_panels/panel_track_width_base.fbp index dff5bf1add..84aed9773d 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.fbp +++ b/pcb_calculator/calculator_panels/panel_track_width_base.fbp @@ -80,7 +80,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 0 3 @@ -157,7 +157,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -344,7 +344,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -531,7 +531,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -596,7 +596,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND 0 1 @@ -661,7 +661,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxALIGN_CENTER_VERTICAL 0 1 @@ -722,7 +722,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -787,7 +787,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxALIGN_CENTER_VERTICAL 0 1 @@ -931,11 +931,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND + wxALL|wxEXPAND 0 - + 3 wxBOTH 1 @@ -949,7 +949,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -1010,7 +1010,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1075,7 +1075,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 0 1 @@ -1140,7 +1140,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -1201,7 +1201,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL + wxALL|wxEXPAND 0 1 @@ -1266,7 +1266,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxBOTTOM|wxEXPAND|wxTOP 0 1 @@ -1505,7 +1505,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -1688,7 +1688,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -1871,7 +1871,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -2054,7 +2054,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2115,7 +2115,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2176,7 +2176,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2251,11 +2251,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND + wxALL|wxEXPAND 0 - + 3 wxBOTH 1 @@ -2269,7 +2269,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2330,7 +2330,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2395,7 +2395,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -2460,7 +2460,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2586,7 +2586,7 @@ 5 - wxTOP|wxBOTTOM + wxBOTTOM|wxTOP 0 1 @@ -2825,7 +2825,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP 0 1 @@ -3008,7 +3008,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -3191,7 +3191,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -3374,7 +3374,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -3435,7 +3435,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -3496,7 +3496,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 diff --git a/pcb_calculator/calculator_panels/panel_transline_base.cpp b/pcb_calculator/calculator_panels/panel_transline_base.cpp index a6493b070c..9e8b32090b 100644 --- a/pcb_calculator/calculator_panels/panel_transline_base.cpp +++ b/pcb_calculator/calculator_panels/panel_transline_base.cpp @@ -58,7 +58,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con bSizer441->Add( m_Value_EpsilonR, 1, wxEXPAND|wxLEFT, 5 ); m_button_EpsilonR = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizer441->Add( m_button_EpsilonR, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizer441->Add( m_button_EpsilonR, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizerSubstPrms->Add( bSizer441, 1, wxEXPAND, 5 ); @@ -77,7 +77,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con bSizer442->Add( m_Value_TanD, 1, wxEXPAND|wxLEFT, 5 ); m_button_TanD = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizer442->Add( m_button_TanD, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizer442->Add( m_button_TanD, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizerSubstPrms->Add( bSizer442, 1, wxEXPAND, 5 ); @@ -98,7 +98,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con bSizer443->Add( m_Value_Rho, 1, wxEXPAND|wxLEFT, 5 ); m_button_Rho = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizer443->Add( m_button_Rho, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizer443->Add( m_button_Rho, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizerSubstPrms->Add( bSizer443, 1, wxEXPAND, 5 ); @@ -111,75 +111,75 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con fgSizerSubstPrms->Add( m_substrate_prm4_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Substrate_prm4_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm4_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm4_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_SubsPrm4_choiceUnitChoices; m_SubsPrm4_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm4_choiceUnitChoices, 0 ); m_SubsPrm4_choiceUnit->SetSelection( 0 ); - fgSizerSubstPrms->Add( m_SubsPrm4_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_SubsPrm4_choiceUnit, 0, wxEXPAND, 5 ); m_substrate_prm5_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("H_t:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm5_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm5_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Substrate_prm5_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm5_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm5_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_SubsPrm5_choiceUnitChoices; m_SubsPrm5_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm5_choiceUnitChoices, 0 ); m_SubsPrm5_choiceUnit->SetSelection( 0 ); - fgSizerSubstPrms->Add( m_SubsPrm5_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_SubsPrm5_choiceUnit, 0, wxEXPAND, 5 ); m_substrate_prm6_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("T:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm6_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm6_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Substrate_prm6_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm6_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm6_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_SubsPrm6_choiceUnitChoices; m_SubsPrm6_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm6_choiceUnitChoices, 0 ); m_SubsPrm6_choiceUnit->SetSelection( 0 ); - fgSizerSubstPrms->Add( m_SubsPrm6_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_SubsPrm6_choiceUnit, 0, wxEXPAND, 5 ); m_substrate_prm7_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Rough:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm7_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm7_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Substrate_prm7_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm7_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm7_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_SubsPrm7_choiceUnitChoices; m_SubsPrm7_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm7_choiceUnitChoices, 0 ); m_SubsPrm7_choiceUnit->SetSelection( 0 ); - fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxEXPAND, 5 ); m_substrate_prm8_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Insulator mu:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm8_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm8_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Substrate_prm8_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm8_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm8_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_SubsPrm8_choiceUnitChoices; m_SubsPrm8_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm8_choiceUnitChoices, 0 ); m_SubsPrm8_choiceUnit->SetSelection( 0 ); - fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND, 5 ); m_substrate_prm9_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Conductor mu:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm9_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_substrate_prm9_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Substrate_prm9_Value = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Substrate_prm9_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_Substrate_prm9_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_SubsPrm9_choiceUnitChoices; m_SubsPrm9_choiceUnit = new UNIT_SELECTOR_LEN( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_SubsPrm9_choiceUnitChoices, 0 ); m_SubsPrm9_choiceUnit->SetSelection( 0 ); - fgSizerSubstPrms->Add( m_SubsPrm9_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerSubstPrms->Add( m_SubsPrm9_choiceUnit, 0, wxEXPAND, 5 ); - sbSubstrateBoxSizer->Add( fgSizerSubstPrms, 1, wxEXPAND|wxBOTTOM, 5 ); + sbSubstrateBoxSizer->Add( fgSizerSubstPrms, 1, wxALL|wxEXPAND, 5 ); bMiddleSizer->Add( sbSubstrateBoxSizer, 0, wxEXPAND|wxBOTTOM, 5 ); @@ -206,7 +206,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con fgSizeCmpPrms->Add( m_choiceUnit_Frequency, 0, wxEXPAND, 5 ); - sbCmpPrmsSizer->Add( fgSizeCmpPrms, 0, wxEXPAND|wxBOTTOM, 5 ); + sbCmpPrmsSizer->Add( fgSizeCmpPrms, 0, wxALL|wxEXPAND, 5 ); bMiddleSizer->Add( sbCmpPrmsSizer, 0, wxEXPAND|wxTOP, 5 ); @@ -243,12 +243,12 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con fgSizerPhysPrms->Add( m_phys_prm1_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Phys_prm1_Value = new wxTextCtrl( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerPhysPrms->Add( m_Phys_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_Phys_prm1_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceUnit_Param1Choices; m_choiceUnit_Param1 = new UNIT_SELECTOR_LEN( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param1Choices, 0 ); m_choiceUnit_Param1->SetSelection( 0 ); - fgSizerPhysPrms->Add( m_choiceUnit_Param1, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_choiceUnit_Param1, 0, wxEXPAND, 5 ); m_radioBtnPrm1 = new wxRadioButton( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); fgSizerPhysPrms->Add( m_radioBtnPrm1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); @@ -258,12 +258,12 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con fgSizerPhysPrms->Add( m_phys_prm2_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Phys_prm2_Value = new wxTextCtrl( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerPhysPrms->Add( m_Phys_prm2_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_Phys_prm2_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceUnit_Param2Choices; m_choiceUnit_Param2 = new UNIT_SELECTOR_LEN( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param2Choices, 0 ); m_choiceUnit_Param2->SetSelection( 0 ); - fgSizerPhysPrms->Add( m_choiceUnit_Param2, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_choiceUnit_Param2, 0, wxEXPAND, 5 ); m_radioBtnPrm2 = new wxRadioButton( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPhysPrms->Add( m_radioBtnPrm2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); @@ -273,18 +273,18 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con fgSizerPhysPrms->Add( m_phys_prm3_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Phys_prm3_Value = new wxTextCtrl( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerPhysPrms->Add( m_Phys_prm3_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_Phys_prm3_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceUnit_Param3Choices; m_choiceUnit_Param3 = new UNIT_SELECTOR_LEN( btranslineRightSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_Param3Choices, 0 ); m_choiceUnit_Param3->SetSelection( 0 ); - fgSizerPhysPrms->Add( m_choiceUnit_Param3, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerPhysPrms->Add( m_choiceUnit_Param3, 0, wxEXPAND, 5 ); fgSizerPhysPrms->Add( 0, 0, 0, 0, 5 ); - btranslineRightSizer->Add( fgSizerPhysPrms, 0, wxEXPAND|wxBOTTOM, 5 ); + btranslineRightSizer->Add( fgSizerPhysPrms, 0, wxALL|wxEXPAND, 5 ); bSizer11->Add( btranslineRightSizer, 0, wxALL|wxEXPAND, 5 ); @@ -330,39 +330,39 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con fgSizerResults->Add( m_elec_prm1_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Elec_prm1_Value = new wxTextCtrl( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerResults->Add( m_Elec_prm1_Value, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_Elec_prm1_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceUnit_ElecPrm1Choices; m_choiceUnit_ElecPrm1 = new UNIT_SELECTOR_RESISTOR( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm1Choices, 0 ); m_choiceUnit_ElecPrm1->SetSelection( 0 ); - fgSizerResults->Add( m_choiceUnit_ElecPrm1, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_choiceUnit_ElecPrm1, 0, wxEXPAND, 5 ); m_elec_prm2_label = new wxStaticText( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 ); m_elec_prm2_label->Wrap( -1 ); fgSizerResults->Add( m_elec_prm2_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Elec_prm2_Value = new wxTextCtrl( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerResults->Add( m_Elec_prm2_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_Elec_prm2_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceUnit_ElecPrm2Choices; m_choiceUnit_ElecPrm2 = new UNIT_SELECTOR_RESISTOR( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm2Choices, 0 ); m_choiceUnit_ElecPrm2->SetSelection( 0 ); - fgSizerResults->Add( m_choiceUnit_ElecPrm2, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_choiceUnit_ElecPrm2, 0, wxEXPAND, 5 ); m_elec_prm3_label = new wxStaticText( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, _("Angle:"), wxDefaultPosition, wxDefaultSize, 0 ); m_elec_prm3_label->Wrap( -1 ); fgSizerResults->Add( m_elec_prm3_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Elec_prm3_Value = new wxTextCtrl( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerResults->Add( m_Elec_prm3_Value, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_Elec_prm3_Value, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceUnit_ElecPrm3Choices; m_choiceUnit_ElecPrm3 = new UNIT_SELECTOR_ANGLE( sbElectricalResultsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnit_ElecPrm3Choices, 0 ); m_choiceUnit_ElecPrm3->SetSelection( 0 ); - fgSizerResults->Add( m_choiceUnit_ElecPrm3, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerResults->Add( m_choiceUnit_ElecPrm3, 0, 0, 5 ); - sbElectricalResultsSizer->Add( fgSizerResults, 0, wxEXPAND|wxBOTTOM, 5 ); + sbElectricalResultsSizer->Add( fgSizerResults, 0, wxALL|wxEXPAND, 5 ); bSizer11->Add( sbElectricalResultsSizer, 0, wxEXPAND|wxALL, 5 ); @@ -378,7 +378,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message1 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message1->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message1, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTranslResults->Add( m_left_message1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message1 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message1->Wrap( -1 ); @@ -386,7 +386,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message2 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message2->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message2, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTranslResults->Add( m_left_message2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message2 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message2->Wrap( -1 ); @@ -394,7 +394,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message3 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message3->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message3, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTranslResults->Add( m_left_message3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message3 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message3->Wrap( -1 ); @@ -402,7 +402,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message4 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message4->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message4, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTranslResults->Add( m_left_message4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message4 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message4->Wrap( -1 ); @@ -410,7 +410,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message5 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message5->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + fgSizerTranslResults->Add( m_left_message5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message5 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message5->Wrap( -1 ); @@ -418,7 +418,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message6 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message6->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message6, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTranslResults->Add( m_left_message6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message6 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message6->Wrap( -1 ); @@ -426,7 +426,7 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message7 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message7->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message7, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerTranslResults->Add( m_left_message7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message7 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message7->Wrap( -1 ); @@ -434,14 +434,14 @@ PANEL_TRANSLINE_BASE::PANEL_TRANSLINE_BASE( wxWindow* parent, wxWindowID id, con m_left_message8 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_left_message8->Wrap( -1 ); - fgSizerTranslResults->Add( m_left_message8, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + fgSizerTranslResults->Add( m_left_message8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_Message8 = new wxStaticText( sbMessagesSizer->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Message8->Wrap( -1 ); fgSizerTranslResults->Add( m_Message8, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - sbMessagesSizer->Add( fgSizerTranslResults, 1, wxEXPAND|wxBOTTOM, 5 ); + sbMessagesSizer->Add( fgSizerTranslResults, 1, wxALL|wxEXPAND, 5 ); bSizer11->Add( sbMessagesSizer, 0, wxEXPAND|wxALL, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_transline_base.fbp b/pcb_calculator/calculator_panels/panel_transline_base.fbp index 642c988c31..390090b891 100644 --- a/pcb_calculator/calculator_panels/panel_transline_base.fbp +++ b/pcb_calculator/calculator_panels/panel_transline_base.fbp @@ -57,7 +57,7 @@ bSizeTransline wxHORIZONTAL none - + 5 wxEXPAND|wxBOTTOM 0 @@ -212,11 +212,11 @@ bMiddleSizer wxVERTICAL none - + 5 wxEXPAND|wxBOTTOM 0 - + wxID_ANY Substrate Parameters @@ -224,11 +224,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 1 - + 3 wxBOTH 1 @@ -376,7 +376,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -521,11 +521,11 @@ -1 - + 5 wxEXPAND 1 - + bSizer442 wxHORIZONTAL @@ -596,7 +596,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -741,11 +741,11 @@ -1 - + 5 wxEXPAND 1 - + bSizer443 wxHORIZONTAL @@ -816,7 +816,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -963,7 +963,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1027,7 +1027,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -1152,7 +1152,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1216,7 +1216,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -1341,7 +1341,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1405,7 +1405,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -1530,7 +1530,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1594,7 +1594,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -1719,7 +1719,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1783,7 +1783,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -1908,7 +1908,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1972,7 +1972,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -2052,7 +2052,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 0 3 @@ -2348,11 +2348,11 @@ bSizer11 wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Physical Parameters @@ -2362,7 +2362,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 0 4 @@ -2439,7 +2439,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2503,7 +2503,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -2692,7 +2692,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2756,7 +2756,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -2945,7 +2945,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -3009,7 +3009,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -3413,11 +3413,11 @@ - + 5 wxEXPAND|wxALL 0 - + wxID_ANY Electrical Parameters @@ -3427,7 +3427,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 0 3 @@ -3504,7 +3504,7 @@ 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -3568,7 +3568,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -3693,7 +3693,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -3757,7 +3757,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 0 1 @@ -3882,7 +3882,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -3946,7 +3946,7 @@ 5 - wxALIGN_CENTER_VERTICAL + 0 1 @@ -4026,7 +4026,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 1 2 @@ -4042,7 +4042,7 @@ 4 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4164,7 +4164,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4286,7 +4286,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4408,7 +4408,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4530,7 +4530,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4652,7 +4652,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4774,7 +4774,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4896,7 +4896,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 diff --git a/pcb_calculator/calculator_panels/panel_via_size_base.cpp b/pcb_calculator/calculator_panels/panel_via_size_base.cpp index b63e1c7594..883df7e451 100644 --- a/pcb_calculator/calculator_panels/panel_via_size_base.cpp +++ b/pcb_calculator/calculator_panels/panel_via_size_base.cpp @@ -32,22 +32,22 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextHoleDia->Wrap( -1 ); m_staticTextHoleDia->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - fgSizerVS_Inputs->Add( m_staticTextHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextHoleDia, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlHoleDia = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlHoleDia, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceHoleDiaChoices; m_choiceHoleDia = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHoleDiaChoices, 0 ); m_choiceHoleDia->SetSelection( 0 ); - fgSizerVS_Inputs->Add( m_choiceHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerVS_Inputs->Add( m_choiceHoleDia, 0, wxEXPAND, 5 ); m_staticTextPlatingThickness = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Plating thickness (T):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPlatingThickness->Wrap( -1 ); - fgSizerVS_Inputs->Add( m_staticTextPlatingThickness, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextPlatingThickness, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlPlatingThickness = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlPlatingThickness, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlPlatingThickness, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choicePlatingThicknessChoices; m_choicePlatingThickness = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePlatingThicknessChoices, 0 ); @@ -58,10 +58,10 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextViaLength->Wrap( -1 ); m_staticTextViaLength->SetToolTip( _("Via length is the board thickness for through hole vias") ); - fgSizerVS_Inputs->Add( m_staticTextViaLength, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextViaLength, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlViaLength = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlViaLength, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlViaLength, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceViaLengthChoices; m_choiceViaLength = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceViaLengthChoices, 0 ); @@ -72,10 +72,10 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextViaPadDia->Wrap( -1 ); m_staticTextViaPadDia->SetToolTip( _("Diameter of pad surrounding via (annular ring)") ); - fgSizerVS_Inputs->Add( m_staticTextViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextViaPadDia, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlViaPadDia = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlViaPadDia, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceViaPadDiaChoices; m_choiceViaPadDia = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceViaPadDiaChoices, 0 ); @@ -86,10 +86,10 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextClearanceDia->Wrap( -1 ); m_staticTextClearanceDia->SetToolTip( _("Diameter of clearance hole in ground plane(s)") ); - fgSizerVS_Inputs->Add( m_staticTextClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextClearanceDia, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlClearanceDia = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlClearanceDia, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceClearanceDiaChoices; m_choiceClearanceDia = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceClearanceDiaChoices, 0 ); @@ -100,10 +100,10 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextImpedance->Wrap( -1 ); m_staticTextImpedance->SetToolTip( _("Characteristic impedance of conductor") ); - fgSizerVS_Inputs->Add( m_staticTextImpedance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextImpedance, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlImpedance = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlImpedance, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlImpedance, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceImpedanceChoices; m_choiceImpedance = new UNIT_SELECTOR_RESISTOR( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceImpedanceChoices, 0 ); @@ -112,10 +112,10 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticAppliedCurrent = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Applied current:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticAppliedCurrent->Wrap( -1 ); - fgSizerVS_Inputs->Add( m_staticAppliedCurrent, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticAppliedCurrent, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlAppliedCurrent = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlAppliedCurrent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_textCtrlAppliedCurrent, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticTextAppliedCurrentUnits = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAppliedCurrentUnits->Wrap( -1 ); @@ -125,7 +125,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextResistivity->Wrap( -1 ); m_staticTextResistivity->SetToolTip( _("Specific resistance in ohms * meters") ); - fgSizerVS_Inputs->Add( m_staticTextResistivity, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextResistivity, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxBoxSizer* bSizerResistivity; bSizerResistivity = new wxBoxSizer( wxHORIZONTAL ); @@ -134,7 +134,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const bSizerResistivity->Add( m_textCtrlPlatingResistivity, 1, wxEXPAND|wxLEFT, 5 ); m_button_ResistivityVia = new wxButton( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizerResistivity->Add( m_button_ResistivityVia, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizerResistivity->Add( m_button_ResistivityVia, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizerVS_Inputs->Add( bSizerResistivity, 1, wxEXPAND, 5 ); @@ -147,7 +147,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextPermittivity->Wrap( -1 ); m_staticTextPermittivity->SetToolTip( _("Relative dielectric constant (epsilon r)") ); - fgSizerVS_Inputs->Add( m_staticTextPermittivity, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextPermittivity, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxBoxSizer* bSizerPermittivity; bSizerPermittivity = new wxBoxSizer( wxHORIZONTAL ); @@ -156,7 +156,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const bSizerPermittivity->Add( m_textCtrlPlatingPermittivity, 1, wxEXPAND|wxLEFT, 5 ); m_button_Permittivity = new wxButton( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizerPermittivity->Add( m_button_Permittivity, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizerPermittivity->Add( m_button_Permittivity, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizerVS_Inputs->Add( bSizerPermittivity, 1, wxEXPAND, 5 ); @@ -168,7 +168,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextTemperatureDiff->Wrap( -1 ); m_staticTextTemperatureDiff->SetToolTip( _("Maximum acceptable rise in temperature") ); - fgSizerVS_Inputs->Add( m_staticTextTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlTemperatureDiff = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -181,7 +181,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextRiseTime->Wrap( -1 ); m_staticTextRiseTime->SetToolTip( _("Pulse rise time to calculate reactance") ); - fgSizerVS_Inputs->Add( m_staticTextRiseTime, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextRiseTime, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlRiseTime = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlRiseTime, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -193,14 +193,14 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const fgSizerVS_Inputs->Add( m_staticTextRiseTimeUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - sbSizerVS_Inputs->Add( fgSizerVS_Inputs, 0, wxEXPAND, 5 ); + sbSizerVS_Inputs->Add( fgSizerVS_Inputs, 0, wxALL|wxEXPAND, 5 ); - bSizerViaLeftColumn->Add( sbSizerVS_Inputs, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizerViaLeftColumn->Add( sbSizerVS_Inputs, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticTextWarning = new wxStaticText( this, wxID_ANY, _("Warning:\nVia pad diameter >= Clearance hole diameter.\nSome parameters cannot be calculated for a via inside a copper zone."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextWarning->Wrap( -1 ); - m_staticTextWarning->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_staticTextWarning->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerViaLeftColumn->Add( m_staticTextWarning, 0, wxALL|wxEXPAND, 10 ); @@ -225,11 +225,11 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextArea11 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea11->Wrap( -1 ); - fgSizerTW_Results11->Add( m_staticTextArea11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticTextArea11, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ViaResistance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaResistance->Wrap( -1 ); - fgSizerTW_Results11->Add( m_ViaResistance, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_ViaResistance, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_viaResUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaResUnits->Wrap( -1 ); @@ -237,7 +237,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticText65111 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText65111->Wrap( -1 ); - fgSizerTW_Results11->Add( m_staticText65111, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticText65111, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ViaVoltageDrop = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaVoltageDrop->Wrap( -1 ); @@ -249,7 +249,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticText66111 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Power loss:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText66111->Wrap( -1 ); - fgSizerTW_Results11->Add( m_staticText66111, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticText66111, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ViaPowerLoss = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaPowerLoss->Wrap( -1 ); @@ -263,7 +263,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticText79211->Wrap( -1 ); m_staticText79211->SetToolTip( _("Using thermal conductivity value 401 Watts/(meter-Kelvin)") ); - fgSizerTW_Results11->Add( m_staticText79211, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticText79211, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ViaThermalResistance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaThermalResistance->Wrap( -1 ); @@ -277,7 +277,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextAmpacity->Wrap( -1 ); m_staticTextAmpacity->SetToolTip( _("Based on temperature rise") ); - fgSizerTW_Results11->Add( m_staticTextAmpacity, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticTextAmpacity, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ViaAmpacity = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaAmpacity->Wrap( -1 ); @@ -289,7 +289,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextCapacitance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Capacitance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCapacitance->Wrap( -1 ); - fgSizerTW_Results11->Add( m_staticTextCapacitance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticTextCapacitance, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_ViaCapacitance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaCapacitance->Wrap( -1 ); @@ -305,7 +305,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextRiseTimeOutput->Wrap( -1 ); m_staticTextRiseTimeOutput->SetToolTip( _("Rise time degradation for given Z0 and calculated capacitance") ); - fgSizerTW_Results11->Add( m_staticTextRiseTimeOutput, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticTextRiseTimeOutput, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_RiseTimeOutput = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_RiseTimeOutput->Wrap( -1 ); @@ -319,7 +319,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextInductance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Inductance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInductance->Wrap( -1 ); - fgSizerTW_Results11->Add( m_staticTextInductance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticTextInductance, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Inductance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Inductance->Wrap( -1 ); @@ -335,7 +335,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const m_staticTextReactance->Wrap( -1 ); m_staticTextReactance->SetToolTip( _("Inductive reactance for given rise time and calculated inductance") ); - fgSizerTW_Results11->Add( m_staticTextReactance, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizerTW_Results11->Add( m_staticTextReactance, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_Reactance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Reactance->Wrap( -1 ); @@ -346,7 +346,7 @@ PANEL_VIA_SIZE_BASE::PANEL_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const fgSizerTW_Results11->Add( m_viaReactanceUnits, 0, 0, 5 ); - sbSizerVS_Result->Add( fgSizerTW_Results11, 0, wxEXPAND|wxBOTTOM, 5 ); + sbSizerVS_Result->Add( fgSizerTW_Results11, 0, wxALL|wxEXPAND, 5 ); bSizer6->Add( sbSizerVS_Result, 0, wxALL, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_via_size_base.fbp b/pcb_calculator/calculator_panels/panel_via_size_base.fbp index b390f85113..65062a08b0 100644 --- a/pcb_calculator/calculator_panels/panel_via_size_base.fbp +++ b/pcb_calculator/calculator_panels/panel_via_size_base.fbp @@ -68,7 +68,7 @@ none 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -78,11 +78,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND + wxALL|wxEXPAND 0 - + 3 wxBOTH 1 @@ -96,7 +96,7 @@ 4 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -157,7 +157,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -222,7 +222,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 0 1 @@ -287,7 +287,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -348,7 +348,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -478,7 +478,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -539,7 +539,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -669,7 +669,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -730,7 +730,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -860,7 +860,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -921,7 +921,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1051,7 +1051,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1112,7 +1112,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1242,7 +1242,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1303,7 +1303,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1429,7 +1429,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1564,7 +1564,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1701,7 +1701,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -1836,7 +1836,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1922,7 +1922,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -2109,7 +2109,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -2392,11 +2392,11 @@ wxVERTICAL 1 none - + 5 - wxEXPAND|wxBOTTOM + wxALL|wxEXPAND 0 - + 3 wxBOTH 1 @@ -2410,7 +2410,7 @@ 5 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -2471,7 +2471,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2593,7 +2593,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -2776,7 +2776,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -2959,7 +2959,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3142,7 +3142,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3325,7 +3325,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3508,7 +3508,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3691,7 +3691,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 @@ -3874,7 +3874,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL 0 1 diff --git a/pcb_calculator/calculator_panels/panel_wavelength_base.cpp b/pcb_calculator/calculator_panels/panel_wavelength_base.cpp index 743cb429ce..3a77bb1d38 100644 --- a/pcb_calculator/calculator_panels/panel_wavelength_base.cpp +++ b/pcb_calculator/calculator_panels/panel_wavelength_base.cpp @@ -29,60 +29,60 @@ PANEL_WAVELENGTH_BASE::PANEL_WAVELENGTH_BASE( wxWindow* parent, wxWindowID id, c fgSizer3->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_frequencyCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_frequencyCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_frequencyCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_frequencyUnitChoices; m_frequencyUnit = new UNIT_SELECTOR_FREQUENCY( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_frequencyUnitChoices, 0 ); m_frequencyUnit->SetSelection( 0 ); - fgSizer3->Add( m_frequencyUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizer3->Add( m_frequencyUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticText181 = new wxStaticText( this, wxID_ANY, _("Period:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText181->Wrap( -1 ); fgSizer3->Add( m_staticText181, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_periodCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_periodCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_periodCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_periodUnitChoices; m_periodUnit = new UNIT_SELECTOR_TIME( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_periodUnitChoices, 0 ); m_periodUnit->SetSelection( 0 ); - fgSizer3->Add( m_periodUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizer3->Add( m_periodUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticText1811 = new wxStaticText( this, wxID_ANY, _("Wavelength in vacuum:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1811->Wrap( -1 ); fgSizer3->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_wavelengthVacuumCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_wavelengthVacuumCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_wavelengthVacuumCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_wavelengthVacuumUnitChoices; m_wavelengthVacuumUnit = new UNIT_SELECTOR_LEN_CABLE( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_wavelengthVacuumUnitChoices, 0 ); m_wavelengthVacuumUnit->SetSelection( 0 ); - fgSizer3->Add( m_wavelengthVacuumUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizer3->Add( m_wavelengthVacuumUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticText18111 = new wxStaticText( this, wxID_ANY, _("Wavelength in medium:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText18111->Wrap( -1 ); fgSizer3->Add( m_staticText18111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_wavelengthMediumCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_wavelengthMediumCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_wavelengthMediumCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_wavelengthMediumUnitChoices; m_wavelengthMediumUnit = new UNIT_SELECTOR_LEN_CABLE( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_wavelengthMediumUnitChoices, 0 ); m_wavelengthMediumUnit->SetSelection( 0 ); - fgSizer3->Add( m_wavelengthMediumUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizer3->Add( m_wavelengthMediumUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticText181112 = new wxStaticText( this, wxID_ANY, _("Speed in medium:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText181112->Wrap( -1 ); fgSizer3->Add( m_staticText181112, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_speedCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - fgSizer3->Add( m_speedCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_speedCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxArrayString m_speedUnitChoices; m_speedUnit = new UNIT_SELECTOR_SPEED( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_speedUnitChoices, 0 ); m_speedUnit->SetSelection( 0 ); - fgSizer3->Add( m_speedUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizer3->Add( m_speedUnit, 0, wxEXPAND|wxTOP, 5 ); m_staticText181111 = new wxStaticText( this, wxID_ANY, _("er:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText181111->Wrap( -1 ); @@ -91,10 +91,10 @@ PANEL_WAVELENGTH_BASE::PANEL_WAVELENGTH_BASE( wxWindow* parent, wxWindowID id, c fgSizer3->Add( m_staticText181111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_permittivityCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_permittivityCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_permittivityCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_button1 = new wxButton( this, wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_button1, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 5 ); + fgSizer3->Add( m_button1, 0, wxTOP, 5 ); m_staticText42 = new wxStaticText( this, wxID_ANY, _("mur:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText42->Wrap( -1 ); @@ -103,7 +103,7 @@ PANEL_WAVELENGTH_BASE::PANEL_WAVELENGTH_BASE( wxWindow* parent, wxWindowID id, c fgSizer3->Add( m_staticText42, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_permeabilityCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_permeabilityCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_permeabilityCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); bSizer4->Add( fgSizer3, 1, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_wavelength_base.fbp b/pcb_calculator/calculator_panels/panel_wavelength_base.fbp index a232eaf543..78a120105e 100644 --- a/pcb_calculator/calculator_panels/panel_wavelength_base.fbp +++ b/pcb_calculator/calculator_panels/panel_wavelength_base.fbp @@ -145,7 +145,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -210,7 +210,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -336,7 +336,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -401,7 +401,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -527,7 +527,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -592,7 +592,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -718,7 +718,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -783,7 +783,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -909,7 +909,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -973,7 +973,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxEXPAND|wxTOP 0 1 @@ -1099,7 +1099,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1164,7 +1164,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND + wxTOP 0 1 @@ -1299,7 +1299,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1