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

Fix duplicate variables in a class and its parent.

This commit is contained in:
jean-pierre charras 2021-06-09 18:56:39 +02:00
parent 5cce3f6e18
commit 49de9e405e
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcb_calculator/transline/microstrip.cpp
View File

@ -49,9 +49,7 @@ MICROSTRIP::MICROSTRIP() : TRANSLINE(),
l( 0.0 ), // length of line
Z0_0( 0.0 ), // static characteristic impedance
Z0( 0.0 ), // characteristic impedance
ang_l( 0.0 ), // Electrical length in angle
er_eff_0( 0.0 ), // Static effective dielectric constant
er_eff( 0.0 ), // Effective dielectric constant
mur_eff( 0.0 ), // Effective mag. permeability
w_eff( 0.0 ), // Effective width of line
atten_dielectric( 0.0 ), // Loss in dielectric (dB)

4
pcb_calculator/transline/microstrip.h
View File

@ -44,9 +44,9 @@ private:
double l; // length of line
double Z0_0; // static characteristic impedance
double Z0; // characteristic impedance
double ang_l; // Electrical length in angle
// double ang_l; Electrical length in angle
double er_eff_0; // Static effective dielectric constant
double er_eff; // Effective dielectric constant
// double er_eff; Effective dielectric constant defined in parent class
double mur_eff; // Effective mag. permeability
double w_eff; // Effective width of line
double atten_dielectric; // Loss in dielectric (dB)

2
pcb_calculator/transline/rectwaveguide.cpp
View File

@ -35,8 +35,6 @@ RECTWAVEGUIDE::RECTWAVEGUIDE() : TRANSLINE(),
l( 0.0 ), // length of waveguide
Z0( 0.0 ), // characteristic impedance
Z0EH( 0.0 ), // characteristic impedance of field quantities*/
ang_l( 0.0 ), // Electrical length in angle
er_eff( 0.0 ), // Effective dielectric constant
mur_eff( 0.0 ), // Effective mag. permeability
atten_dielectric( 0.0 ), // Loss in dielectric (dB)
atten_cond( 0.0 ), // Loss in conductors (dB)

4
pcb_calculator/transline/rectwaveguide.h
View File

@ -43,8 +43,8 @@ private:
double l; // length of waveguide
double Z0; // characteristic impedance
double Z0EH; // characteristic impedance of field quantities*/
double ang_l; // Electrical length in angle
double er_eff; // Effective dielectric constant
// double ang_l; Electrical length in angle defined in parent class
// double er_eff; Effective dielectric constant defined in parent class
double mur_eff; // Effective mag. permeability
double atten_dielectric; // Loss in dielectric (dB)
double atten_cond; // Loss in conductors (dB)

6
pcb_calculator/transline/transline.h
View File

@ -117,9 +117,9 @@ public:
protected:
double m_parameters[EXTRA_PRMS_COUNT];
double len; // length of line
double er_eff; // effective dielectric constant
double ang_l; // Electrical length in angle
double len; // length of line
double er_eff; // effective dielectric constant
double ang_l; // Electrical length in angle
bool minimizeZ0Error1D( double* );
double skin_depth();