diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index 4e13ce5731..b4226c9f04 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -720,21 +720,39 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_EpsilonR_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_EpsilonR_label, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + wxBoxSizer* bSizer441; + bSizer441 = new wxBoxSizer( wxHORIZONTAL ); + m_Value_EpsilonR = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Value_EpsilonR, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + bSizer441->Add( m_Value_EpsilonR, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_button_EpsilonR = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - fgSizerSubstPrms->Add( m_button_EpsilonR, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer441->Add( m_button_EpsilonR, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_TanD_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("TanD:"), wxDefaultPosition, wxDefaultSize, 0 ); + + fgSizerSubstPrms->Add( bSizer441, 1, wxEXPAND, 5 ); + + + fgSizerSubstPrms->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_TanD_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Tan delta:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TanD_label->Wrap( -1 ); fgSizerSubstPrms->Add( m_TanD_label, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + wxBoxSizer* bSizer442; + bSizer442 = new wxBoxSizer( wxHORIZONTAL ); + m_Value_TanD = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Value_TanD, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizer442->Add( m_Value_TanD, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_button_TanD = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - fgSizerSubstPrms->Add( m_button_TanD, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer442->Add( m_button_TanD, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + + fgSizerSubstPrms->Add( bSizer442, 1, wxEXPAND, 5 ); + + + fgSizerSubstPrms->Add( 0, 0, 1, wxEXPAND, 5 ); m_Rho_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Rho:"), wxDefaultPosition, wxDefaultSize, 0 ); m_Rho_label->Wrap( -1 ); @@ -742,11 +760,20 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow fgSizerSubstPrms->Add( m_Rho_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 ); + wxBoxSizer* bSizer443; + bSizer443 = new wxBoxSizer( wxHORIZONTAL ); + m_Value_Rho = new wxTextCtrl( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerSubstPrms->Add( m_Value_Rho, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizer443->Add( m_Value_Rho, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_button_Rho = new wxButton( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - fgSizerSubstPrms->Add( m_button_Rho, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer443->Add( m_button_Rho, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + + fgSizerSubstPrms->Add( bSizer443, 1, wxEXPAND, 5 ); + + + fgSizerSubstPrms->Add( 0, 0, 1, wxEXPAND, 5 ); m_substrate_prm4_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("H:"), wxDefaultPosition, wxDefaultSize, 0 ); m_substrate_prm4_label->Wrap( -1 ); @@ -796,7 +823,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_SubsPrm7_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_substrate_prm8_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("mu insulator:"), wxDefaultPosition, wxDefaultSize, 0 ); + 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|wxALIGN_RIGHT|wxLEFT, 5 ); @@ -808,7 +835,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_SubsPrm8_choiceUnit->SetSelection( 0 ); fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_substrate_prm9_label = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("mu conductor:"), wxDefaultPosition, wxDefaultSize, 0 ); + 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|wxALIGN_RIGHT, 5 ); @@ -1126,7 +1153,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow 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|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1138,7 +1165,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow 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|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextPlatingThickness, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1152,7 +1179,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow 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|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextViaLength, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1166,7 +1193,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextViaPadDia->Wrap( -1 ); m_staticTextViaPadDia->SetToolTip( _("Diameter of pad surrounding via (annular ring)") ); - fgSizerVS_Inputs->Add( m_staticTextViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1180,7 +1207,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextClearanceDia->Wrap( -1 ); m_staticTextClearanceDia->SetToolTip( _("Diameter of clearance hole in ground plane(s)") ); - fgSizerVS_Inputs->Add( m_staticTextClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1194,7 +1221,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextImpedance->Wrap( -1 ); m_staticTextImpedance->SetToolTip( _("Characteristic impedance of conductor") ); - fgSizerVS_Inputs->Add( m_staticTextImpedance, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextImpedance, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1206,7 +1233,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow 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|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); + fgSizerVS_Inputs->Add( m_staticAppliedCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1215,35 +1242,54 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextAppliedCurrentUnits->Wrap( -1 ); fgSizerVS_Inputs->Add( m_staticTextAppliedCurrentUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_staticTextResistivity = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Plating resistivity (Ohm.m):"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextResistivity = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Plating resistivity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextResistivity->Wrap( -1 ); m_staticTextResistivity->SetToolTip( _("Specific resistance in ohms * meters") ); - fgSizerVS_Inputs->Add( m_staticTextResistivity, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextResistivity, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizer422; + bSizer422 = new wxBoxSizer( wxHORIZONTAL ); m_textCtrlPlatingResistivity = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlPlatingResistivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer422->Add( m_textCtrlPlatingResistivity, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT, 5 ); m_button_ResistivityVia = new wxButton( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - fgSizerVS_Inputs->Add( m_button_ResistivityVia, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizer422->Add( m_button_ResistivityVia, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_staticTextPermittivity = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Er:"), wxDefaultPosition, wxDefaultSize, 0 ); + + fgSizerVS_Inputs->Add( bSizer422, 1, wxEXPAND, 5 ); + + m_viaResistivityUnits = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("ohm-meter"), wxDefaultPosition, wxDefaultSize, 0 ); + m_viaResistivityUnits->Wrap( -1 ); + fgSizerVS_Inputs->Add( m_viaResistivityUnits, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextPermittivity = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Substrate relative permittivity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPermittivity->Wrap( -1 ); m_staticTextPermittivity->SetToolTip( _("Relative dielectric constant (epsilon r)") ); - fgSizerVS_Inputs->Add( m_staticTextPermittivity, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextPermittivity, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizer423; + bSizer423 = new wxBoxSizer( wxHORIZONTAL ); m_textCtrlPlatingPermittivity = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlPlatingPermittivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer423->Add( m_textCtrlPlatingPermittivity, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT, 5 ); m_button_Permittivity = new wxButton( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - fgSizerVS_Inputs->Add( m_button_Permittivity, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bSizer423->Add( m_button_Permittivity, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + + fgSizerVS_Inputs->Add( bSizer423, 1, wxEXPAND, 5 ); + + + fgSizerVS_Inputs->Add( 0, 0, 1, wxEXPAND, 5 ); m_staticTextTemperatureDiff = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Temperature rise:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTemperatureDiff->Wrap( -1 ); m_staticTextTemperatureDiff->SetToolTip( _("Maximum acceptable rise in temperature") ); - fgSizerVS_Inputs->Add( m_staticTextTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1256,7 +1302,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextRiseTime->Wrap( -1 ); m_staticTextRiseTime->SetToolTip( _("Pulse rise time to calculate reactance") ); - fgSizerVS_Inputs->Add( m_staticTextRiseTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); + fgSizerVS_Inputs->Add( m_staticTextRiseTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 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 ); @@ -1304,7 +1350,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ViaResistance->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaResistance, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_viaResUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_viaResUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaResUnits->Wrap( -1 ); fgSizerTW_Results11->Add( m_viaResUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); @@ -1414,7 +1460,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_Reactance->Wrap( -1 ); fgSizerTW_Results11->Add( m_Reactance, 0, wxRIGHT|wxLEFT, 5 ); - m_viaReactanceUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_viaReactanceUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaReactanceUnits->Wrap( -1 ); fgSizerTW_Results11->Add( m_viaReactanceUnits, 0, wxRIGHT, 5 ); @@ -1461,7 +1507,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticTextCurrent = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Current:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCurrent->Wrap( -1 ); - fgSizerTWprms->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|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 ); @@ -1472,7 +1518,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticText63 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Temperature rise:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText63->Wrap( -1 ); - fgSizerTWprms->Add( m_staticText63, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_staticText63, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|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 ); @@ -1483,7 +1529,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_staticText66 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Conductor length:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText66->Wrap( -1 ); - fgSizerTWprms->Add( m_staticText66, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerTWprms->Add( m_staticText66, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|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 ); @@ -1493,16 +1539,16 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_TW_CuLength_choiceUnit->SetSelection( 0 ); fgSizerTWprms->Add( m_TW_CuLength_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); - m_TWResistivity = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerTWprms->Add( m_TWResistivity, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - m_staticText103 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Resistivity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText103->Wrap( -1 ); - fgSizerTWprms->Add( m_staticText103, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + fgSizerTWprms->Add( m_staticText103, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM, 5 ); - m_resistivityUnits = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Ohm-meter"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TWResistivity = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerTWprms->Add( m_TWResistivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 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|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + fgSizerTWprms->Add( m_resistivityUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); sbSizerTW_Prms->Add( fgSizerTWprms, 0, wxEXPAND, 5 ); @@ -1583,7 +1629,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ExtTrackResistValue->Wrap( -1 ); fgSizerTW_Results->Add( m_ExtTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_extTrackResUnits = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_extTrackResUnits = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_extTrackResUnits->Wrap( -1 ); fgSizerTW_Results->Add( m_extTrackResUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); @@ -1681,7 +1727,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_IntTrackResistValue->Wrap( -1 ); fgSizerTW_Results1->Add( m_IntTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_intTrackResUnits = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_intTrackResUnits = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_intTrackResUnits->Wrap( -1 ); fgSizerTW_Results1->Add( m_intTrackResUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 68ea5d1f18..bf10ef41a4 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -7651,141 +7651,162 @@ -1 - + 5 - wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 + wxEXPAND + 1 + - 1 - m_Value_EpsilonR - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - + bSizer441 + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_Value_EpsilonR + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + ... + + 0 + + 0 + + + 0 + + 1 + m_button_EpsilonR + 1 + + + protected + 1 + + + + Resizable + 1 + + wxBU_EXACTFIT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnTranslineEpsilonR_Button + + - + 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - ... - - 0 - - 0 - - - 0 - - 1 - m_button_EpsilonR - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - - - Resizable - 1 - - wxBU_EXACTFIT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnTranslineEpsilonR_Button + 0 @@ -7820,7 +7841,7 @@ 0 0 wxID_ANY - TanD: + Tan delta: 0 0 @@ -7849,141 +7870,162 @@ -1 - + 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 + wxEXPAND + 1 + - 1 - m_Value_TanD - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - + bSizer442 + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_Value_TanD + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + ... + + 0 + + 0 + + + 0 + + 1 + m_button_TanD + 1 + + + protected + 1 + + + + Resizable + 1 + + wxBU_EXACTFIT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnTranslineTanD_Button + + - + 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - ... - - 0 - - 0 - - - 0 - - 1 - m_button_TanD - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - - - Resizable - 1 - - wxBU_EXACTFIT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnTranslineTanD_Button + 0 @@ -8047,141 +8089,162 @@ -1 - + 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 + wxEXPAND + 1 + - 1 - m_Value_Rho - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - + bSizer443 + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_Value_Rho + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + ... + + 0 + + 0 + + + 0 + + 1 + m_button_Rho + 1 + + + protected + 1 + + + + Resizable + 1 + + wxBU_EXACTFIT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnTranslineRho_Button + + - + 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - ... - - 0 - - 0 - - - 0 - - 1 - m_button_Rho - 1 - - + wxEXPAND + 1 + + 0 protected - 1 - - - - Resizable - 1 - - wxBU_EXACTFIT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnTranslineRho_Button + 0 @@ -8972,7 +9035,7 @@ 0 0 wxID_ANY - mu insulator: + Insulator mu: 0 0 @@ -9161,7 +9224,7 @@ 0 0 wxID_ANY - mu conductor: + Conductor mu: 0 0 @@ -12476,7 +12539,7 @@ 4 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -12667,7 +12730,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -12858,7 +12921,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -13049,7 +13112,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -13240,7 +13303,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -13431,7 +13494,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -13622,7 +13685,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -13809,7 +13872,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -13839,7 +13902,7 @@ 0 0 wxID_ANY - Plating resistivity (Ohm.m): + Plating resistivity: 0 0 @@ -13868,11 +13931,160 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND + 1 + + + bSizer422 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textCtrlPlatingResistivity + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnViaCalculate + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + ... + + 0 + + 0 + + + 0 + + 1 + m_button_ResistivityVia + 1 + + + protected + 1 + + + + Resizable + 1 + + wxBU_EXACTFIT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnViaRho_Button + + + + + + 5 + wxRIGHT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -13900,15 +14112,16 @@ 0 0 wxID_ANY + ohm-meter + 0 0 - 0 0 1 - m_textCtrlPlatingResistivity + m_viaResistivityUnits 1 @@ -13919,96 +14132,18 @@ 1 - + ; ; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - - - OnViaCalculate + -1 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - ... - - 0 - - 0 - - - 0 - - 1 - m_button_ResistivityVia - 1 - - - protected - 1 - - - - Resizable - 1 - - wxBU_EXACTFIT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnViaRho_Button - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -14038,7 +14173,7 @@ 0 0 wxID_ANY - Er: + Substrate relative permittivity: 0 0 @@ -14067,147 +14202,168 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 + wxEXPAND + 1 + - 1 - m_textCtrlPlatingPermittivity - 1 - - + bSizer423 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textCtrlPlatingPermittivity + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnViaCalculate + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + ... + + 0 + + 0 + + + 0 + + 1 + m_button_Permittivity + 1 + + + protected + 1 + + + + Resizable + 1 + + wxBU_EXACTFIT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnViaEpsilonR_Button + + + + + + 5 + wxEXPAND + 1 + + 0 protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnViaCalculate + 0 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - ... - - 0 - - 0 - - - 0 - - 1 - m_button_Permittivity - 1 - - - protected - 1 - - - - Resizable - 1 - - wxBU_EXACTFIT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnViaEpsilonR_Button - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -14394,7 +14550,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT 0 1 @@ -14838,7 +14994,7 @@ 0 0 wxID_ANY - Ohm + ohm 0 0 @@ -16302,7 +16458,7 @@ 0 0 wxID_ANY - Ohm + ohm 0 0 @@ -16485,7 +16641,7 @@ Track Width 0 - + 1 1 1 @@ -16536,16 +16692,16 @@ wxTAB_TRAVERSAL - + bSizerTrackWidth wxHORIZONTAL none - + 5 wxEXPAND 1 - + bSizeLeft wxVERTICAL @@ -16580,7 +16736,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM 0 1 @@ -16767,7 +16923,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM 0 1 @@ -16954,7 +17110,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM 0 1 @@ -17145,7 +17301,68 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Resistivity: + 0 + + 0 + + + 0 + + 1 + m_staticText103 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -17210,7 +17427,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -17240,68 +17457,7 @@ 0 0 wxID_ANY - Resistivity: - 0 - - 0 - - - 0 - - 1 - m_staticText103 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Ohm-meter + ohm-meter 0 0 @@ -17394,11 +17550,11 @@ - + 5 wxEXPAND 0 - + bSizeRight wxVERTICAL @@ -18324,7 +18480,7 @@ 0 0 wxID_ANY - Ohm + ohm 0 0 @@ -19644,7 +19800,7 @@ 0 0 wxID_ANY - Ohm + ohm 0 0 diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index 6ffffc7f9f..5d7dd9ebb2 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -265,6 +265,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER wxStaticText* m_staticTextResistivity; wxTextCtrl* m_textCtrlPlatingResistivity; wxButton* m_button_ResistivityVia; + wxStaticText* m_viaResistivityUnits; wxStaticText* m_staticTextPermittivity; wxTextCtrl* m_textCtrlPlatingPermittivity; wxButton* m_button_Permittivity; @@ -314,8 +315,8 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER wxStaticText* m_staticText66; wxTextCtrl* m_TrackLengthValue; UNIT_SELECTOR_LEN* m_TW_CuLength_choiceUnit; - wxTextCtrl* m_TWResistivity; wxStaticText* m_staticText103; + wxTextCtrl* m_TWResistivity; wxStaticText* m_resistivityUnits; wxHtmlWindow* m_htmlWinFormulas; wxStaticText* m_staticTextExtWidth; diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp index 572dfe14e8..b71106c051 100644 --- a/pcb_calculator/pcb_calculator_frame.cpp +++ b/pcb_calculator/pcb_calculator_frame.cpp @@ -96,12 +96,16 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_exclude1Units->SetLabel( wxT( "kΩ" ) ); m_exclude2Units->SetLabel( wxT( "kΩ" ) ); - m_trackTempUnits->SetLabel( wxT( "ºC" ) ); + m_EpsilonR_label->SetLabel( wxT( "εr" ) ); + + m_trackTempUnits->SetLabel( wxT( "°C" ) ); m_resistivityUnits->SetLabel( wxT( "Ω•m" ) ); - m_viaTempUnits->SetLabel( wxT( "ºC" ) ); + m_viaResistivityUnits->SetLabel( wxT( "Ω•m" ) ); + + m_viaTempUnits->SetLabel( wxT( "°C" ) ); m_viaResUnits->SetLabel( wxT( "Ω" ) ); - m_viaThermalResUnits->SetLabel( wxT( "ºC/W" ) ); + m_viaThermalResUnits->SetLabel( wxT( "°C/W" ) ); m_viaReactanceUnits->SetLabel( wxT( "Ω" ) ); m_extTrackResUnits->SetLabel( wxT( "Ω" ) ); diff --git a/pcb_calculator/transline_dlg_funct.cpp b/pcb_calculator/transline_dlg_funct.cpp index 98f01b3780..385f2081bd 100644 --- a/pcb_calculator/transline_dlg_funct.cpp +++ b/pcb_calculator/transline_dlg_funct.cpp @@ -221,15 +221,12 @@ void PCB_CALCULATOR_FRAME::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType // Setup messages wxStaticText* left_msg_list[] = { - m_left_message1, m_left_message2, m_left_message3, - m_left_message4, m_left_message5, m_left_message6, - m_left_message7, NULL + m_left_message1, m_left_message2, m_left_message3, m_left_message4, m_left_message5, + m_left_message6, m_left_message7, NULL }; wxStaticText* msg_list[] = { - m_Message1, m_Message2, m_Message3, - m_Message4, m_Message5, m_Message6, - m_Message7, NULL + m_Message1, m_Message2, m_Message3, m_Message4, m_Message5, m_Message6, m_Message7, NULL }; unsigned jj = 0; @@ -237,6 +234,7 @@ void PCB_CALCULATOR_FRAME::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType { if( left_msg_list[jj] == NULL ) break; + left_msg_list[jj]->SetLabel( tr_ident->m_Messages[jj] ); msg_list[jj]->SetLabel( wxEmptyString ); } @@ -248,35 +246,36 @@ void PCB_CALCULATOR_FRAME::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType jj++; } - // Init parameters dialog items + +// Init parameters dialog items struct DLG_PRM_DATA substrateprms[] = - { - { m_EpsilonR_label,m_Value_EpsilonR, NULL }, - { m_TanD_label,m_Value_TanD, NULL }, - { m_Rho_label, m_Value_Rho, NULL }, - { m_substrate_prm4_label, m_Substrate_prm4_Value, m_SubsPrm4_choiceUnit }, - { m_substrate_prm5_label, m_Substrate_prm5_Value, m_SubsPrm5_choiceUnit }, - { m_substrate_prm6_label, m_Substrate_prm6_Value, m_SubsPrm6_choiceUnit }, - { m_substrate_prm7_label, m_Substrate_prm7_Value, m_SubsPrm7_choiceUnit }, - { m_substrate_prm8_label, m_Substrate_prm8_Value, m_SubsPrm8_choiceUnit }, - { m_substrate_prm9_label, m_Substrate_prm9_Value, m_SubsPrm9_choiceUnit } - }; + { + { m_EpsilonR_label, m_Value_EpsilonR, NULL }, + { m_TanD_label, m_Value_TanD, NULL }, + { m_Rho_label, m_Value_Rho, NULL }, + { m_substrate_prm4_label, m_Substrate_prm4_Value, m_SubsPrm4_choiceUnit }, + { m_substrate_prm5_label, m_Substrate_prm5_Value, m_SubsPrm5_choiceUnit }, + { m_substrate_prm6_label, m_Substrate_prm6_Value, m_SubsPrm6_choiceUnit }, + { m_substrate_prm7_label, m_Substrate_prm7_Value, m_SubsPrm7_choiceUnit }, + { m_substrate_prm8_label, m_Substrate_prm8_Value, m_SubsPrm8_choiceUnit }, + { m_substrate_prm9_label, m_Substrate_prm9_Value, m_SubsPrm9_choiceUnit } + }; #define substrateprms_cnt (sizeof(substrateprms)/sizeof(substrateprms[0])) struct DLG_PRM_DATA physprms[] = - { - { m_phys_prm1_label, m_Phys_prm1_Value, m_choiceUnit_Param1 }, - { m_phys_prm2_label, m_Phys_prm2_Value, m_choiceUnit_Param2 }, - { m_phys_prm3_label, m_Phys_prm3_Value, m_choiceUnit_Param3 } - }; + { + { m_phys_prm1_label, m_Phys_prm1_Value, m_choiceUnit_Param1 }, + { m_phys_prm2_label, m_Phys_prm2_Value, m_choiceUnit_Param2 }, + { m_phys_prm3_label, m_Phys_prm3_Value, m_choiceUnit_Param3 } + }; #define physprms_cnt (sizeof(physprms)/sizeof(physprms[0])) struct DLG_PRM_DATA elecprms[] = - { - { m_elec_prm1_label, m_Elec_prm1_Value, m_choiceUnit_ElecPrm1 }, - { m_elec_prm2_label, m_Elec_prm2_Value, m_choiceUnit_ElecPrm2 }, - { m_elec_prm3_label, m_Elec_prm3_Value, m_choiceUnit_ElecPrm3 } - }; + { + { m_elec_prm1_label, m_Elec_prm1_Value, m_choiceUnit_ElecPrm1 }, + { m_elec_prm2_label, m_Elec_prm2_Value, m_choiceUnit_ElecPrm2 }, + { m_elec_prm3_label, m_Elec_prm3_Value, m_choiceUnit_ElecPrm3 } + }; #define elecprms_cnt (sizeof(elecprms)/sizeof(elecprms[0])) struct DLG_PRM_DATA frequencyprms[] = diff --git a/pcb_calculator/transline_ident.cpp b/pcb_calculator/transline_ident.cpp index 673436f9bb..e506e278de 100644 --- a/pcb_calculator/transline_ident.cpp +++ b/pcb_calculator/transline_ident.cpp @@ -117,18 +117,18 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) // Add common prms: // Default values are for FR4 AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, EPSILONR_PRM, - "Er", _( "Er" ), - _( "Epsilon R: substrate relative dielectric constant" ), + "Er", wxT( "εr" ), + _( "Substrate relative permittivity (dielectric constant)" ), 4.6, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TAND_PRM, - "TanD", _( "TanD" ), - _( "Tangent delta: dielectric loss factor." ), 2e-2, - false ) ); + "TanD", wxT( "tan δ" ), + _( "Dielectric loss (dissipation factor)" ), + 2e-2, false ) ); // Default value is for copper AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, RHO_PRM, - "Rho", _( "Rho" ), - _( "Electrical resistivity or specific electrical resistance of conductor (Ohm*meter)" ), + "Rho", wxT( "ρ" ), + _( "Electrical resistivity or specific electrical resistance of conductor (ohm*meter)" ), 1.72e-8, false ) ); // Default value is in GHz @@ -143,7 +143,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_TLine = new MICROSTRIP(); m_Icon = new wxBitmap( KiBitmap( microstrip_xpm ) ); - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Skin depth:" ) ); @@ -151,18 +151,18 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_PRM, "H", "H", _( "Height of substrate" ), 0.2, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_T_PRM, - "H_t", "H_t", _( "Height of box top" ), 1e20, true ) ); + "H_t", "H(top)", _( "Height of box top" ), 1e20, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM, "T", "T", _( "Strip thickness" ), 0.035, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM, - "Rough", _( "Rough" ), + "Rough", _( "Roughness" ), _( "Conductor roughness" ), 0.0, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM, - "mu Rel S",_( "mu substrate" ), + "mu Rel S", wxString::Format( wxT( "μ(%s)" ), _( "substrate" ) ), _( "Relative permeability (mu) of substrate" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C", _( "mu conductor" ), + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); @@ -183,7 +183,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_Icon = new wxBitmap( KiBitmap( cpw_xpm ) ); m_HasPrmSelection = true; - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Skin depth:" ) ); @@ -193,7 +193,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM, "T", "T", _( "Strip thickness" ), 0.035, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C", _( "mu conductor" ), + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); @@ -216,7 +216,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_Icon = new wxBitmap( KiBitmap( cpw_back_xpm ) ); m_HasPrmSelection = true; - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Skin depth:" ) ); @@ -226,7 +226,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM, "T", "T", _( "Strip thickness" ), 0.035, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C", "mu condutor", + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); @@ -251,17 +251,17 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_HasPrmSelection = true; m_Messages.Add( _( "ZF(H10) = Ey / Hx:" ) ); - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "TE-modes:" ) ); m_Messages.Add( _( "TM-modes:" ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM, - "mu Rel I",_( "mu insulator" ), + "mu Rel I", wxString::Format( wxT( "μ(%s)" ), _( "insulator" ) ), _( "Relative permeability (mu) of insulator" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C",_( "mu conductor" ), + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); @@ -284,24 +284,26 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_Icon = new wxBitmap( KiBitmap( coax_xpm ) ); m_HasPrmSelection = true; - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "TE-modes:" ) ); m_Messages.Add( _( "TM-modes:" ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM, - "mu Rel I", _( "mu insulator" ), + "mu Rel I", wxString::Format( wxT( "μ(%s)" ), _( "insulator" ) ), _( "Relative permeability (mu) of insulator" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C", _( "mu conductor" ), + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM, - "Din", _( "Din" ), _( "Inner diameter (conductor)" ), 1.0, true ) ); + "Din", _( "Din" ), + _( "Inner diameter (conductor)" ), 1.0, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_OUT_PRM, - "Dout", _( "Dout" ), _( "Outer diameter (insulator)" ), 8.0, true ) ); + "Dout", _( "Dout" ), + _( "Outer diameter (insulator)" ), 8.0, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM, "L", "L", _( "Line length" ), 50.0, true ) ); @@ -317,12 +319,12 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_Icon = new wxBitmap( KiBitmap( c_microstrip_xpm ) ); m_HasPrmSelection = true; - m_Messages.Add( _( "ErEff even:" ) ); - m_Messages.Add( _( "ErEff odd:" ) ); - m_Messages.Add( _( "Conductor losses even:" ) ); - m_Messages.Add( _( "Conductor losses odd:" ) ); - m_Messages.Add( _( "Dielectric losses even:" ) ); - m_Messages.Add( _( "Dielectric losses odd:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s (even):" ), wxT( "εr" ) ) ); + m_Messages.Add( wxString::Format( _( "Effective %s (odd):" ), wxT( "εr" ) ) ); + m_Messages.Add( _( "Conductor losses (even):" ) ); + m_Messages.Add( _( "Conductor losses (odd):" ) ); + m_Messages.Add( _( "Dielectric losses (even):" ) ); + m_Messages.Add( _( "Dielectric losses (odd):" ) ); m_Messages.Add( _( "Skin depth:" ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_PRM, @@ -332,9 +334,10 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM, "T", "T", _( "Strip thickness" ), 0.035, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM, - "Rough", _( "Rough" ), _( "Conductor roughness" ), 0.0, true ) ); + "Rough", _( "Roughness" ), + _( "Conductor roughness" ), 0.0, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu rel C", _( "mu conductor" ), + "mu rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); @@ -360,7 +363,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_TLine = new STRIPLINE(); m_Icon = new wxBitmap( KiBitmap( stripline_xpm ) ); - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Skin depth:" ) ); @@ -373,7 +376,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM, "T", "T", _( "Strip thickness" ), 0.035, true ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C", _( "mu conductor" ), + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, @@ -393,7 +396,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) m_Icon = new wxBitmap( KiBitmap( twistedpair_xpm ) ); m_HasPrmSelection = true; - m_Messages.Add( _( "ErEff:" ) ); + m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) ); m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Skin depth:" ) ); @@ -402,11 +405,11 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType ) "Twists", _( "Twists" ), _( "Number of twists per length" ), 0.0, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, - "mu Rel C", _( "mu conductor" ), + "mu Rel C", wxString::Format( wxT( "μ(%s)" ), _( "conductor" ) ), _( "Relative permeability (mu) of conductor" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_EPSILONR_ENV_PRM, - "ErEnv", _( "ErEnv" ), + "ErEnv", wxString::Format( wxT( "εr(%s)" ), _( "environment" ) ), _( "Relative permittivity of environment" ), 1, false ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM, diff --git a/pcb_calculator/widgets/unit_selector.cpp b/pcb_calculator/widgets/unit_selector.cpp index 814a14b0c3..c454c0d45b 100644 --- a/pcb_calculator/widgets/unit_selector.cpp +++ b/pcb_calculator/widgets/unit_selector.cpp @@ -63,12 +63,12 @@ UNIT_SELECTOR_THICKNESS::UNIT_SELECTOR_THICKNESS( wxWindow *parent, wxWindowID i const wxArrayString& choices, long style ) : UNIT_SELECTOR( parent, id, pos, size, choices, style ) { - Append( _( "mm" ) ); - Append( _( "um" ) ); - Append( _( "cm" ) ); - Append( _( "mil" ) ); - Append( _( "inch" ) ); - Append( _( "oz/ft^2" ) ); + Append( wxT( "mm" ) ); + Append( wxT( "µm" ) ); + Append( wxT( "cm" ) ); + Append( wxT( "mil" ) ); + Append( wxT( "inch" ) ); + Append( wxT( "oz/ft²" ) ); } @@ -151,8 +151,8 @@ UNIT_SELECTOR_RESISTOR::UNIT_SELECTOR_RESISTOR( wxWindow *parent, wxWindowID id, const wxArrayString& choices, long style ) : UNIT_SELECTOR( parent, id, pos, size, choices, style ) { - Append( _( "Ohm" ) ); - Append( _( "kOhm" ) ); + Append( _( "Ω" ) ); + Append( _( "kΩ" ) ); }