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

Clean up pcb_calculator includes a bit and rename files

This commit is contained in:
Marek Roszko 2020-10-12 21:01:25 -04:00
parent 9641eb792a
commit 2ade8031dc
34 changed files with 134 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcb_calculator/CMakeLists.txt
View File

@ -23,7 +23,7 @@ set( PCB_CALCULATOR_SRCS
tracks_width_versus_current.cpp
via.cpp
transline_ident.cpp
UnitSelector.cpp
widgets/unit_selector.cpp
transline/transline.cpp
transline/c_microstrip.cpp
transline/microstrip.cpp

2
pcb_calculator/attenuators.cpp
View File

@ -27,9 +27,9 @@
*/
#include <wx/wx.h>
#include <pcb_calculator.h>
#include <dialog_helpers.h>
#include "pcb_calculator_frame.h"
extern double DoubleFromString( const wxString& TextValue );

5
pcb_calculator/attenuators/attenuator_classes.cpp
View File

@ -7,10 +7,11 @@
*****************************************************************************/
#include <cmath>
#include <attenuator_classes.h>
#include <i18n_utility.h>
#include <kiface_i.h>
#include <pcb_calculator_settings.h>
#include "attenuator_classes.h"
#include "pcb_calculator_settings.h"
// Bitmaps:
#include <att_bridge.xpm>

6
pcb_calculator/board_classes_values.cpp
View File

@ -21,10 +21,8 @@
#include <wx/app.h>
#include <wx/msgdlg.h>
#include <pcb_calculator_frame_base.h>
#include <pcb_calculator.h>
#include <UnitSelector.h>
#include <units_scales.h>
#include "pcb_calculator_frame.h"
#include "units_scales.h"
// A helper class to handle min values
// Values are in meters.

2
pcb_calculator/class_regulator_data.h
View File

@ -33,6 +33,8 @@
#include <vector>
#include <wx/arrstr.h>
// Helper class to store parameters for a regulator
class REGULATOR_DATA
{

3
pcb_calculator/colorcode.cpp
View File

@ -21,8 +21,7 @@
#include <wx/app.h>
#include <wx/msgdlg.h>
#include <pcb_calculator_frame_base.h>
#include <pcb_calculator.h>
#include "pcb_calculator_frame.h"
void PCB_CALCULATOR_FRAME::OnToleranceSelection( wxCommandEvent& event )
{

2
pcb_calculator/common_data.cpp
View File

@ -23,7 +23,7 @@
* @note lists of constants used in different panels
*/
#include <common_data.h>
#include "common_data.h"
wxArrayString StandardRelativeDielectricConstantList()
{

16
pcb_calculator/datafile_read_write.cpp
View File

@ -22,15 +22,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <macros.h>
#include <common.h>
#include <kicad_string.h>
#include <pgm_base.h>
#include <pcb_calculator.h>
#include <pcb_calculator_datafile_lexer.h>
#include <class_regulator_data.h>
#include <datafile_read_write.h>
#include <build_version.h>
#include <class_regulator_data.h>
#include <common.h>
#include <datafile_read_write.h>
#include <kicad_string.h>
#include <macros.h>
#include <pcb_calculator_datafile_lexer.h>
#include <pcb_calculator_frame.h>
#include <pgm_base.h>
using namespace PCBCALC_DATA_T;

2
pcb_calculator/dialogs/pcb_calculator_frame_base.cpp
View File

@ -5,7 +5,7 @@
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "UnitSelector.h"
#include "widgets/unit_selector.h"
#include "pcb_calculator_frame_base.h"

52
pcb_calculator/dialogs/pcb_calculator_frame_base.fbp
View File

@ -8151,7 +8151,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -8340,7 +8340,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -8529,7 +8529,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -8718,7 +8718,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -8907,7 +8907,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -9096,7 +9096,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -9317,7 +9317,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_FREQUENCY; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_FREQUENCY; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -9767,7 +9767,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -10020,7 +10020,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -10273,7 +10273,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -10820,7 +10820,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_RESISTOR; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_RESISTOR; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -11009,7 +11009,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_RESISTOR; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_RESISTOR; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -11198,7 +11198,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_ANGLE; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_ANGLE; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -12444,7 +12444,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -12635,7 +12635,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h; Not forward_declare</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h; Not forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -12826,7 +12826,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h; Not forward_declare</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h; Not forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -13017,7 +13017,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h; Not forward_declare</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h; Not forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -13208,7 +13208,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h; Not forward_declare</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h; Not forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -13399,7 +13399,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_RESISTOR; UnitSelector.h; Not forward_declare</property>
<property name="subclass">UNIT_SELECTOR_RESISTOR; widgets/unit_selector.h; Not forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -16978,7 +16978,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -17457,7 +17457,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -17648,7 +17648,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_THICKNESS; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_THICKNESS; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -18777,7 +18777,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -18968,7 +18968,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_THICKNESS; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_THICKNESS; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -19916,7 +19916,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -20523,7 +20523,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">UNIT_SELECTOR_LEN; UnitSelector.h</property>
<property name="subclass">UNIT_SELECTOR_LEN; widgets/unit_selector.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>

2
pcb_calculator/dialogs/pcb_calculator_frame_base.h
View File

@ -16,7 +16,7 @@ class UNIT_SELECTOR_LEN;
class UNIT_SELECTOR_RESISTOR;
class UNIT_SELECTOR_THICKNESS;
#include "UnitSelector.h"
#include "widgets/unit_selector.h"
#include "kiway_player.h"
#include <wx/string.h>
#include <wx/menu.h>

6
pcb_calculator/electrical_spacing_values.cpp
View File

@ -24,10 +24,8 @@
#include <wx/app.h>
#include <pcb_calculator_frame_base.h>
#include <pcb_calculator.h>
#include <UnitSelector.h>
#include <units_scales.h>
#include "pcb_calculator_frame.h"
#include "units_scales.h"
extern double DoubleFromString( const wxString& TextValue );

4
pcb_calculator/eserie.cpp
View File

@ -20,7 +20,9 @@
*/
#include <dialog_helpers.h>
#include <pcb_calculator.h>
#include "class_regulator_data.h"
#include "attenuators/attenuator_classes.h"
#include "pcb_calculator_frame.h"
#include <wx/wx.h>
#include <array>

9
pcb_calculator/params_read_write.cpp
View File

@ -23,9 +23,8 @@
#include <wx/log.h>
#include <wx/msgdlg.h>
#include <pcb_calculator.h>
#include <pcb_calculator_frame_base.h>
#include <transline.h>
#include "pcb_calculator_frame.h"
#include "transline.h"
/*
* Return the value from a string,
@ -192,7 +191,7 @@ void PCB_CALCULATOR_FRAME::SetPrmBgColor( enum PRMS_ID aPrmId, const KIGFX::COLO
{
return;
}
TRANSLINE_IDENT* tr_ident = m_transline_list[m_currTransLineType];
for( unsigned ii = 0; ii < tr_ident->GetPrmsCount(); ii++ )
@ -206,7 +205,7 @@ void PCB_CALCULATOR_FRAME::SetPrmBgColor( enum PRMS_ID aPrmId, const KIGFX::COLO
ctl->SetStyle( 0, -1, ctl->GetDefaultStyle() );
return;
}
}
}

5
pcb_calculator/pcb_calculator.cpp
View File

@ -22,9 +22,8 @@
#include <kiface_i.h>
#include <settings/settings_manager.h>
#include <pcb_calculator_frame_base.h>
#include <pcb_calculator_settings.h>
#include <pcb_calculator.h>
#include "pcb_calculator_frame.h"
#include "pcb_calculator_settings.h"
// Pcb_calculator data file extension:
const wxString PcbCalcDataFileExt( wxT("pcbcalc") );

8
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -19,14 +19,14 @@
*/
#include <wx/wx.h>
#include <pgm_base.h>
#include <pcb_calculator.h>
#include <pcb_calculator_settings.h>
#include <UnitSelector.h>
#include <bitmaps.h>
#include <geometry/shape_poly_set.h>
#include <kiface_i.h>
#include "attenuators/attenuator_classes.h"
#include "class_regulator_data.h"
#include "pcb_calculator_frame.h"
#include "pcb_calculator_settings.h"
// extension of pcb_calculator data filename:
const wxString DataFileNameExt( wxT("pcbcalc") );

13
pcb_calculator/pcb_calculator.h → pcb_calculator/pcb_calculator_frame.h
View File

@ -24,17 +24,20 @@
#ifndef PCB_CALCULATOR_H
#define PCB_CALCULATOR_H
#include <pcb_calculator_frame_base.h>
#include "transline.h" // Included for SUBST_PRMS_ID definition.
#include "transline_ident.h"
#include "pcb_calculator_frame_base.h"
#include <attenuator_classes.h>
#include <class_regulator_data.h>
#include <transline.h> // Included for SUBST_PRMS_ID definition.
#include <transline_ident.h>
#include "attenuators/attenuator_classes.h"
#include "class_regulator_data.h"
extern const wxString PcbCalcDataFileExt;
class APP_SETTINGS_BASE;
class KIWAY;
class PCB_CALCULATOR_SETTINGS;
/* Class PCB_CALCULATOR_FRAME_BASE
This is the main frame for this application
*/

8
pcb_calculator/regulators_funct.cpp
View File

@ -23,11 +23,11 @@
#include <wx/wx.h>
#include <macros.h>
#include <pcb_calculator.h>
#include <class_regulator_data.h>
#include <dialog_regulator_data_base.h>
#include <pcb_calculator_settings.h>
#include "class_regulator_data.h"
#include "dialog_regulator_data_base.h"
#include "pcb_calculator_frame.h"
#include "pcb_calculator_settings.h"
extern double DoubleFromString( const wxString& TextValue );

15
pcb_calculator/tracks_width_versus_current.cpp
View File

@ -30,15 +30,14 @@
#include <kiface_i.h>
#include <dialog_helpers.h>
#include <pcb_calculator_frame_base.h>
#include <pcb_calculator.h>
#include <pcb_calculator_settings.h>
#include <UnitSelector.h>
#include <units_scales.h>
#include "attenuators/attenuator_classes.h"
#include "class_regulator_data.h"
#include "pcb_calculator_frame.h"
#include "pcb_calculator_settings.h"
#include "units_scales.h"
wxString tracks_width_versus_current_formula =
#include <tracks_width_versus_current_formula.h>
#include "tracks_width_versus_current_formula.h"
extern double DoubleFromString( const wxString& TextValue );
@ -424,7 +423,7 @@ void PCB_CALCULATOR_FRAME::TW_Init()
// Read parameter values.
auto cfg = static_cast<PCB_CALCULATOR_SETTINGS*>( Kiface().KifaceSettings() );
m_TrackCurrentValue->SetValue( cfg->m_TrackWidth.current );
m_TrackDeltaTValue->SetValue( cfg->m_TrackWidth.delta_tc );
m_TrackLengthValue->SetValue( cfg->m_TrackWidth.track_len );

8
pcb_calculator/transline/c_microstrip.cpp
View File

@ -31,10 +31,10 @@
#include <cstdlib>
#include <cstring>
#include <c_microstrip.h>
#include <microstrip.h>
#include <transline.h>
#include <units.h>
#include "c_microstrip.h"
#include "microstrip.h"
#include "transline.h"
#include "units.h"
C_MICROSTRIP::C_MICROSTRIP() : TRANSLINE(),
h( 0.0 ), // height of substrate

18
pcb_calculator/transline/coax.cpp
View File

@ -32,8 +32,8 @@
#include <cstdlib>
#include <cstring>
#include <coax.h>
#include <units.h>
#include "coax.h"
#include "units.h"
COAX::COAX() : TRANSLINE()
{
@ -67,11 +67,11 @@ double COAX::alphac_coax()
}
/**
/**
* \f$ Z_0 = \frac{Z_{0_{\mathrm{vaccum}}}}{\sqrt{\epsilon_r}}\log_{10}\left( \frac{D_{\mathrm{out}}}{D_{\mathrm{in}}}\right) \f$
*
*
* \f$ \lambda_g = \frac{c}{f \cdot \sqrt{ \epsilon_r \cdot \mu_r}} \f$
*
*
* \f$ L_{[\mathrm{rad}]} = \frac{ 2\pi\cdot L_{[\mathrm{m}]}}{\lambda_g} \f$
* */
void COAX::calcAnalyze()
@ -91,13 +91,13 @@ void COAX::calcAnalyze()
}
/**
/**
* \f$ D_{\mathrm{in}} = D_{\mathrm{out}} \cdot e^{-\frac{Z_0*\sqrt{\epsilon_r}}{2\pi \cdot Z_{0_{\mathrm{vaccum}}}}} \f$
*
*
* \f$ D_{\mathrm{out}} = D_{\mathrm{in}} \cdot e^{ \frac{Z_0*\sqrt{\epsilon_r}}{2\pi \cdot Z_{0_{\mathrm{vaccum}}}}} \f$
*
*
* \f$ \lambda_g = \frac{c}{f \cdot \sqrt{ \epsilon_r \cdot \mu_r}} \f$
*
*
* \f$ L_{[\mathrm{m}]} = \frac{ \lambda_g cdot L_{[\mathrm{m}]}}{2\pi} \f$
* */
void COAX::calcSynthesize()

4
pcb_calculator/transline/coplanar.cpp
View File

@ -28,8 +28,8 @@
#include <cstdlib>
#include <cstring>
#include <coplanar.h>
#include <units.h>
#include "coplanar.h"
#include "units.h"
COPLANAR::COPLANAR() : TRANSLINE()
{

6
pcb_calculator/transline/microstrip.cpp
View File

@ -34,10 +34,10 @@
#include <cstdlib>
#include <cstring>
#include <microstrip.h>
#include <transline.h>
#include "microstrip.h"
#include "transline.h"
#include <units.h>
#include "units.h"
MICROSTRIP::MICROSTRIP() : TRANSLINE(),
h( 0.0 ), // height of substrate

4
pcb_calculator/transline/rectwaveguide.cpp
View File

@ -25,8 +25,8 @@
#include <cstdio>
#include <cstring>
#include <rectwaveguide.h>
#include <units.h>
#include "rectwaveguide.h"
#include "units.h"
RECTWAVEGUIDE::RECTWAVEGUIDE() : TRANSLINE(),
mur( 0.0 ), // magnetic permeability of substrate

4
pcb_calculator/transline/stripline.cpp
View File

@ -27,8 +27,8 @@
#include <cstdlib>
#include <cstring>
#include <stripline.h>
#include <units.h>
#include "stripline.h"
#include "units.h"
STRIPLINE::STRIPLINE() : TRANSLINE()
{

4
pcb_calculator/transline/transline.cpp
View File

@ -24,9 +24,9 @@
#include <cmath>
#include <limits>
#include <transline.h>
#include <units.h>
#include "transline.h"
#include "units.h"
#ifndef INFINITY
#define INFINITY std::numeric_limits<double>::infinity()

24
pcb_calculator/transline/twistedpair.cpp
View File

@ -27,8 +27,8 @@
#include <cstdlib>
#include <cstring>
#include <twistedpair.h>
#include <units.h>
#include "twistedpair.h"
#include "units.h"
TWISTEDPAIR::TWISTEDPAIR() : TRANSLINE()
{
@ -39,30 +39,30 @@ TWISTEDPAIR::TWISTEDPAIR() : TRANSLINE()
/**
* \f$ \theta = \arctan\left( T \cdot \pi \cdot D_{out} \right) \f$
*
*
* Where :
* - \f$ \theta \f$ : pitch angle
* - \f$ \theta \f$ : pitch angle
* - \f$ T \f$ : Number of twists per unit length
* - \f$ D_{out} \f$ : Wire diameter with insulation
*
*
* \f$ e_{eff} = e_{env} \cdot \left( 0.25 + 0.0007 \cdot \theta^2 \right)\cdot\left(e_r-e_{env}\right) \f$
*
*
* Where :
* - \f$ e_{env} \f$ : relative dielectric constant of air ( or some other surronding material ),
* - \f$ e_r \f$ : relative dielectric constant of the film insulation,
* - \f$ e_{eff} \f$ : effective relative dielectric constant
*
* - \f$ e_{eff} \f$ : effective relative dielectric constant
*
* \f$ Z_0 = \frac{Z_\mathrm{VACCUM}}{\pi \cdot \sqrt{e_{eff}}}\cosh^{-1}\left(\frac{D_{out}}{D_{in}}\right) \f$
*
*
* - \f$ Z_0 \f$ : line impedance
* - \f$ Z_\mathrm{VACCUM} \f$ : vaccum impedance
* - \f$ D_{in} \f$ : Wire diameter without insulation
*
*
* Reference for above equations :
*
*
* [1] : P. Lefferson, ``Twisted Magnet Wire Transmission Line,''
* IEEE Transactions on Parts, Hybrids, and Packaging, vol. PHP-7, no. 4, pp. 148-154, Dec. 1971.
*
*
* The following URL can be used as reference : http://qucs.sourceforge.net/tech/node93.html
**/
void TWISTEDPAIR::calcAnalyze()

3
pcb_calculator/transline/units.h
View File

@ -26,7 +26,8 @@
#include <config.h>
#include <cmath>
#include <units_scales.h>
#include "units_scales.h"
#ifndef HAVE_CMATH_ASINH
inline double asinh( double x )

7
pcb_calculator/transline_dlg_funct.cpp
View File

@ -21,11 +21,10 @@
#include <wx/settings.h>
#include <wx/wx.h>
#include <pcb_calculator_frame_base.h>
#include <pcb_calculator.h>
#include <UnitSelector.h>
#include <common_data.h>
#include "common_data.h"
#include "pcb_calculator_frame.h"
#include "widgets/unit_selector.h"
extern double DoubleFromString( const wxString& TextValue );

6
pcb_calculator/transline_ident.cpp
View File

@ -46,9 +46,9 @@
#include <twistedpair.h>
#include <kiface_i.h>
#include <pcb_calculator_settings.h>
#include <UnitSelector.h>
#include <transline_ident.h>
#include "pcb_calculator_settings.h"
#include "widgets/unit_selector.h"
#include "transline_ident.h"
/*

2
pcb_calculator/transline_ident.h
View File

@ -28,7 +28,7 @@
#include <vector>
#include <wx/bitmap.h>
#include <transline.h>
#include "transline.h"
// An enum to handle muwave shapes:
enum TRANSLINE_TYPE_ID {

11
pcb_calculator/via.cpp
View File

@ -46,12 +46,13 @@
#include <wx/wx.h>
#include <kiface_i.h>
#include <pcb_calculator.h>
#include <pcb_calculator_settings.h>
#include <UnitSelector.h>
#include <units_scales.h>
#include <common_data.h>
#include "attenuators/attenuator_classes.h"
#include "common_data.h"
#include "class_regulator_data.h"
#include "pcb_calculator_frame.h"
#include "pcb_calculator_settings.h"
#include "units_scales.h"
extern double DoubleFromString( const wxString& TextValue );

4
pcb_calculator/UnitSelector.cpp → pcb_calculator/widgets/unit_selector.cpp
View File

@ -23,8 +23,8 @@
* a wxChoiceBox to select units in Pcb_Calculator
*/
#include <UnitSelector.h>
#include <units_scales.h>
#include "unit_selector.h"
#include "units_scales.h"
UNIT_SELECTOR_LEN::UNIT_SELECTOR_LEN( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,

0
pcb_calculator/UnitSelector.h → pcb_calculator/widgets/unit_selector.h
View File