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

Widen text in pcb_calculator

This commit is contained in:
Seth Hillbrand 2022-02-08 17:08:22 -08:00
parent aa126a12f2
commit 20ef0e54fe
15 changed files with 120 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcb_calculator/calculator_panels/panel_attenuators.cpp
View File

@ -186,7 +186,7 @@ void PANEL_ATTENUATORS::TransfAttenuatorDataToPanel()
if( m_CurrAttenuator->m_FormulaName ) if( m_CurrAttenuator->m_FormulaName )
{ {
if( m_CurrAttenuator->m_FormulaName->StartsWith( "<!" ) ) if( m_CurrAttenuator->m_FormulaName->StartsWith( wxT( "<!" ) ) )
{ {
m_panelAttFormula->SetPage( *m_CurrAttenuator->m_FormulaName ); m_panelAttFormula->SetPage( *m_CurrAttenuator->m_FormulaName );
} }

16
pcb_calculator/calculator_panels/panel_track_width.cpp
View File

@ -239,20 +239,20 @@ void PANEL_TRACK_WIDTH::OnTWResetButtonClick( wxCommandEvent& event )
// Note: a wxString:Format( "%g", xx) is used to use local separator in floats // Note: a wxString:Format( "%g", xx) is used to use local separator in floats
// Init main parameters: // Init main parameters:
m_TrackCurrentValue->SetValue( wxString::Format( "%g", 1.0 ) ); m_TrackCurrentValue->SetValue( wxString::Format( wxT( "%g" ), 1.0 ) );
m_TrackDeltaTValue->SetValue( wxString::Format( "%g", 10.0 ) ); m_TrackDeltaTValue->SetValue( wxString::Format( wxT( "%g" ), 10.0 ) );
m_TrackLengthValue->SetValue( wxString::Format( "%g", 20.0 ) ); m_TrackLengthValue->SetValue( wxString::Format( wxT( "%g" ), 20.0 ) );
m_TW_CuLength_choiceUnit->SetSelection( 0 ); m_TW_CuLength_choiceUnit->SetSelection( 0 );
m_TWResistivity->SetValue( wxString::Format( "%g", copper_resistivity ) ); m_TWResistivity->SetValue( wxString::Format( wxT( "%g" ), copper_resistivity ) );
// m_ExtTrackWidthValue is not reinitialized: it will be calculated from previous parameters // m_ExtTrackWidthValue is not reinitialized: it will be calculated from previous parameters
m_TW_ExtTrackWidth_choiceUnit->SetSelection( 0 ); m_TW_ExtTrackWidth_choiceUnit->SetSelection( 0 );
m_ExtTrackThicknessValue->SetValue( wxString::Format( "%g", 0.035 ) ); m_ExtTrackThicknessValue->SetValue( wxString::Format( wxT( "%g" ), 0.035 ) );
m_ExtTrackThicknessUnit->SetSelection( 0 ); m_ExtTrackThicknessUnit->SetSelection( 0 );
// m_IntTrackWidthValue is not reinitialized: it will be calculated from previous parameters // m_IntTrackWidthValue is not reinitialized: it will be calculated from previous parameters
m_TW_IntTrackWidth_choiceUnit->SetSelection( 0 ); m_TW_IntTrackWidth_choiceUnit->SetSelection( 0 );
m_IntTrackThicknessValue->SetValue( wxString::Format( "%g", 0.035 ) ); m_IntTrackThicknessValue->SetValue( wxString::Format( wxT( "%g" ), 0.035 ) );
m_IntTrackThicknessUnit->SetSelection( 0 ); m_IntTrackThicknessUnit->SetSelection( 0 );
} }
@ -458,7 +458,7 @@ void PANEL_TRACK_WIDTH::LoadSettings( PCB_CALCULATOR_SETTINGS* aCfg )
#if 0 // the IPC formula is valid for copper traces, so we do not currently adjust the resistivity #if 0 // the IPC formula is valid for copper traces, so we do not currently adjust the resistivity
m_TWResistivity->SetValue( aCfg->m_TrackWidth.resistivity ); m_TWResistivity->SetValue( aCfg->m_TrackWidth.resistivity );
#else #else
m_TWResistivity->SetValue( wxString::Format( "%g", copper_resistivity ) ); m_TWResistivity->SetValue( wxString::Format( wxT( "%g" ), copper_resistivity ) );
#endif #endif
m_ExtTrackWidthValue->SetValue( aCfg->m_TrackWidth.ext_track_width ); m_ExtTrackWidthValue->SetValue( aCfg->m_TrackWidth.ext_track_width );
m_TW_ExtTrackWidth_choiceUnit->SetSelection( aCfg->m_TrackWidth.ext_track_width_units ); m_TW_ExtTrackWidth_choiceUnit->SetSelection( aCfg->m_TrackWidth.ext_track_width_units );
@ -469,7 +469,7 @@ void PANEL_TRACK_WIDTH::LoadSettings( PCB_CALCULATOR_SETTINGS* aCfg )
m_IntTrackThicknessValue->SetValue( aCfg->m_TrackWidth.int_track_thickness ); m_IntTrackThicknessValue->SetValue( aCfg->m_TrackWidth.int_track_thickness );
m_IntTrackThicknessUnit->SetSelection( aCfg->m_TrackWidth.int_track_thickness_units ); m_IntTrackThicknessUnit->SetSelection( aCfg->m_TrackWidth.int_track_thickness_units );
if( tracks_width_versus_current_formula.StartsWith( "<!" ) ) if( tracks_width_versus_current_formula.StartsWith( wxT( "<!" ) ) )
m_htmlWinFormulas->SetPage( tracks_width_versus_current_formula ); m_htmlWinFormulas->SetPage( tracks_width_versus_current_formula );
else else
{ {

40
pcb_calculator/calculator_panels/panel_via_size.cpp
View File

@ -129,23 +129,23 @@ void PANEL_VIA_SIZE::OnViaResetButtonClick( wxCommandEvent& event )
#define DEFAULT_UNIT_SEL_MM 0 #define DEFAULT_UNIT_SEL_MM 0
#define DEFAULT_UNIT_SEL_OHM 0 #define DEFAULT_UNIT_SEL_OHM 0
m_textCtrlHoleDia->SetValue( wxString::Format( "%g", 0.4 ) ); m_textCtrlHoleDia->SetValue( wxString::Format( wxT( "%g" ), 0.4 ) );
m_choiceHoleDia->SetSelection( DEFAULT_UNIT_SEL_MM ); m_choiceHoleDia->SetSelection( DEFAULT_UNIT_SEL_MM );
m_textCtrlPlatingThickness->SetValue( wxString::Format( "%g", 0.035 ) ); m_textCtrlPlatingThickness->SetValue( wxString::Format( wxT( "%g" ), 0.035 ) );
m_choicePlatingThickness->SetSelection( DEFAULT_UNIT_SEL_MM ); m_choicePlatingThickness->SetSelection( DEFAULT_UNIT_SEL_MM );
m_textCtrlViaLength->SetValue( wxString::Format( "%g", 1.6 ) ); m_textCtrlViaLength->SetValue( wxString::Format( wxT( "%g" ), 1.6 ) );
m_choiceViaLength->SetSelection( DEFAULT_UNIT_SEL_MM ); m_choiceViaLength->SetSelection( DEFAULT_UNIT_SEL_MM );
m_textCtrlViaPadDia->SetValue( wxString::Format( "%g", 0.6 ) ); m_textCtrlViaPadDia->SetValue( wxString::Format( wxT( "%g" ), 0.6 ) );
m_choiceViaPadDia->SetSelection( DEFAULT_UNIT_SEL_MM ); m_choiceViaPadDia->SetSelection( DEFAULT_UNIT_SEL_MM );
m_textCtrlClearanceDia->SetValue( wxString::Format( "%g", 1.0 ) ); m_textCtrlClearanceDia->SetValue( wxString::Format( wxT( "%g" ), 1.0 ) );
m_choiceClearanceDia->SetSelection( DEFAULT_UNIT_SEL_MM ); m_choiceClearanceDia->SetSelection( DEFAULT_UNIT_SEL_MM );
m_textCtrlImpedance->SetValue( wxString::Format( "%g", 50.0 ) ); m_textCtrlImpedance->SetValue( wxString::Format( wxT( "%g" ), 50.0 ) );
m_choiceImpedance->SetSelection( DEFAULT_UNIT_SEL_OHM ); m_choiceImpedance->SetSelection( DEFAULT_UNIT_SEL_OHM );
m_textCtrlAppliedCurrent->SetValue( wxString::Format( "%g", 1.0 ) ); m_textCtrlAppliedCurrent->SetValue( wxString::Format( wxT( "%g" ), 1.0 ) );
m_textCtrlPlatingResistivity->SetValue( wxString::Format( "%g", 1.72e-8 ) ); m_textCtrlPlatingResistivity->SetValue( wxString::Format( wxT( "%g" ), 1.72e-8 ) );
m_textCtrlPlatingPermittivity->SetValue( wxString::Format( "%g", 4.5 ) ); m_textCtrlPlatingPermittivity->SetValue( wxString::Format( wxT( "%g" ), 4.5 ) );
m_textCtrlTemperatureDiff->SetValue( wxString::Format( "%g", 10.0 ) ); m_textCtrlTemperatureDiff->SetValue( wxString::Format( wxT( "%g" ), 10.0 ) );
m_textCtrlRiseTime->SetValue( wxString::Format( "%g", 1.0 ) ); m_textCtrlRiseTime->SetValue( wxString::Format( wxT( "%g" ), 1.0 ) );
} }
@ -272,30 +272,30 @@ void PANEL_VIA_SIZE::VSDisplayValues( double aViaResistance, double aVoltageDrop
{ {
wxString msg; wxString msg;
msg.Printf( "%g", aViaResistance ); msg.Printf( wxT( "%g" ), aViaResistance );
m_ViaResistance->SetLabel( msg ); m_ViaResistance->SetLabel( msg );
msg.Printf( "%g", aVoltageDrop ); msg.Printf( wxT( "%g" ), aVoltageDrop );
m_ViaVoltageDrop->SetLabel( msg ); m_ViaVoltageDrop->SetLabel( msg );
msg.Printf( "%g", aPowerLoss ); msg.Printf( wxT( "%g" ), aPowerLoss );
m_ViaPowerLoss->SetLabel( msg ); m_ViaPowerLoss->SetLabel( msg );
msg.Printf( "%g", aEstimatedAmpacity ); msg.Printf( wxT( "%g" ), aEstimatedAmpacity );
m_ViaAmpacity->SetLabel( msg ); m_ViaAmpacity->SetLabel( msg );
msg.Printf( "%g", aThermalResistance ); msg.Printf( wxT( "%g" ), aThermalResistance );
m_ViaThermalResistance->SetLabel( msg ); m_ViaThermalResistance->SetLabel( msg );
msg.Printf( "%g", aCapacitance ); msg.Printf( wxT( "%g" ), aCapacitance );
m_ViaCapacitance->SetLabel( msg ); m_ViaCapacitance->SetLabel( msg );
msg.Printf( "%g", aTimeDegradation ); msg.Printf( wxT( "%g" ), aTimeDegradation );
m_RiseTimeOutput->SetLabel( msg ); m_RiseTimeOutput->SetLabel( msg );
msg.Printf( "%g", aInductance ); msg.Printf( wxT( "%g" ), aInductance );
m_Inductance->SetLabel( msg ); m_Inductance->SetLabel( msg );
msg.Printf( "%g", aReactance ); msg.Printf( wxT( "%g" ), aReactance );
m_Reactance->SetLabel( msg ); m_Reactance->SetLabel( msg );
} }

11
pcb_calculator/params_read_write.cpp
View File

@ -100,22 +100,21 @@ void SetPropertyBgColorInDialog( enum PRMS_ID aPrmId, const KIGFX::COLOR4D* aCol
getTranslinePanel()->SetPrmBgColor( aPrmId, aCol ); getTranslinePanel()->SetPrmBgColor( aPrmId, aCol );
} }
/* Puts the text into the given result line. /* Puts the text into the given result line.
*/ */
void SetResultInDialog( int line, const char* aText ) void SetResultInDialog( int line, const wxString& aText )
{ {
wxString msg = wxString::FromUTF8( aText ); getTranslinePanel()->SetResult( line, aText );
getTranslinePanel()->SetResult( line, msg );
} }
/* print aValue into the given result line. /* print aValue into the given result line.
*/ */
void SetResultInDialog( int aLineNumber, double aValue, const char* aText ) void SetResultInDialog( int aLineNumber, double aValue, const wxString& aText )
{ {
wxString msg = wxString::FromUTF8( aText );
wxString fullmsg; wxString fullmsg;
fullmsg.Printf( wxT( "%g " ), aValue ); fullmsg.Printf( wxT( "%g " ), aValue );
fullmsg += msg; fullmsg += aText;
getTranslinePanel()->SetResult( aLineNumber, fullmsg ); getTranslinePanel()->SetResult( aLineNumber, fullmsg );
} }

12
pcb_calculator/transline/c_microstrip.cpp
View File

@ -874,13 +874,13 @@ void C_MICROSTRIP::show_results()
setResult( 0, er_eff_e, "" ); setResult( 0, er_eff_e, "" );
setResult( 1, er_eff_o, "" ); setResult( 1, er_eff_o, "" );
setResult( 2, atten_cond_e, "dB" ); setResult( 2, atten_cond_e, wxT( "dB" ) );
setResult( 3, atten_cond_o, "dB" ); setResult( 3, atten_cond_o, wxT( "dB" ) );
setResult( 4, atten_dielectric_e, "dB" ); setResult( 4, atten_dielectric_e, wxT( "dB" ) );
setResult( 5, atten_dielectric_o, "dB" ); setResult( 5, atten_dielectric_o, wxT( "dB" ) );
setResult( 6, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, "µm" ); setResult( 6, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, wxT( "µm" ) );
setResult( 7, Zdiff, "Ω" ); setResult( 7, Zdiff, wxT( "Ω" ) );
} }

27
pcb_calculator/transline/coax.cpp
View File

@ -28,9 +28,8 @@
* performs the associated calculations * performs the associated calculations
*/ */
#include <cmath> #include <cmath>
#include <cstdio>
#include <cstdlib> #include <wx/string.h>
#include <cstring>
#include "coax.h" #include "coax.h"
#include "units.h" #include "units.h"
@ -209,14 +208,14 @@ void COAX::showSynthesize()
void COAX::show_results() void COAX::show_results()
{ {
int m, n; int m, n;
char text[256], txt[256]; wxString text;
m_parameters[LOSS_DIELECTRIC_PRM] = alphad_coax() * m_parameters[PHYS_LEN_PRM]; m_parameters[LOSS_DIELECTRIC_PRM] = alphad_coax() * m_parameters[PHYS_LEN_PRM];
m_parameters[LOSS_CONDUCTOR_PRM] = alphac_coax() * m_parameters[PHYS_LEN_PRM]; m_parameters[LOSS_CONDUCTOR_PRM] = alphac_coax() * m_parameters[PHYS_LEN_PRM];
setResult( 0, m_parameters[EPSILONR_PRM], "" ); setResult( 0, m_parameters[EPSILONR_PRM], "" );
setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], "dB" ); setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], wxT( "dB" ) );
setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], "dB" ); setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], wxT( "dB" ) );
n = 1; n = 1;
m_parameters[CUTOFF_FREQUENCY_PRM] = m_parameters[CUTOFF_FREQUENCY_PRM] =
@ -225,21 +224,20 @@ void COAX::show_results()
if( m_parameters[CUTOFF_FREQUENCY_PRM] > m_parameters[FREQUENCY_PRM] ) if( m_parameters[CUTOFF_FREQUENCY_PRM] > m_parameters[FREQUENCY_PRM] )
{ {
strcpy( text, "none" ); text = wxT( "none" );
} }
else else
{ {
strcpy( text, "H(1,1) " ); text = wxT( " H(1,1) " );
m = 2; m = 2;
m_parameters[CUTOFF_FREQUENCY_PRM] = m_parameters[CUTOFF_FREQUENCY_PRM] =
C0 C0
/ ( 2 * ( m_parameters[PHYS_DIAM_OUT_PRM] - m_parameters[MUR_PRM] ) / ( 2 * ( m_parameters[PHYS_DIAM_OUT_PRM] - m_parameters[MUR_PRM] )
/ (double) ( m - 1 ) ); / ( m - 1 ) );
while( ( m_parameters[CUTOFF_FREQUENCY_PRM] <= m_parameters[FREQUENCY_PRM] ) && ( m < 10 ) ) while( ( m_parameters[CUTOFF_FREQUENCY_PRM] <= m_parameters[FREQUENCY_PRM] ) && ( m < 10 ) )
{ {
sprintf( txt, "H(n,%d) ", m ); text << wxString::Format( wxT( "H(n,%d) " ), m );
strcat( text, txt );
m++; m++;
m_parameters[CUTOFF_FREQUENCY_PRM] = m_parameters[CUTOFF_FREQUENCY_PRM] =
C0 C0
@ -254,16 +252,15 @@ void COAX::show_results()
C0 / ( 2 * ( m_parameters[PHYS_DIAM_OUT_PRM] - m_parameters[MUR_PRM] ) / (double) m ); C0 / ( 2 * ( m_parameters[PHYS_DIAM_OUT_PRM] - m_parameters[MUR_PRM] ) / (double) m );
if( m_parameters[CUTOFF_FREQUENCY_PRM] > m_parameters[FREQUENCY_PRM] ) if( m_parameters[CUTOFF_FREQUENCY_PRM] > m_parameters[FREQUENCY_PRM] )
{ {
strcpy( text, "none" ); text = wxT( "none" );
} }
else else
{ {
strcpy( text, "" ); text.Clear();
while( ( m_parameters[CUTOFF_FREQUENCY_PRM] <= m_parameters[FREQUENCY_PRM] ) && ( m < 10 ) ) while( ( m_parameters[CUTOFF_FREQUENCY_PRM] <= m_parameters[FREQUENCY_PRM] ) && ( m < 10 ) )
{ {
sprintf( txt, "E(n,%d) ", m ); text << wxString::Format( wxT( "E(n,%d) " ), m );
strcat( text, txt );
m++; m++;
m_parameters[CUTOFF_FREQUENCY_PRM] = m_parameters[CUTOFF_FREQUENCY_PRM] =
C0 C0

6
pcb_calculator/transline/coplanar.cpp
View File

@ -180,10 +180,10 @@ void COPLANAR::show_results()
{ {
setResult( 0, m_parameters[EPSILON_EFF_PRM], "" ); setResult( 0, m_parameters[EPSILON_EFF_PRM], "" );
setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], "dB" ); setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], wxT( "dB" ) );
setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], "dB" ); setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], wxT( "dB" ) );
setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, "µm" ); setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, wxT( "µm" ) );
} }

6
pcb_calculator/transline/microstrip.cpp
View File

@ -464,10 +464,10 @@ void MICROSTRIP::show_results()
setProperty( ANG_L_PRM, m_parameters[ANG_L_PRM] ); setProperty( ANG_L_PRM, m_parameters[ANG_L_PRM] );
setResult( 0, er_eff, "" ); setResult( 0, er_eff, "" );
setResult( 1, atten_cond, "dB" ); setResult( 1, atten_cond, wxT( "dB" ) );
setResult( 2, atten_dielectric, "dB" ); setResult( 2, atten_dielectric, wxT( "dB" ) );
setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, "µm" ); setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, wxT( "µm" ) );
} }

44
pcb_calculator/transline/rectwaveguide.cpp
View File

@ -369,28 +369,26 @@ void RECTWAVEGUIDE::showAnalyze()
} }
#define MAXSTRLEN 128
void RECTWAVEGUIDE::show_results() void RECTWAVEGUIDE::show_results()
{ {
int m, n, max = 6; int m, n, max = 6;
char text[MAXSTRLEN], txt[32]; wxString text;
// Z0EH = Ey / Hx (definition with field quantities) // Z0EH = Ey / Hx (definition with field quantities)
Z0EH = ZF0 * sqrt( kval_square() / ( kval_square() - kc_square( 1, 0 ) ) ); Z0EH = ZF0 * sqrt( kval_square() / ( kval_square() - kc_square( 1, 0 ) ) );
setResult( 0, Z0EH, "Ohm" ); setResult( 0, Z0EH, wxT( "Ohm" ) );
setResult( 1, m_parameters[EPSILON_EFF_PRM], "" ); setResult( 1, m_parameters[EPSILON_EFF_PRM], "" );
setResult( 2, m_parameters[LOSS_CONDUCTOR_PRM], "dB" ); setResult( 2, m_parameters[LOSS_CONDUCTOR_PRM], wxT( "dB" ) );
setResult( 3, m_parameters[LOSS_DIELECTRIC_PRM], "dB" ); setResult( 3, m_parameters[LOSS_DIELECTRIC_PRM], wxT( "dB" ) );
// show possible TE modes (H modes) // show possible TE modes (H modes)
if( m_parameters[FREQUENCY_PRM] < fc( 1, 0 ) ) if( m_parameters[FREQUENCY_PRM] < fc( 1, 0 ) )
{ {
strcpy( text, "none" ); text = wxT( "none" );
} }
else else
{ {
strcpy( text, "" );
for( m = 0; m <= max; m++ ) for( m = 0; m <= max; m++ )
{ {
for( n = 0; n <= max; n++ ) for( n = 0; n <= max; n++ )
@ -399,18 +397,7 @@ void RECTWAVEGUIDE::show_results()
continue; continue;
if( m_parameters[FREQUENCY_PRM] >= ( fc( m, n ) ) ) if( m_parameters[FREQUENCY_PRM] >= ( fc( m, n ) ) )
{ text << wxString::Format( wxT( "H(%d,%d) " ), m, n );
sprintf( txt, "H(%d,%d) ", m, n );
if( ( strlen( text ) + strlen( txt ) + 5 ) < MAXSTRLEN )
{
strcat( text, txt );
}
else
{
strcat( text, "..." );
m = n = max + 1; // print no more modes
}
}
} }
} }
} }
@ -419,30 +406,21 @@ void RECTWAVEGUIDE::show_results()
// show possible TM modes (E modes) // show possible TM modes (E modes)
if( m_parameters[FREQUENCY_PRM] < fc( 1, 1 ) ) if( m_parameters[FREQUENCY_PRM] < fc( 1, 1 ) )
{ {
strcpy( text, "none" ); text = wxT( "none" );
} }
else else
{ {
strcpy( text, "" ); text.Clear();
for( m = 1; m <= max; m++ ) for( m = 1; m <= max; m++ )
{ {
for( n = 1; n <= max; n++ ) for( n = 1; n <= max; n++ )
{ {
if( m_parameters[FREQUENCY_PRM] >= fc( m, n ) ) if( m_parameters[FREQUENCY_PRM] >= fc( m, n ) )
{ text << wxString::Format( wxT( "E(%d,%d) " ), m, n );
sprintf( txt, "E(%d,%d) ", m, n );
if( ( strlen( text ) + strlen( txt ) + 5 ) < MAXSTRLEN )
{
strcat( text, txt );
}
else
{
strcat( text, "..." );
m = n = max + 1; // print no more modes
}
}
} }
} }
} }
setResult( 5, text ); setResult( 5, text );
} }

6
pcb_calculator/transline/stripline.cpp
View File

@ -163,10 +163,10 @@ void STRIPLINE::show_results()
{ {
setResult( 0, m_parameters[EPSILON_EFF_PRM], "" ); setResult( 0, m_parameters[EPSILON_EFF_PRM], "" );
setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], "dB" ); setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], wxT( "dB" ) );
setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], "dB" ); setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], wxT( "dB" ) );
setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, "µm" ); setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, wxT( "µm" ) );
} }

12
pcb_calculator/transline/transline.cpp
View File

@ -54,6 +54,14 @@ void SetResultInDialog( int line, const char* text );
*/ */
void SetResultInDialog( int aLineNumber, double aValue, const char* aText ); void SetResultInDialog( int aLineNumber, double aValue, const char* aText );
/* Puts the text into the given result line.
*/
void SetResultInDialog( int line, const wxString& aText );
/* print aValue into the given result line.
*/
void SetResultInDialog( int aLineNumber, double aValue, const wxString& aText );
/* Returns a named property value. */ /* Returns a named property value. */
double GetPropertyInDialog( enum PRMS_ID aPrmId ); double GetPropertyInDialog( enum PRMS_ID aPrmId );
@ -124,13 +132,13 @@ bool TRANSLINE::isSelected( enum PRMS_ID aPrmId )
/* Puts the text into the given result line. /* Puts the text into the given result line.
*/ */
void TRANSLINE::setResult( int line, const char* text ) void TRANSLINE::setResult( int line, const wxString& text )
{ {
SetResultInDialog( line, text ); SetResultInDialog( line, text );
} }
void TRANSLINE::setResult( int line, double value, const char* text ) void TRANSLINE::setResult( int line, double value, const wxString& text )
{ {
SetResultInDialog( line, value, text ); SetResultInDialog( line, value, text );
} }

4
pcb_calculator/transline/transline.h
View File

@ -88,8 +88,8 @@ public:
void getProperties(); void getProperties();
void checkProperties(); void checkProperties();
void setResult( int, double, const char* ); void setResult( int, const wxString& );
void setResult( int, const char* ); void setResult( int, double, const wxString& );
bool isSelected( enum PRMS_ID aPrmId ); bool isSelected( enum PRMS_ID aPrmId );
void Init(); void Init();

6
pcb_calculator/transline/twistedpair.cpp
View File

@ -100,9 +100,9 @@ void TWISTEDPAIR::calcAnalyze()
void TWISTEDPAIR::show_results() void TWISTEDPAIR::show_results()
{ {
setResult( 0, m_parameters[EPSILON_EFF_PRM], "" ); setResult( 0, m_parameters[EPSILON_EFF_PRM], "" );
setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], "dB" ); setResult( 1, m_parameters[LOSS_CONDUCTOR_PRM], wxT( "dB" ) );
setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], "dB" ); setResult( 2, m_parameters[LOSS_DIELECTRIC_PRM], wxT( "dB" ) );
setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, "µm" ); setResult( 3, m_parameters[SKIN_DEPTH_PRM] / UNIT_MICRON, wxT( "µm" ) );
} }
void TWISTEDPAIR::showAnalyze() void TWISTEDPAIR::showAnalyze()

2
pcb_calculator/transline_dlg_funct.cpp
View File

@ -310,7 +310,7 @@ void PANEL_TRANSLINE::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType )
if( prm->m_Id != DUMMY_PRM ) if( prm->m_Id != DUMMY_PRM )
{ {
data->value->SetValue( wxString::Format( "%g", prm->m_Value ) ); data->value->SetValue( wxString::Format( wxT( "%g" ), prm->m_Value ) );
data->value->Enable( true ); data->value->Enable( true );
} }
else else

64
pcb_calculator/transline_ident.cpp
View File

@ -197,9 +197,9 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
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", wxT( "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", wxT( "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", wxString::Format( wxT( "μ(%s)" ), "mu Rel C", wxString::Format( wxT( "μ(%s)" ),
_( "conductor" ) ), _( "conductor" ) ),
@ -207,17 +207,17 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
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", wxT( "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", wxT( "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", wxT( "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", wxT( "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", wxT( "Ang_l" ), _( "Electrical length" ), 0, true ) );
break; break;
@ -244,17 +244,17 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
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", wxT( "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", wxT( "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", wxT( "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", wxT( "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", wxT( "Ang_l" ), _( "Electrical length" ), 0, true ) );
break; break;
case COAX_TYPE: // coaxial cable case COAX_TYPE: // coaxial cable
@ -285,13 +285,13 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
"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", _( "Line length" ), 50.0, true ) ); "L", wxT( "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", wxT( "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", wxT( "Ang_l" ), _( "Electrical length" ), 0.0, true ) );
break; break;
case C_MICROSTRIP_TYPE: // coupled microstrip case C_MICROSTRIP_TYPE: // coupled microstrip
@ -309,11 +309,11 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Messages.Add( _( "Differential Impedance (Zd):" ) ); m_Messages.Add( _( "Differential Impedance (Zd):" ) );
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", wxT( "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", wxT( "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", _( "Strip thickness" ), 0.035, true ) ); "T", wxT( "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", _( "Roughness" ), "Rough", _( "Roughness" ),
_( "Conductor roughness" ), 0.0, true ) ); _( "Conductor roughness" ), 0.0, true ) );
@ -324,11 +324,11 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
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", wxT( "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", wxT( "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", wxT( "L" ), _( "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" ),
@ -339,7 +339,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
_( "Odd mode impedance (lines driven by opposite " _( "Odd mode impedance (lines driven by opposite "
"(differential) voltages)" ), 50.0, true ) ); "(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", wxT( "Ang_l" ),
_( "Electrical length" ), 0.0, true ) ); _( "Electrical length" ), 0.0, true ) );
break; break;
@ -353,27 +353,27 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
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", wxT( "H" ), _( "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", _( "Distance between strip and top metal" ), 0.2, "a", wxT( "a" ), _( "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", _( "Strip thickness" ), 0.035, true ) ); "T", wxT( "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", wxString::Format( wxT( "μ(%s)" ), "mu Rel C", wxString::Format( wxT( "μ(%s)" ),
_( "conductor" ) ), _( "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,
"W", "W", _( "Line width" ), 0.2, true ) ); "W", wxT( "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", wxT( "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, true ) ); "Z0", wxT( "Z0" ), _( "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", _( "Electrical length" ), 0, true ) ); "Ang_l", wxT( "Ang_l" ), _( "Electrical length" ), 0, true ) );
break; break;
case TWISTEDPAIR_TYPE: // twisted pair case TWISTEDPAIR_TYPE: // twisted pair
@ -406,13 +406,13 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
"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", _( "Cable length" ), 50.0, true ) ); "L", wxT( "L" ), _( "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", _( "Characteristic impedance" ), 50.0, true ) ); "Z0", wxT( "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", wxT( "Ang_l" ), _( "Electrical length" ), 0.0, true ) );
break; break;
case END_OF_LIST_TYPE: // Not really used case END_OF_LIST_TYPE: // Not really used