PCB Calculator cleanups

pcb_calculator/transline/c_microstrip.cpp

@@ -713,7 +713,7 @@ void C_MICROSTRIP::Z0_dispersion()
     /* normalized frequency [GHz * mm] */
     f_n = m_parameters[FREQUENCY_PRM] * m_parameters[H_PRM] / 1e06;
 
-    e_r_eff_single_f = aux_ms->er_eff;
+    e_r_eff_single_f = aux_ms->m_parameters[EPSILON_EFF_PRM];
     e_r_eff_single_0 = aux_ms->er_eff_0;
     Z0_single_f      = aux_ms->m_parameters[Z0_PRM];
 

pcb_calculator/transline/microstrip.cpp

@@ -304,7 +304,7 @@ void MICROSTRIP::dispersion()
     D    = Z0_dispersion( u, e_r, e_r_eff_0, e_r_eff_f, f_n );
     Z0_f = Z0_0 * D;
 
-    er_eff               = e_r_eff_f;
+    m_parameters[EPSILON_EFF_PRM] = e_r_eff_f;
     m_parameters[Z0_PRM] = Z0_f;
 }
 
@@ -432,7 +432,7 @@ void MICROSTRIP::line_angle()
     double e_r_eff;
     double v, lambda_g;
 
-    e_r_eff = er_eff;
+    e_r_eff = m_parameters[EPSILON_EFF_PRM];
 
     /* velocity */
     v = C0 / sqrt( e_r_eff * mur_eff );
@@ -463,7 +463,7 @@ void MICROSTRIP::show_results()
     setProperty( Z0_PRM, m_parameters[Z0_PRM] );
     setProperty( ANG_L_PRM, m_parameters[ANG_L_PRM] );
 
-    setResult( 0, er_eff, "" );
+    setResult( 0, m_parameters[EPSILON_EFF_PRM], "" );
     setResult( 1, atten_cond, "dB" );
     setResult( 2, atten_dielectric, "dB" );
 
@@ -516,6 +516,7 @@ void MICROSTRIP::showAnalyze()
  */
 void MICROSTRIP::calcSynthesize()
 {
+    double const er_eff = m_parameters[EPSILON_EFF_PRM];
     double angl_dest, z0_dest;
     z0_dest   = m_parameters[Z0_PRM];
     angl_dest = m_parameters[ANG_L_PRM];

pcb_calculator/transline/microstrip.h

@@ -44,9 +44,7 @@ private:
     double l;                // length of line
     double Z0_0;             // static characteristic impedance
     double Z0;               // characteristic impedance
-    // double ang_l;         Electrical length in angle
     double er_eff_0;         // Static 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)

pcb_calculator/transline/rectwaveguide.h

@@ -43,8 +43,6 @@ private:
     double l;                // length of waveguide
     double Z0;               // characteristic impedance
     double Z0EH;             // characteristic impedance of field quantities*/
-    // 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)

pcb_calculator/transline/transline.cpp

@@ -74,9 +74,6 @@ TRANSLINE::TRANSLINE()
 {
     m_parameters[MURC_PRM] = 1.0;
     m_Name                 = nullptr;
-    ang_l                  = 0.0;       // Electrical length in angle
-    len                    = 0.0;       // length of line
-    er_eff                 = 1.0;       // effective dielectric constant
     Init();
 }
 

pcb_calculator/transline/transline.h

@@ -129,9 +129,6 @@ 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
 
     bool   minimizeZ0Error1D( double* );
     double skin_depth();