haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix degree symbol. 

And then go on and do a boatload more fixes for correct units usage.
This commit is contained in:
Jeff Young 2021-02-15 15:59:19 +00:00
parent 8745691da3
commit 29a1ded508
7 changed files with 1023 additions and 814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
pcb_calculator/dialogs/pcb_calculator_frame_base.cpp
View File

@ -720,21 +720,39 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_EpsilonR_label->Wrap( -1 ); m_EpsilonR_label->Wrap( -1 );
fgSizerSubstPrms->Add( m_EpsilonR_label, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); 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 ); 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 ); 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 ); m_TanD_label->Wrap( -1 );
fgSizerSubstPrms->Add( m_TanD_label, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); 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 ); 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 ); 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 = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("Rho:"), wxDefaultPosition, wxDefaultSize, 0 );
m_Rho_label->Wrap( -1 ); 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 ); 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 ); 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 ); 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 = new wxStaticText( sbSubstrateBoxSizer->GetStaticBox(), wxID_ANY, _("H:"), wxDefaultPosition, wxDefaultSize, 0 );
m_substrate_prm4_label->Wrap( -1 ); 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 ); m_SubsPrm7_choiceUnit->SetSelection( 0 );
fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); 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 ); m_substrate_prm8_label->Wrap( -1 );
fgSizerSubstPrms->Add( m_substrate_prm8_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 ); 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 ); m_SubsPrm8_choiceUnit->SetSelection( 0 );
fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); 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 ); m_substrate_prm9_label->Wrap( -1 );
fgSizerSubstPrms->Add( m_substrate_prm9_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); 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->Wrap( -1 );
m_staticTextHoleDia->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); 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 ); 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, 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 = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Plating thickness (T):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextPlatingThickness->Wrap( -1 ); 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 ); 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, 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->Wrap( -1 );
m_staticTextViaLength->SetToolTip( _("Via length is the board thickness for through hole vias") ); 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 ); 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, 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->Wrap( -1 );
m_staticTextViaPadDia->SetToolTip( _("Diameter of pad surrounding via (annular ring)") ); 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 ); 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, 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->Wrap( -1 );
m_staticTextClearanceDia->SetToolTip( _("Diameter of clearance hole in ground plane(s)") ); 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 ); 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, 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->Wrap( -1 );
m_staticTextImpedance->SetToolTip( _("Characteristic impedance of conductor") ); 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 ); 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, 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 = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Applied current:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticAppliedCurrent->Wrap( -1 ); 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 ); 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, 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 ); m_staticTextAppliedCurrentUnits->Wrap( -1 );
fgSizerVS_Inputs->Add( m_staticTextAppliedCurrentUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); 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->Wrap( -1 );
m_staticTextResistivity->SetToolTip( _("Specific resistance in ohms * meters") ); 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 ); 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 ); 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->Wrap( -1 );
m_staticTextPermittivity->SetToolTip( _("Relative dielectric constant (epsilon r)") ); 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 ); 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 ); 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 = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Temperature rise:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextTemperatureDiff->Wrap( -1 ); m_staticTextTemperatureDiff->Wrap( -1 );
m_staticTextTemperatureDiff->SetToolTip( _("Maximum acceptable rise in temperature") ); 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 ); 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 ); 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->Wrap( -1 );
m_staticTextRiseTime->SetToolTip( _("Pulse rise time to calculate reactance") ); 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 ); 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 ); 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 ); 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|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 ); m_viaResUnits->Wrap( -1 );
fgSizerTW_Results11->Add( m_viaResUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); 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 ); m_Reactance->Wrap( -1 );
fgSizerTW_Results11->Add( m_Reactance, 0, wxRIGHT|wxLEFT, 5 ); 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 ); m_viaReactanceUnits->Wrap( -1 );
fgSizerTW_Results11->Add( m_viaReactanceUnits, 0, wxRIGHT, 5 ); 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 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Current:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextCurrent->Wrap( -1 ); 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 ); 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, 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 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Temperature rise:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText63->Wrap( -1 ); 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 ); 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, 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 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Conductor length:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText66->Wrap( -1 ); 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 ); 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, 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 ); m_TW_CuLength_choiceUnit->SetSelection( 0 );
fgSizerTWprms->Add( m_TW_CuLength_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); 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 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Resistivity:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText103->Wrap( -1 ); 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 ); 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 ); 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 ); m_ExtTrackResistValue->Wrap( -1 );
fgSizerTW_Results->Add( m_ExtTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); 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 ); m_extTrackResUnits->Wrap( -1 );
fgSizerTW_Results->Add( m_extTrackResUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); 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 ); m_IntTrackResistValue->Wrap( -1 );
fgSizerTW_Results1->Add( m_IntTrackResistValue, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); 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 ); m_intTrackResUnits->Wrap( -1 );
fgSizerTW_Results1->Add( m_intTrackResUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); fgSizerTW_Results1->Add( m_intTrackResUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );

1552
pcb_calculator/dialogs/pcb_calculator_frame_base.fbp
View File

File diff suppressed because it is too large Load Diff

3
pcb_calculator/dialogs/pcb_calculator_frame_base.h
View File

@ -265,6 +265,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxStaticText* m_staticTextResistivity; wxStaticText* m_staticTextResistivity;
wxTextCtrl* m_textCtrlPlatingResistivity; wxTextCtrl* m_textCtrlPlatingResistivity;
wxButton* m_button_ResistivityVia; wxButton* m_button_ResistivityVia;
wxStaticText* m_viaResistivityUnits;
wxStaticText* m_staticTextPermittivity; wxStaticText* m_staticTextPermittivity;
wxTextCtrl* m_textCtrlPlatingPermittivity; wxTextCtrl* m_textCtrlPlatingPermittivity;
wxButton* m_button_Permittivity; wxButton* m_button_Permittivity;
@ -314,8 +315,8 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxStaticText* m_staticText66; wxStaticText* m_staticText66;
wxTextCtrl* m_TrackLengthValue; wxTextCtrl* m_TrackLengthValue;
UNIT_SELECTOR_LEN* m_TW_CuLength_choiceUnit; UNIT_SELECTOR_LEN* m_TW_CuLength_choiceUnit;
wxTextCtrl* m_TWResistivity;
wxStaticText* m_staticText103; wxStaticText* m_staticText103;
wxTextCtrl* m_TWResistivity;
wxStaticText* m_resistivityUnits; wxStaticText* m_resistivityUnits;
wxHtmlWindow* m_htmlWinFormulas; wxHtmlWindow* m_htmlWinFormulas;
wxStaticText* m_staticTextExtWidth; wxStaticText* m_staticTextExtWidth;

10
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -96,12 +96,16 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_exclude1Units->SetLabel( wxT( "kΩ" ) ); m_exclude1Units->SetLabel( wxT( "kΩ" ) );
m_exclude2Units->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_resistivityUnits->SetLabel( wxT( "Ω•m" ) );
m_viaTempUnits->SetLabel( wxT( "ºC" ) ); m_viaResistivityUnits->SetLabel( wxT( "Ω•m" ) );
m_viaTempUnits->SetLabel( wxT( "°C" ) );
m_viaResUnits->SetLabel( wxT( "Ω" ) ); m_viaResUnits->SetLabel( wxT( "Ω" ) );
m_viaThermalResUnits->SetLabel( wxT( "ºC/W" ) ); m_viaThermalResUnits->SetLabel( wxT( "°C/W" ) );
m_viaReactanceUnits->SetLabel( wxT( "Ω" ) ); m_viaReactanceUnits->SetLabel( wxT( "Ω" ) );
m_extTrackResUnits->SetLabel( wxT( "Ω" ) ); m_extTrackResUnits->SetLabel( wxT( "Ω" ) );

55
pcb_calculator/transline_dlg_funct.cpp
View File

@ -221,15 +221,12 @@ void PCB_CALCULATOR_FRAME::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType
// Setup messages // Setup messages
wxStaticText* left_msg_list[] = wxStaticText* left_msg_list[] =
{ {
m_left_message1, m_left_message2, m_left_message3, m_left_message1, m_left_message2, m_left_message3, m_left_message4, m_left_message5,
m_left_message4, m_left_message5, m_left_message6, m_left_message6, m_left_message7, NULL
m_left_message7, NULL
}; };
wxStaticText* msg_list[] = wxStaticText* msg_list[] =
{ {
m_Message1, m_Message2, m_Message3, m_Message1, m_Message2, m_Message3, m_Message4, m_Message5, m_Message6, m_Message7, NULL
m_Message4, m_Message5, m_Message6,
m_Message7, NULL
}; };
unsigned jj = 0; unsigned jj = 0;
@ -237,6 +234,7 @@ void PCB_CALCULATOR_FRAME::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType
{ {
if( left_msg_list[jj] == NULL ) if( left_msg_list[jj] == NULL )
break; break;
left_msg_list[jj]->SetLabel( tr_ident->m_Messages[jj] ); left_msg_list[jj]->SetLabel( tr_ident->m_Messages[jj] );
msg_list[jj]->SetLabel( wxEmptyString ); msg_list[jj]->SetLabel( wxEmptyString );
} }
@ -248,35 +246,36 @@ void PCB_CALCULATOR_FRAME::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType
jj++; jj++;
} }
// Init parameters dialog items
// Init parameters dialog items
struct DLG_PRM_DATA substrateprms[] = struct DLG_PRM_DATA substrateprms[] =
{ {
{ m_EpsilonR_label,m_Value_EpsilonR, NULL }, { m_EpsilonR_label, m_Value_EpsilonR, NULL },
{ m_TanD_label,m_Value_TanD, NULL }, { m_TanD_label, m_Value_TanD, NULL },
{ m_Rho_label, m_Value_Rho, NULL }, { m_Rho_label, m_Value_Rho, NULL },
{ m_substrate_prm4_label, m_Substrate_prm4_Value, m_SubsPrm4_choiceUnit }, { m_substrate_prm4_label, m_Substrate_prm4_Value, m_SubsPrm4_choiceUnit },
{ m_substrate_prm5_label, m_Substrate_prm5_Value, m_SubsPrm5_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_prm6_label, m_Substrate_prm6_Value, m_SubsPrm6_choiceUnit },
{ m_substrate_prm7_label, m_Substrate_prm7_Value, m_SubsPrm7_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_prm8_label, m_Substrate_prm8_Value, m_SubsPrm8_choiceUnit },
{ m_substrate_prm9_label, m_Substrate_prm9_Value, m_SubsPrm9_choiceUnit } { m_substrate_prm9_label, m_Substrate_prm9_Value, m_SubsPrm9_choiceUnit }
}; };
#define substrateprms_cnt (sizeof(substrateprms)/sizeof(substrateprms[0])) #define substrateprms_cnt (sizeof(substrateprms)/sizeof(substrateprms[0]))
struct DLG_PRM_DATA physprms[] = struct DLG_PRM_DATA physprms[] =
{ {
{ m_phys_prm1_label, m_Phys_prm1_Value, m_choiceUnit_Param1 }, { m_phys_prm1_label, m_Phys_prm1_Value, m_choiceUnit_Param1 },
{ m_phys_prm2_label, m_Phys_prm2_Value, m_choiceUnit_Param2 }, { m_phys_prm2_label, m_Phys_prm2_Value, m_choiceUnit_Param2 },
{ m_phys_prm3_label, m_Phys_prm3_Value, m_choiceUnit_Param3 } { m_phys_prm3_label, m_Phys_prm3_Value, m_choiceUnit_Param3 }
}; };
#define physprms_cnt (sizeof(physprms)/sizeof(physprms[0])) #define physprms_cnt (sizeof(physprms)/sizeof(physprms[0]))
struct DLG_PRM_DATA elecprms[] = struct DLG_PRM_DATA elecprms[] =
{ {
{ m_elec_prm1_label, m_Elec_prm1_Value, m_choiceUnit_ElecPrm1 }, { m_elec_prm1_label, m_Elec_prm1_Value, m_choiceUnit_ElecPrm1 },
{ m_elec_prm2_label, m_Elec_prm2_Value, m_choiceUnit_ElecPrm2 }, { m_elec_prm2_label, m_Elec_prm2_Value, m_choiceUnit_ElecPrm2 },
{ m_elec_prm3_label, m_Elec_prm3_Value, m_choiceUnit_ElecPrm3 } { m_elec_prm3_label, m_Elec_prm3_Value, m_choiceUnit_ElecPrm3 }
}; };
#define elecprms_cnt (sizeof(elecprms)/sizeof(elecprms[0])) #define elecprms_cnt (sizeof(elecprms)/sizeof(elecprms[0]))
struct DLG_PRM_DATA frequencyprms[] = struct DLG_PRM_DATA frequencyprms[] =

77
pcb_calculator/transline_ident.cpp
View File

@ -117,18 +117,18 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
// Add common prms: // Add common prms:
// Default values are for FR4 // Default values are for FR4
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, EPSILONR_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, EPSILONR_PRM,
"Er", _( "Er" ), "Er", wxT( "εr" ),
_( "Epsilon R: substrate relative dielectric constant" ), _( "Substrate relative permittivity (dielectric constant)" ),
4.6, false ) ); 4.6, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TAND_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TAND_PRM,
"TanD", _( "TanD" ), "TanD", wxT( "tan δ" ),
_( "Tangent delta: dielectric loss factor." ), 2e-2, _( "Dielectric loss (dissipation factor)" ),
false ) ); 2e-2, false ) );
// Default value is for copper // Default value is for copper
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, RHO_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, RHO_PRM,
"Rho", _( "Rho" ), "Rho", wxT( "ρ" ),
_( "Electrical resistivity or specific electrical resistance of conductor (Ohm*meter)" ), _( "Electrical resistivity or specific electrical resistance of conductor (ohm*meter)" ),
1.72e-8, false ) ); 1.72e-8, false ) );
// Default value is in GHz // Default value is in GHz
@ -143,7 +143,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_TLine = new MICROSTRIP(); m_TLine = new MICROSTRIP();
m_Icon = new wxBitmap( KiBitmap( microstrip_xpm ) ); 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( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "Skin depth:" ) ); 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_PRM,
"H", "H", _( "Height of substrate" ), 0.2, true ) ); "H", "H", _( "Height of substrate" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_T_PRM, 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
"T", "T", "T", "T",
_( "Strip thickness" ), 0.035, true ) ); _( "Strip thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM,
"Rough", _( "Rough" ), "Rough", _( "Roughness" ),
_( "Conductor roughness" ), 0.0, true ) ); _( "Conductor roughness" ), 0.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM, 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 ) ); _( "Relative permeability (mu) of substrate" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
@ -183,7 +183,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Icon = new wxBitmap( KiBitmap( cpw_xpm ) ); m_Icon = new wxBitmap( KiBitmap( cpw_xpm ) );
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) );
m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "Skin depth:" ) ); 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
"T", "T", _( "Strip thickness" ), 0.035, true ) ); "T", "T", _( "Strip thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
@ -216,7 +216,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Icon = new wxBitmap( KiBitmap( cpw_back_xpm ) ); m_Icon = new wxBitmap( KiBitmap( cpw_back_xpm ) );
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) );
m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "Skin depth:" ) ); 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
"T", "T", _( "Strip thickness" ), 0.035, true ) ); "T", "T", _( "Strip thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
@ -251,17 +251,17 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ZF(H10) = Ey / Hx:" ) ); 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( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "TE-modes:" ) ); m_Messages.Add( _( "TE-modes:" ) );
m_Messages.Add( _( "TM-modes:" ) ); m_Messages.Add( _( "TM-modes:" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM, 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 ) ); _( "Relative permeability (mu) of insulator" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
@ -284,24 +284,26 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Icon = new wxBitmap( KiBitmap( coax_xpm ) ); m_Icon = new wxBitmap( KiBitmap( coax_xpm ) );
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) );
m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "TE-modes:" ) ); m_Messages.Add( _( "TE-modes:" ) );
m_Messages.Add( _( "TM-modes:" ) ); m_Messages.Add( _( "TM-modes:" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM, 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 ) ); _( "Relative permeability (mu) of insulator" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM, 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, 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM,
"L", "L", _( "Line length" ), 50.0, true ) ); "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_Icon = new wxBitmap( KiBitmap( c_microstrip_xpm ) );
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff even:" ) ); m_Messages.Add( wxString::Format( _( "Effective %s (even):" ), wxT( "εr" ) ) );
m_Messages.Add( _( "ErEff odd:" ) ); m_Messages.Add( wxString::Format( _( "Effective %s (odd):" ), wxT( "εr" ) ) );
m_Messages.Add( _( "Conductor losses even:" ) ); m_Messages.Add( _( "Conductor losses (even):" ) );
m_Messages.Add( _( "Conductor losses odd:" ) ); m_Messages.Add( _( "Conductor losses (odd):" ) );
m_Messages.Add( _( "Dielectric losses even:" ) ); m_Messages.Add( _( "Dielectric losses (even):" ) );
m_Messages.Add( _( "Dielectric losses odd:" ) ); m_Messages.Add( _( "Dielectric losses (odd):" ) );
m_Messages.Add( _( "Skin depth:" ) ); m_Messages.Add( _( "Skin depth:" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_PRM, 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
"T", "T", _( "Strip thickness" ), 0.035, true ) ); "T", "T", _( "Strip thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM, 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, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
@ -360,7 +363,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_TLine = new STRIPLINE(); m_TLine = new STRIPLINE();
m_Icon = new wxBitmap( KiBitmap( stripline_xpm ) ); 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( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "Skin depth:" ) ); 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, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
"T", "T", _( "Strip thickness" ), 0.035, true ) ); "T", "T", _( "Strip thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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 ) ); _( "Relative permeability (mu) of conductor" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, 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_Icon = new wxBitmap( KiBitmap( twistedpair_xpm ) );
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( wxString::Format( _( "Effective %s:" ), wxT( "εr" ) ) );
m_Messages.Add( _( "Conductor losses:" ) ); m_Messages.Add( _( "Conductor losses:" ) );
m_Messages.Add( _( "Dielectric losses:" ) ); m_Messages.Add( _( "Dielectric losses:" ) );
m_Messages.Add( _( "Skin depth:" ) ); m_Messages.Add( _( "Skin depth:" ) );
@ -402,11 +405,11 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
"Twists", _( "Twists" ), "Twists", _( "Twists" ),
_( "Number of twists per length" ), 0.0, false ) ); _( "Number of twists per length" ), 0.0, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM, 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, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_EPSILONR_ENV_PRM, 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, _( "Relative permittivity of environment" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM,

16
pcb_calculator/widgets/unit_selector.cpp
View File

@ -63,12 +63,12 @@ UNIT_SELECTOR_THICKNESS::UNIT_SELECTOR_THICKNESS( wxWindow *parent, wxWindowID i
const wxArrayString& choices, long style ) const wxArrayString& choices, long style )
: UNIT_SELECTOR( parent, id, pos, size, choices, style ) : UNIT_SELECTOR( parent, id, pos, size, choices, style )
{ {
Append( _( "mm" ) ); Append( wxT( "mm" ) );
Append( _( "um" ) ); Append( wxT( "µm" ) );
Append( _( "cm" ) ); Append( wxT( "cm" ) );
Append( _( "mil" ) ); Append( wxT( "mil" ) );
Append( _( "inch" ) ); Append( wxT( "inch" ) );
Append( _( "oz/ft^2" ) ); Append( wxT( "oz/ft²" ) );
} }
@ -151,8 +151,8 @@ UNIT_SELECTOR_RESISTOR::UNIT_SELECTOR_RESISTOR( wxWindow *parent, wxWindowID id,
const wxArrayString& choices, long style ) const wxArrayString& choices, long style )
: UNIT_SELECTOR( parent, id, pos, size, choices, style ) : UNIT_SELECTOR( parent, id, pos, size, choices, style )
{ {
Append( _( "Ohm" ) ); Append( _( "Ω" ) );
Append( _( "kOhm" ) ); Append( _( "kΩ" ) );
} }