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

pcb_calculator, panel_cable_size: commit missing changes.

This commit is contained in:
jean-pierre charras 2023-05-24 13:23:08 +02:00
parent ed6a56cb57
commit cd904dc2b9
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcb_calculator/pcb_calculator_settings.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2022 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2023 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -69,6 +69,7 @@ PCB_CALCULATOR_SETTINGS::PCB_CALCULATOR_SETTINGS() :
m_params.emplace_back( new PARAM<wxString>( "electrical.spacing_voltage", m_params.emplace_back( new PARAM<wxString>( "electrical.spacing_voltage",
&m_Electrical.spacing_voltage, "500" ) ); &m_Electrical.spacing_voltage, "500" ) );
// Regulators params
m_params.emplace_back( new PARAM<wxString>( "regulators.r1", &m_Regulators.r1, "10" ) ); m_params.emplace_back( new PARAM<wxString>( "regulators.r1", &m_Regulators.r1, "10" ) );
m_params.emplace_back( new PARAM<wxString>( "regulators.r2", &m_Regulators.r2, "10" ) ); m_params.emplace_back( new PARAM<wxString>( "regulators.r2", &m_Regulators.r2, "10" ) );
@ -83,7 +84,11 @@ PCB_CALCULATOR_SETTINGS::PCB_CALCULATOR_SETTINGS() :
m_params.emplace_back( new PARAM<wxString>( "regulators.selected_regulator", m_params.emplace_back( new PARAM<wxString>( "regulators.selected_regulator",
&m_Regulators.selected_regulator, "" ) ); &m_Regulators.selected_regulator, "" ) );
m_params.emplace_back( new PARAM<int>( "regulators.type", &m_Regulators.type, 0 ) );
m_params.emplace_back( new PARAM<int>( "regulators.last_param", &m_Regulators.last_param, 0 ) );
// cable_size params
m_params.emplace_back( new PARAM<wxString>( "cable_size.conductorMaterialResitivity", m_params.emplace_back( new PARAM<wxString>( "cable_size.conductorMaterialResitivity",
&m_cableSize.conductorMaterialResitivity, "" ) ); &m_cableSize.conductorMaterialResitivity, "" ) );
@ -93,9 +98,8 @@ PCB_CALCULATOR_SETTINGS::PCB_CALCULATOR_SETTINGS() :
m_params.emplace_back( new PARAM<wxString>( "cable_size.conductorThermalCoef", m_params.emplace_back( new PARAM<wxString>( "cable_size.conductorThermalCoef",
&m_cableSize.conductorThermalCoef, "" ) ); &m_cableSize.conductorThermalCoef, "" ) );
m_params.emplace_back( new PARAM<int>( "regulators.type", &m_Regulators.type, 0 ) ); m_params.emplace_back( new PARAM<int>( "cable_size.currentDensityChoice",
&m_cableSize.currentDensityChoice, 0 ) );
m_params.emplace_back( new PARAM<int>( "regulators.last_param", &m_Regulators.last_param, 0 ) );
m_params.emplace_back( m_params.emplace_back(
new PARAM<int>( "cable_size.diameterUnit", &m_cableSize.diameterUnit, 0 ) ); new PARAM<int>( "cable_size.diameterUnit", &m_cableSize.diameterUnit, 0 ) );
@ -107,6 +111,7 @@ PCB_CALCULATOR_SETTINGS::PCB_CALCULATOR_SETTINGS() :
m_params.emplace_back( new PARAM<int>( "cable_size.lengthUnit", &m_cableSize.lengthUnit, 0 ) ); m_params.emplace_back( new PARAM<int>( "cable_size.lengthUnit", &m_cableSize.lengthUnit, 0 ) );
// wavelength params
m_params.emplace_back( m_params.emplace_back(
new PARAM<double>( "wavelength.frequency", &m_wavelength.frequency, 1e9 ) ); new PARAM<double>( "wavelength.frequency", &m_wavelength.frequency, 1e9 ) );

3
pcb_calculator/pcb_calculator_settings.h
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2020-2023 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -68,6 +68,7 @@ public:
int linResUnit; int linResUnit;
int frequencyUnit; int frequencyUnit;
int lengthUnit; int lengthUnit;
int currentDensityChoice;
wxString conductorMaterialResitivity; wxString conductorMaterialResitivity;
wxString conductorTemperature; wxString conductorTemperature;
wxString conductorThermalCoef; wxString conductorThermalCoef;