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

Fix a lot of GUI guideline issues in PCB Calculator. 

Colons, capitalization, spacing, etc.

Also fixes another bitmap refresh bug on OSX.
This commit is contained in:
Jeff Young 2021-02-13 16:12:52 +00:00
parent 3f9841355d
commit 25f621e880
5 changed files with 2877 additions and 2768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

411
pcb_calculator/dialogs/pcb_calculator_frame_base.cpp
View File

File diff suppressed because it is too large Load Diff

4974
pcb_calculator/dialogs/pcb_calculator_frame_base.fbp
View File

File diff suppressed because it is too large Load Diff

24
pcb_calculator/dialogs/pcb_calculator_frame_base.h
View File

@ -19,22 +19,20 @@ class UNIT_SELECTOR_THICKNESS;
#include "widgets/unit_selector.h" #include "widgets/unit_selector.h"
#include "kiway_player.h" #include "kiway_player.h"
#include <wx/string.h> #include <wx/string.h>
#include <wx/menu.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/statusbr.h> #include <wx/choice.h>
#include <wx/sizer.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/statbmp.h> #include <wx/statbmp.h>
#include <wx/stattext.h>
#include <wx/sizer.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/radiobut.h> #include <wx/radiobut.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/choice.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/radiobox.h> #include <wx/radiobox.h>
@ -56,10 +54,10 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
private: private:
protected: protected:
wxMenuBar* m_menubar;
wxStatusBar* m_statusBar;
wxNotebook* m_Notebook; wxNotebook* m_Notebook;
wxPanel* m_panelRegulators; wxPanel* m_panelRegulators;
wxStaticText* m_staticTextRegType;
wxChoice* m_choiceRegType;
wxStaticBitmap* m_bitmapRegul4pins; wxStaticBitmap* m_bitmapRegul4pins;
wxStaticBitmap* m_bitmapRegul3pins; wxStaticBitmap* m_bitmapRegul3pins;
wxStaticText* m_RegulFormula; wxStaticText* m_RegulFormula;
@ -81,10 +79,9 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxStaticText* m_RegulIadjTitle; wxStaticText* m_RegulIadjTitle;
wxTextCtrl* m_RegulIadjValue; wxTextCtrl* m_RegulIadjValue;
wxStaticText* m_IadjUnitLabel; wxStaticText* m_IadjUnitLabel;
wxStaticText* m_staticTextRegType;
wxChoice* m_choiceRegType;
wxButton* m_buttonCalculate; wxButton* m_buttonCalculate;
wxButton* m_buttonRegulReset; wxButton* m_buttonRegulReset;
wxStaticText* m_RegulMessage;
wxChoice* m_choiceRegulatorSelector; wxChoice* m_choiceRegulatorSelector;
wxStaticText* m_staticTextRegFile; wxStaticText* m_staticTextRegFile;
wxTextCtrl* m_regulators_fileNameCtrl; wxTextCtrl* m_regulators_fileNameCtrl;
@ -92,7 +89,6 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxButton* m_buttonEditItem; wxButton* m_buttonEditItem;
wxButton* m_buttonAddItem; wxButton* m_buttonAddItem;
wxButton* m_buttonRemoveItem; wxButton* m_buttonRemoveItem;
wxStaticText* m_RegulMessage;
wxPanel* m_panelAttenuators; wxPanel* m_panelAttenuators;
wxRadioBox* m_AttenuatorsSelection; wxRadioBox* m_AttenuatorsSelection;
wxStaticBitmap* m_attenuatorBitmap; wxStaticBitmap* m_attenuatorBitmap;
@ -169,7 +165,6 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxPanel* m_panelTransline; wxPanel* m_panelTransline;
wxRadioBox* m_TranslineSelection; wxRadioBox* m_TranslineSelection;
wxStaticBitmap* m_translineBitmap; wxStaticBitmap* m_translineBitmap;
wxStaticLine* m_staticline1;
wxStaticText* m_EpsilonR_label; wxStaticText* m_EpsilonR_label;
wxTextCtrl* m_Value_EpsilonR; wxTextCtrl* m_Value_EpsilonR;
wxButton* m_button_EpsilonR; wxButton* m_button_EpsilonR;
@ -277,7 +272,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxStaticText* m_staticTextRiseTime; wxStaticText* m_staticTextRiseTime;
wxTextCtrl* m_textCtrlRiseTime; wxTextCtrl* m_textCtrlRiseTime;
wxStaticText* m_staticTextRiseTimeUnits; wxStaticText* m_staticTextRiseTimeUnits;
wxStaticBitmap* m_viaBitmap; wxStaticText* m_staticTextWarning;
wxStaticText* m_staticTextArea11; wxStaticText* m_staticTextArea11;
wxStaticText* m_ViaResistance; wxStaticText* m_ViaResistance;
wxStaticText* m_IntTrackAreaUnitLabel1; wxStaticText* m_IntTrackAreaUnitLabel1;
@ -305,7 +300,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxStaticText* m_staticTextReactance; wxStaticText* m_staticTextReactance;
wxStaticText* m_Reactance; wxStaticText* m_Reactance;
wxStaticText* m_staticTextReactanceUnits; wxStaticText* m_staticTextReactanceUnits;
wxStaticText* m_staticTextWarning; wxStaticBitmap* m_viaBitmap;
wxButton* m_buttonViaReset; wxButton* m_buttonViaReset;
wxPanel* m_panelTrackWidth; wxPanel* m_panelTrackWidth;
wxStaticText* m_staticTextCurrent; wxStaticText* m_staticTextCurrent;
@ -348,6 +343,9 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
wxStaticText* m_staticText652; wxStaticText* m_staticText652;
wxTextCtrl* m_IntTrackThicknessValue; wxTextCtrl* m_IntTrackThicknessValue;
UNIT_SELECTOR_THICKNESS* m_IntTrackThicknessUnit; UNIT_SELECTOR_THICKNESS* m_IntTrackThicknessUnit;
wxStaticLine* m_staticline8;
wxStaticLine* m_staticline9;
wxStaticLine* m_staticline10;
wxStaticText* m_staticTextArea1; wxStaticText* m_staticTextArea1;
wxStaticText* m_IntTrackAreaValue; wxStaticText* m_IntTrackAreaValue;
wxStaticText* m_IntTrackAreaUnitLabel; wxStaticText* m_IntTrackAreaUnitLabel;

1
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -170,6 +170,7 @@ void PCB_CALCULATOR_FRAME::OnUpdateUI( wxUpdateUIEvent& event )
ToleranceSelection( m_rbToleranceSelection->GetSelection() ); ToleranceSelection( m_rbToleranceSelection->GetSelection() );
m_viaBitmap->SetBitmap( KiBitmap( viacalc_xpm ) ); m_viaBitmap->SetBitmap( KiBitmap( viacalc_xpm ) );
m_attenuatorBitmap->SetBitmap( *m_currAttenuator->m_SchBitMap );
m_bitmapRegul3pins->SetBitmap( KiBitmap( regul_3pins_xpm ) ); m_bitmapRegul3pins->SetBitmap( KiBitmap( regul_3pins_xpm ) );
m_bitmapRegul4pins->SetBitmap( KiBitmap( regul_xpm ) ); m_bitmapRegul4pins->SetBitmap( KiBitmap( regul_xpm ) );

235
pcb_calculator/transline_ident.cpp
View File

@ -144,38 +144,38 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Icon = new wxBitmap( KiBitmap( microstrip_xpm ) ); m_Icon = new wxBitmap( KiBitmap( microstrip_xpm ) );
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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:" ) );
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_t", _( "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", _( "Rough" ),
_( "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 Rel S" ), "mu Rel S",_( "mu 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 Rel C" ), "mu Rel C", _( "mu conductor" ),
_( "Relative Permeability (mu) of Conductor" ), 1, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
"W", "W", _( "Line Width" ), 0.2, true ) ); "W", "W", _( "Line width" ), 0.2, 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 wength" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", _( "Characteristic Impedance" ), 50.0, true ) ); "Z0", "Z0", _( "Characteristic impedance" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", _( "Electrical Length" ), 0.0, true ) ); "Ang_l", "Ang_l", _( "Electrical length" ), 0.0, true ) );
break; break;
case CPW_TYPE: // coplanar waveguide case CPW_TYPE: // coplanar waveguide
@ -184,31 +184,31 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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:" ) );
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, 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 Rel C" ), "mu Rel C", _( "mu conductor" ),
_( "Relative Permeability (mu) of Conductor" ), 1, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
"W", "W", _( "Line Width" ), 0.2, true ) ); "W", "W", _( "Line width" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM,
"S", "S", _( "Gap Width" ), 0.2, true ) ); "S", "S", _( "Gap width" ), 0.2, 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 ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", _( "Characteristic Impedance" ), 50.0, true ) ); "Z0", "Z0", _( "Characteristic impedance" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", _( "Electrical Length" ), 0.0, true ) ); "Ang_l", "Ang_l", _( "Electrical length" ), 0.0, true ) );
break; break;
case GROUNDED_CPW_TYPE: // grounded coplanar waveguide case GROUNDED_CPW_TYPE: // grounded coplanar waveguide
@ -217,31 +217,31 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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:" ) );
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, 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 Rel C", "mu Rel C", "mu condutor",
_( "Relative Permeability (mu) of Conductor" ), 1, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
"W", "W", _( "Line Width" ), 0.2, true ) ); "W", "W", _( "Line width" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM,
"S", "S", _( "Gap Width" ), 0.2, true ) ); "S", "S", _( "Gap width" ), 0.2, 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 ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", _( "Characteristic Impedance" ), 50.0, true ) ); "Z0", "Z0", _( "Characteristic impedance" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", _( "Electrical Length" ), 0, true ) ); "Ang_l", "Ang_l", _( "Electrical length" ), 0, true ) );
break; break;
@ -252,31 +252,31 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Messages.Add( _( "ZF(H10) = Ey / Hx:" ) ); m_Messages.Add( _( "ZF(H10) = Ey / Hx:" ) );
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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 Rel I" ), "mu Rel I",_( "mu 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 Rel C" ), "mu Rel C",_( "mu conductor" ),
_( "Relative Permeability (mu) of Conductor" ), 1, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
"a", "a", _( "Width of Waveguide" ), 10.0, true ) ); "a", "a", _( "Width of waveguide" ), 10.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM,
"b", "b", _( "Height of Waveguide" ), 5.0, true ) ); "b", "b", _( "Height of waveguide" ), 5.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM,
"L", "L", _( "Waveguide Length" ), 50.0, true ) ); "L", "L", _( "Waveguide length" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", _( "Characteristic Impedance" ), 50.0, true ) ); "Z0", "Z0", _( "Characteristic impedance" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", _( "Electrical Length" ), 0, true ) ); "Ang_l", "Ang_l", _( "Electrical length" ), 0, true ) );
break; break;
case COAX_TYPE: // coaxial cable case COAX_TYPE: // coaxial cable
@ -285,36 +285,31 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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 Rel I" ), "mu Rel I", _( "mu 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 Rel C" ), "mu Rel C", _( "mu 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" ), "Din", _( "Din" ), _( "Inner diameter (conductor)" ), 1.0, true ) );
_( "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" ), "Dout", _( "Dout" ), _( "Outer diameter (insulator)" ), 8.0, true ) );
_( "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", "L", "L", _( "Line length" ), 50.0, true ) );
_( "Line Length" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", "Z0", "Z0", _( "Characteristic impedance" ), 50.0, true ) );
_( "Characteristic Impedance" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", "Ang_l", "Ang_l", _( "Electrical length" ), 0.0, true ) );
_( "Electrical Length" ), 0.0, true ) );
break; break;
case C_MICROSTRIP_TYPE: // coupled microstrip case C_MICROSTRIP_TYPE: // coupled microstrip
@ -322,40 +317,33 @@ 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( _( "ErEff even:" ) );
m_Messages.Add( _( "ErEff Odd:" ) ); m_Messages.Add( _( "ErEff odd:" ) );
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,
"H", "H", "H", "H", _( "Height of substrate" ), 0.2, true ) );
_( "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", "H_t", "H_t", _( "Height of box top" ), 1e20, true ) );
_( "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", _( "Rough" ), _( "Conductor roughness" ), 0.0, true ) );
_( "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 Rel C" ), "mu rel C", _( "mu conductor" ),
_( "Relative Permeability (mu) of Conductor" ), 1, _( "Relative permeability (mu) of conductor" ), 1,
false ) ); false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
"W", "W", "W", "W", _( "Line width" ), 0.2, true ) );
_( "Line Width" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_S_PRM,
"S", "S", "S", "S", _( "Gap width" ), 0.2, true ) );
_( "Gap Width" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM,
"L", "L", "L", "L", _( "Line length" ), 50.0, true ) );
_( "Line Length" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_E_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_E_PRM,
"Zeven", _( "Zeven" ), "Zeven", _( "Zeven" ),
@ -365,7 +353,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
_( "Odd mode impedance (lines driven by opposite (differential) voltages)" ), 50.0, true ) ); _( "Odd mode impedance (lines driven by opposite (differential) voltages)" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", "Ang_l", "Ang_l",
_( "Electrical Length" ), 0.0, true ) ); _( "Electrical length" ), 0.0, true ) );
break; break;
case STRIPLINE_TYPE: // stripline case STRIPLINE_TYPE: // stripline
@ -373,39 +361,31 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Icon = new wxBitmap( KiBitmap( stripline_xpm ) ); m_Icon = new wxBitmap( KiBitmap( stripline_xpm ) );
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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:" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, H_PRM,
"H", "H", "H", "H", _( "Height of substrate" ), 0.2, true ) );
_( "Height of Substrate" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, STRIPLINE_A_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, STRIPLINE_A_PRM,
"a", "a", "a", "a", _( "Distance between strip and top metal" ), 0.2,
_( "distance between strip and top metal" ), 0.2,
true ) ); 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, MURC_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
"mu Rel C", _( "mu Rel C" ), "mu Rel C", _( "mu conductor" ),
_( "Relative Permeability (mu) of Conductor" ), 1, _( "Relative permeability (mu) of conductor" ), 1, false ) );
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
"W", "W", "W", "W", _( "Line width" ), 0.2, true ) );
_( "Line Width" ), 0.2, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_LEN_PRM,
"L", "L", "L", "L", _( "Line length" ), 50.0, true ) );
_( "Line Length" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", "Z0", "Z0", _( "Characteristic impedance" ), 50, true ) );
_( "Characteristic Impedance" ), 50, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", "Ang_l", "Ang_l", _( "Electrical length" ), 0, true ) );
_( "Electrical Length" ), 0, true ) );
break; break;
case TWISTEDPAIR_TYPE: // twisted pair case TWISTEDPAIR_TYPE: // twisted pair
@ -414,38 +394,35 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_HasPrmSelection = true; m_HasPrmSelection = true;
m_Messages.Add( _( "ErEff:" ) ); m_Messages.Add( _( "ErEff:" ) );
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:" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_TWIST_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_TWIST_PRM,
"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 Rel C" ), "mu Rel C", _( "mu 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", _( "ErEnv" ),
_( "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,
"Din", _( "Din" ), "Din", _( "Din" ),
_( "Inner Diameter (conductor)" ), 1.0, true ) ); _( "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" ), "Dout", _( "Dout" ),
_( "Outer Diameter (insulator)" ), 8.0, true ) ); _( "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", "L", "L", _( "Cable length" ), 50.0, true ) );
_( "Cable Length" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, Z0_PRM,
"Z0", "Z0", "Z0", "Z0", _( "Characteristic impedance" ), 50.0, true ) );
_( "Characteristic Impedance" ), 50.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) ); AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, DUMMY_PRM ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM, AddPrm( new TRANSLINE_PRM( PRM_TYPE_ELEC, ANG_L_PRM,
"Ang_l", "Ang_l", "Ang_l", "Ang_l", _( "Electrical length" ), 0.0, true ) );
_( "Electrical Length" ), 0.0, true ) );
break; break;
case END_OF_LIST_TYPE: // Not really used case END_OF_LIST_TYPE: // Not really used