From da0f956ca58c7366c0560930a9c5d9d33a195523 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 7 Jun 2018 15:34:13 +0200 Subject: [PATCH] pcb_calculator: code rework: rename "murC" member by "m_murC" --- pcb_calculator/transline/c_microstrip.cpp | 4 ++-- pcb_calculator/transline/coax.cpp | 4 ++-- pcb_calculator/transline/coplanar.cpp | 2 +- pcb_calculator/transline/microstrip.cpp | 2 +- pcb_calculator/transline/rectwaveguide.cpp | 4 ++-- pcb_calculator/transline/stripline.cpp | 2 +- pcb_calculator/transline/transline.cpp | 4 ++-- pcb_calculator/transline/transline.h | 2 +- pcb_calculator/transline/twistedpair.cpp | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pcb_calculator/transline/c_microstrip.cpp b/pcb_calculator/transline/c_microstrip.cpp index 19e9f5afea..86b84280fa 100644 --- a/pcb_calculator/transline/c_microstrip.cpp +++ b/pcb_calculator/transline/c_microstrip.cpp @@ -163,7 +163,7 @@ void C_MICROSTRIP::compute_single_line() //aux_ms->t = t; aux_ms->ht = 1e12; /* arbitrarily high */ aux_ms->m_freq = m_freq; - aux_ms->murC = murC; + aux_ms->m_murC = m_murC; aux_ms->microstrip_Z0(); aux_ms->dispersion(); } @@ -836,7 +836,7 @@ void C_MICROSTRIP::calc() void C_MICROSTRIP::get_c_microstrip_sub() { er = getProperty( EPSILONR_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); h = getProperty( H_PRM ); ht = getProperty( H_T_PRM ); t = getProperty( T_PRM ); diff --git a/pcb_calculator/transline/coax.cpp b/pcb_calculator/transline/coax.cpp index 60b4ed3e20..f369a020fa 100644 --- a/pcb_calculator/transline/coax.cpp +++ b/pcb_calculator/transline/coax.cpp @@ -63,7 +63,7 @@ void COAX::get_coax_sub() { er = getProperty( EPSILONR_PRM ); mur = getProperty( MUR_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); tand = getProperty( TAND_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM ); } @@ -116,7 +116,7 @@ double COAX::alphac_coax() { double ac, Rs; - Rs = sqrt( M_PI * m_freq * murC * MU0 / m_sigma ); + Rs = sqrt( M_PI * m_freq * m_murC * MU0 / m_sigma ); ac = sqrt( er ) * ( ( (1 / din) + (1 / dout) ) / log( dout / din ) ) * (Rs / ZF0); ac = ac * 20.0 / log( 10.0 ); return ac; diff --git a/pcb_calculator/transline/coplanar.cpp b/pcb_calculator/transline/coplanar.cpp index 0bc41c26d7..2c435851e2 100644 --- a/pcb_calculator/transline/coplanar.cpp +++ b/pcb_calculator/transline/coplanar.cpp @@ -69,7 +69,7 @@ void COPLANAR::getProperties() t = getProperty( T_PRM ); er = getProperty( EPSILONR_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); tand = getProperty( TAND_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM ); Z0 = getProperty( Z0_PRM ); diff --git a/pcb_calculator/transline/microstrip.cpp b/pcb_calculator/transline/microstrip.cpp index 1167ac52eb..785afd34c1 100644 --- a/pcb_calculator/transline/microstrip.cpp +++ b/pcb_calculator/transline/microstrip.cpp @@ -467,7 +467,7 @@ void MICROSTRIP::get_microstrip_sub() ht = getProperty( H_T_PRM ); t = getProperty( T_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); tand = getProperty( TAND_PRM ); rough = getProperty( ROUGH_PRM ); } diff --git a/pcb_calculator/transline/rectwaveguide.cpp b/pcb_calculator/transline/rectwaveguide.cpp index 4188f5ce92..d48a78fe96 100644 --- a/pcb_calculator/transline/rectwaveguide.cpp +++ b/pcb_calculator/transline/rectwaveguide.cpp @@ -93,7 +93,7 @@ double RECTWAVEGUIDE::alphac() double ac; short m, n, mmax, nmax; - Rs = sqrt( M_PI * m_freq * murC * MU0 / m_sigma ); + Rs = sqrt( M_PI * m_freq * m_murC * MU0 / m_sigma ); ac = 0.0; mmax = (int) floor( m_freq / fc( 1, 0 ) ); nmax = mmax; @@ -189,7 +189,7 @@ void RECTWAVEGUIDE::get_rectwaveguide_sub() { er = getProperty( EPSILONR_PRM ); mur = getProperty( MUR_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM ); tand = getProperty( TAND_PRM ); tanm = getProperty( TANM_PRM ); diff --git a/pcb_calculator/transline/stripline.cpp b/pcb_calculator/transline/stripline.cpp index d8e0b14f91..2312d954be 100644 --- a/pcb_calculator/transline/stripline.cpp +++ b/pcb_calculator/transline/stripline.cpp @@ -60,7 +60,7 @@ void STRIPLINE::getProperties() t = getProperty( T_PRM ); er = getProperty( EPSILONR_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); tand = getProperty( TAND_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM ); Z0 = getProperty( Z0_PRM ); diff --git a/pcb_calculator/transline/transline.cpp b/pcb_calculator/transline/transline.cpp index 5756ff57d9..1ba089eebb 100644 --- a/pcb_calculator/transline/transline.cpp +++ b/pcb_calculator/transline/transline.cpp @@ -61,7 +61,7 @@ bool IsSelectedInDialog( enum PRMS_ID aPrmId ); /* Constructor creates a transmission line instance. */ TRANSLINE::TRANSLINE() { - murC = 1.0; + m_murC = 1.0; m_name = (const char*) 0; // Initialize these variables mainly to avoid warnings from a static analyzer @@ -122,7 +122,7 @@ double TRANSLINE::getProperty( enum PRMS_ID aPrmId ) double TRANSLINE::skin_depth() { double depth; - depth = 1.0 / sqrt( M_PI * m_freq * murC * MU0 * m_sigma ); + depth = 1.0 / sqrt( M_PI * m_freq * m_murC * MU0 * m_sigma ); return depth; } diff --git a/pcb_calculator/transline/transline.h b/pcb_calculator/transline/transline.h index 755fb1050a..a636fce5cd 100644 --- a/pcb_calculator/transline/transline.h +++ b/pcb_calculator/transline/transline.h @@ -76,7 +76,7 @@ protected: double er; /* dielectric constant */ double tand; /* Dielectric Loss Tangent */ double m_sigma; // Conductivity of the metal - double murC; /* magnetic permeability of conductor */ + double m_murC; /* magnetic permeability of conductor */ double m_skindepth; // Skin depth double skin_depth(); diff --git a/pcb_calculator/transline/twistedpair.cpp b/pcb_calculator/transline/twistedpair.cpp index 7b9730712b..f56fb89aa9 100644 --- a/pcb_calculator/transline/twistedpair.cpp +++ b/pcb_calculator/transline/twistedpair.cpp @@ -58,7 +58,7 @@ void TWISTEDPAIR::getProperties() len = getProperty( PHYS_LEN_PRM ); er = getProperty( EPSILONR_PRM ); - murC = getProperty( MURC_PRM ); + m_murC = getProperty( MURC_PRM ); tand = getProperty( TAND_PRM ); m_sigma = 1.0 / getProperty( RHO_PRM ); twists = getProperty( TWISTEDPAIR_TWIST_PRM );