diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt index 087a7916dd..12668ab668 100644 --- a/pcb_calculator/CMakeLists.txt +++ b/pcb_calculator/CMakeLists.txt @@ -13,6 +13,7 @@ set( PCB_CALCULATOR_SRCS attenuators.cpp board_classes_values.cpp colorcode.cpp + common_data.cpp electrical_spacing_values.cpp params_read_write.cpp pcb_calculator_frame.cpp diff --git a/pcb_calculator/UnitSelector.cpp b/pcb_calculator/UnitSelector.cpp index 913fce1213..a0f45d820c 100644 --- a/pcb_calculator/UnitSelector.cpp +++ b/pcb_calculator/UnitSelector.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011-2014 Jean-Pierre Charras - * Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /** diff --git a/pcb_calculator/UnitSelector.h b/pcb_calculator/UnitSelector.h index c402624b05..e6ede59c60 100644 --- a/pcb_calculator/UnitSelector.h +++ b/pcb_calculator/UnitSelector.h @@ -2,11 +2,11 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011-2014 Jean-Pierre Charras - * Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /** diff --git a/pcb_calculator/board_classes_values.cpp b/pcb_calculator/board_classes_values.cpp index 4398105227..bab8f58bee 100644 --- a/pcb_calculator/board_classes_values.cpp +++ b/pcb_calculator/board_classes_values.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2015 jean-pierre.charras - * Copyright (C) 2015 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2015 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include @@ -33,7 +29,7 @@ // A helper class to handle min values // Values are in meters. -// Note : use -1.0 when a vaule is irrelevant in a class +// Note : use -1.0 when a value is irrelevant in a class class BOARD_MIN_SIZE_VALUES { public: diff --git a/pcb_calculator/colorcode.cpp b/pcb_calculator/colorcode.cpp index a14569ba83..09d74be414 100644 --- a/pcb_calculator/colorcode.cpp +++ b/pcb_calculator/colorcode.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2011 jean-pierre.charras - * Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2011 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include diff --git a/pcb_calculator/common_data.cpp b/pcb_calculator/common_data.cpp new file mode 100644 index 0000000000..9c511e4bdf --- /dev/null +++ b/pcb_calculator/common_data.cpp @@ -0,0 +1,102 @@ +/* + * This program source code file is part of KICAD, a free EDA CAD application. + * + * Copyright (C) 2019 jean-pierre.charras + * Copyright (C) 1992-2019 Kicad Developers, see AUTHORS.txt for contributors. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/** + * @file common_data.cpp + * @note lists of constants used in different panels + */ + +#include + +wxArrayString StandardRelativeDielectricConstantList() +{ + wxArrayString list; + + // EpsilonR ( relative dielectric constant) list + list.Add( wxT( "4.5 FR4" ) ); + list.Add( wxT( "3.67 Isola FR408" ) ); + list.Add( wxT( "4.04 Isola 370HR" ) ); + list.Add( wxT( "3.55 Rogers RO4003C" ) ); + list.Add( wxT( "3.66 Rogers R4350B" ) ); + list.Add( wxT( "9.8 alumina (Al2O3)" ) ); + list.Add( wxT( "3.78 fused quartz" ) ); + list.Add( wxT( "3.38 RO4003" ) ); + list.Add( wxT( "2.2 RT/duroid 5880" ) ); + list.Add( wxT( "10.2 RT/duroid 6010LM" ) ); + list.Add( wxT( "2.1 teflon (PTFE)" ) ); + list.Add( wxT( "4.0 PVC" ) ); + list.Add( wxT( "2.3 PE" ) ); + list.Add( wxT( "6.6 beryllia (BeO)" ) ); + list.Add( wxT( "8.7 aluminum nitride" ) ); + list.Add( wxT( "11.9 silicon" ) ); + list.Add( wxT( "12.9 GaAs" ) ); + + return list; +} + + +wxArrayString StandardLossTangentList() +{ + wxArrayString list; + + // List of current dielectric loss factor (tangent delta) + list.Clear(); + list.Add( wxT( "2e-2 FR4 @ 1GHz" ) ); + list.Add( wxT( "12e-3 Isola FR408 @ 2 GHz" ) ); + list.Add( wxT( "21e-3 Isola 370HR @ 2 GHz" ) ); + list.Add( wxT( "27e-4 Rogers RO4003C @ 10 GHz" ) ); + list.Add( wxT( "21e-4 Rogers RO4003C @ 2.5 GHz" ) ); + list.Add( wxT( "37e-4 Rogers RO4350B @ 10 GHz" ) ); + list.Add( wxT( "31e-4 Rogers RO4350B @ 2.5 GHz" ) ); + list.Add( wxT( "3e-4 beryllia @ 10GHz" ) ); + list.Add( wxT( "2e-4 aluminia (Al2O3) @ 10GHz" ) ); + list.Add( wxT( "1e-4 fused quartz @ 10GHz" ) ); + list.Add( wxT( "2e-3 RO4003 @ 10GHz" ) ); + list.Add( wxT( "9e-4 RT/duroid 5880 @ 10GHz" ) ); + list.Add( wxT( "2e-4 teflon (PTFE) @ 1MHz" ) ); + list.Add( wxT( "5e-2 PVC @ 1MHz" ) ); + list.Add( wxT( "2e-4 PE @ 1MHz" ) ); + list.Add( wxT( "1e-3 aluminum nitride @ 10GHz" ) ); + list.Add( wxT( "0.015 silicon @ 10GHz" ) ); + list.Add( wxT( "0.002 GaAs @ 10GHz" ) ); + + return list; +} + + +wxArrayString StandardResistivityList() +{ + wxArrayString list; + + // Specific resistance list in ohms*meters (rho): + list.Clear(); + list.Add( wxT( "2.4e-8 gold" ) ); + list.Add( wxT( "1.72e-8 copper" ) ); + list.Add( wxT( "1.62e-8 silver" ) ); + list.Add( wxT( "12.4e-8 tin" ) ); + list.Add( wxT( "10.5e-8 platinum" ) ); + list.Add( wxT( "2.62e-8 aluminum" ) ); + list.Add( wxT( "6.9e-8 nickel" ) ); + list.Add( wxT( "3.9e-8 brass (66Cu 34Zn)" ) ); + list.Add( wxT( "9.71e-8 iron" ) ); + list.Add( wxT( "6.0e-8 zinc" ) ); + + return list; +} diff --git a/pcb_calculator/common_data.h b/pcb_calculator/common_data.h new file mode 100644 index 0000000000..e993824e4a --- /dev/null +++ b/pcb_calculator/common_data.h @@ -0,0 +1,50 @@ +/* + * This program source code file is part of KICAD, a free EDA CAD application. + * + * Copyright (C) 2019 jean-pierre.charras + * Copyright (C) 1992-2019 Kicad Developers, see AUTHORS.txt for contributors. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/** + * @file common_data.h + * @note lists of constants used in different panels + */ + +#ifndef COMMON_DATA_H +#define COMMON_DATA_H + +#include + +/** + * @return a list of dielectric constants (Er) of some materials + * used to make PCBs + */ +wxArrayString StandardRelativeDielectricConstantList(); + + +/** + * @return a list of loss tangent of some materials + * used to make PCBs + */ +wxArrayString StandardLossTangentList(); + +/** + * @return a list of resistivity constants (Er) of some conductors + * used to make PCBs + */ +wxArrayString StandardResistivityList(); + +#endif // #ifndef COMMON_DATA_H diff --git a/pcb_calculator/datafile_read_write.cpp b/pcb_calculator/datafile_read_write.cpp index f8f367ed33..74523929e9 100644 --- a/pcb_calculator/datafile_read_write.cpp +++ b/pcb_calculator/datafile_read_write.cpp @@ -6,11 +6,11 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2016 Jean-Pierre Charras - * Copyright (C) 1992-2016 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -18,12 +18,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include diff --git a/pcb_calculator/datafile_read_write.h b/pcb_calculator/datafile_read_write.h index 1b05e52472..8326309300 100644 --- a/pcb_calculator/datafile_read_write.h +++ b/pcb_calculator/datafile_read_write.h @@ -3,7 +3,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 1992-2011 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,12 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index 6210eb7fe4..7cae9330bc 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -523,326 +523,311 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelViaSize = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerViaSize; bSizerViaSize = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticBoxSizer* sbSizerVS_Inputs; sbSizerVS_Inputs = new wxStaticBoxSizer( new wxStaticBox( m_panelViaSize, wxID_ANY, _("Parameters:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerVS_Inputs; fgSizerVS_Inputs = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizerVS_Inputs->AddGrowableCol( 1 ); fgSizerVS_Inputs->SetFlexibleDirection( wxBOTH ); fgSizerVS_Inputs->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextHoleDia = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("D:"), wxDefaultPosition, wxDefaultSize, 0 ); + + m_staticTextHoleDia = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Finished hole diameter (D):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextHoleDia->Wrap( -1 ); m_staticTextHoleDia->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_staticTextHoleDia->SetToolTip( _("Finished hole dia") ); - + fgSizerVS_Inputs->Add( m_staticTextHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_textCtrlHoleDia = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_choiceHoleDiaChoices; m_choiceHoleDia = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHoleDiaChoices, 0 ); m_choiceHoleDia->SetSelection( 0 ); fgSizerVS_Inputs->Add( m_choiceHoleDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - - m_staticTextPlatingThickness = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("T:"), wxDefaultPosition, wxDefaultSize, 0 ); + + m_staticTextPlatingThickness = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Plating thickness (T):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPlatingThickness->Wrap( -1 ); - m_staticTextPlatingThickness->SetToolTip( _("Plating thickness") ); - fgSizerVS_Inputs->Add( m_staticTextPlatingThickness, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlPlatingThickness = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlPlatingThickness, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_choicePlatingThicknessChoices; m_choicePlatingThickness = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePlatingThicknessChoices, 0 ); m_choicePlatingThickness->SetSelection( 0 ); fgSizerVS_Inputs->Add( m_choicePlatingThickness, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_staticTextViaLength = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Via length:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextViaLength->Wrap( -1 ); fgSizerVS_Inputs->Add( m_staticTextViaLength, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_textCtrlViaLength = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlViaLength, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_choiceViaLengthChoices; m_choiceViaLength = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceViaLengthChoices, 0 ); m_choiceViaLength->SetSelection( 0 ); fgSizerVS_Inputs->Add( m_choiceViaLength, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextViaPadDia = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Via pad dia:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextViaPadDia->Wrap( -1 ); m_staticTextViaPadDia->SetToolTip( _("Diameter of pad surrounding via") ); - + fgSizerVS_Inputs->Add( m_staticTextViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_textCtrlViaPadDia = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_choiceViaPadDiaChoices; m_choiceViaPadDia = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceViaPadDiaChoices, 0 ); m_choiceViaPadDia->SetSelection( 0 ); fgSizerVS_Inputs->Add( m_choiceViaPadDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextClearanceDia = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Clearance hole dia:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextClearanceDia->Wrap( -1 ); m_staticTextClearanceDia->SetToolTip( _("Diameter of clearance hole in ground plane(s)") ); - + fgSizerVS_Inputs->Add( m_staticTextClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_textCtrlClearanceDia = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_choiceClearanceDiaChoices; m_choiceClearanceDia = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceClearanceDiaChoices, 0 ); m_choiceClearanceDia->SetSelection( 0 ); fgSizerVS_Inputs->Add( m_choiceClearanceDia, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - - m_staticTextBoardThickness = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("PCB thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextBoardThickness->Wrap( -1 ); - fgSizerVS_Inputs->Add( m_staticTextBoardThickness, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - - m_textCtrlBoardThickness = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerVS_Inputs->Add( m_textCtrlBoardThickness, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - - wxArrayString m_choiceBoardThicknessChoices; - m_choiceBoardThickness = new UNIT_SELECTOR_LEN( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceBoardThicknessChoices, 0 ); - m_choiceBoardThickness->SetSelection( 0 ); - fgSizerVS_Inputs->Add( m_choiceBoardThickness, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextImpedance = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Z0:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextImpedance->Wrap( -1 ); m_staticTextImpedance->SetToolTip( _("Characteristic impedance of conductor") ); - + fgSizerVS_Inputs->Add( m_staticTextImpedance, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_textCtrlImpedance = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlImpedance, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + wxArrayString m_choiceImpedanceChoices; m_choiceImpedance = new UNIT_SELECTOR_RESISTOR( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceImpedanceChoices, 0 ); m_choiceImpedance->SetSelection( 0 ); fgSizerVS_Inputs->Add( m_choiceImpedance, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticAppliedCurrent = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Applied current:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticAppliedCurrent->Wrap( -1 ); fgSizerVS_Inputs->Add( m_staticAppliedCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT, 5 ); - + m_textCtrlAppliedCurrent = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlAppliedCurrent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextAppliedCurrentUnits = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAppliedCurrentUnits->Wrap( -1 ); fgSizerVS_Inputs->Add( m_staticTextAppliedCurrentUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticTextResistivity = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Plating resistivity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextResistivity->Wrap( -1 ); m_staticTextResistivity->SetToolTip( _("Specific resistance in ohms * meters") ); - + fgSizerVS_Inputs->Add( m_staticTextResistivity, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_textCtrlPlatingResistivity = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlPlatingResistivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_button_ResistivityVia = new wxButton( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerVS_Inputs->Add( m_button_ResistivityVia, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextPermittivity = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Er:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPermittivity->Wrap( -1 ); m_staticTextPermittivity->SetToolTip( _("Relative dielectric constant (epsilon r)") ); - + fgSizerVS_Inputs->Add( m_staticTextPermittivity, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_textCtrlPlatingPermittivity = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlPlatingPermittivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_button_Permittivity = new wxButton( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("..."), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); fgSizerVS_Inputs->Add( m_button_Permittivity, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextTemperatureDiff = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Temperature rise:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTemperatureDiff->Wrap( -1 ); m_staticTextTemperatureDiff->SetToolTip( _("Maximum acceptable rise in temperature") ); - + fgSizerVS_Inputs->Add( m_staticTextTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_textCtrlTemperatureDiff = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlTemperatureDiff, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextTemperatureUnits = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("deg C"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTemperatureUnits->Wrap( -1 ); fgSizerVS_Inputs->Add( m_staticTextTemperatureUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticTextRiseTime = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("Pulse rise time:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRiseTime->Wrap( -1 ); m_staticTextRiseTime->SetToolTip( _("Pulse rise time to calculate reactance") ); - + fgSizerVS_Inputs->Add( m_staticTextRiseTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_textCtrlRiseTime = new wxTextCtrl( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerVS_Inputs->Add( m_textCtrlRiseTime, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_staticTextRiseTimeUnits = new wxStaticText( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, _("ns"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRiseTimeUnits->Wrap( -1 ); m_staticTextRiseTimeUnits->SetToolTip( _("nanoseconds") ); - + fgSizerVS_Inputs->Add( m_staticTextRiseTimeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + sbSizerVS_Inputs->Add( fgSizerVS_Inputs, 0, wxEXPAND, 5 ); - + m_staticline31 = new wxStaticLine( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); sbSizerVS_Inputs->Add( m_staticline31, 0, wxALL|wxEXPAND, 5 ); - + m_bitmap10 = new wxStaticBitmap( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxBitmap( via_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); m_bitmap10->SetToolTip( _("Top view of via") ); - + sbSizerVS_Inputs->Add( m_bitmap10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); - - + + bSizerViaSize->Add( sbSizerVS_Inputs, 1, wxEXPAND|wxALL, 5 ); - + wxStaticBoxSizer* sbSizerVS_Result; sbSizerVS_Result = new wxStaticBoxSizer( new wxStaticBox( m_panelViaSize, wxID_ANY, _("Results:") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizerTW_Results11; fgSizerTW_Results11 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizerTW_Results11->AddGrowableCol( 1 ); fgSizerTW_Results11->SetFlexibleDirection( wxBOTH ); fgSizerTW_Results11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextArea11 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextArea11->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticTextArea11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ViaResistance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaResistance->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaResistance, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_IntTrackAreaUnitLabel1 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_IntTrackAreaUnitLabel1->Wrap( -1 ); fgSizerTW_Results11->Add( m_IntTrackAreaUnitLabel1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText65111 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Voltage drop:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText65111->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticText65111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ViaVoltageDrop = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaVoltageDrop->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaVoltageDrop, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText8411 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Volt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText8411->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticText8411, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText66111 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Power loss:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText66111->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticText66111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ViaPowerLoss = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaPowerLoss->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaPowerLoss, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText8311 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Watt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText8311->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticText8311, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText79211 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Thermal resistance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText79211->Wrap( -1 ); m_staticText79211->SetToolTip( _("Using thermal conductivity value 401 Watts/(meter-Kelvin)") ); - + fgSizerTW_Results11->Add( m_staticText79211, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ViaThermalResistance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaThermalResistance->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaThermalResistance, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticText791111 = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("deg C/Watt"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText791111->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticText791111, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticTextAmpacity = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Estimated ampacity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAmpacity->Wrap( -1 ); m_staticTextAmpacity->SetToolTip( _("Based on temperature rise") ); - + fgSizerTW_Results11->Add( m_staticTextAmpacity, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_ViaAmpacity = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaAmpacity->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaAmpacity, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - + m_staticTextAmpacityUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("A"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAmpacityUnits->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticTextAmpacityUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticTextCapacitance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Capacitance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCapacitance->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticTextCapacitance, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_ViaCapacitance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_ViaCapacitance->Wrap( -1 ); fgSizerTW_Results11->Add( m_ViaCapacitance, 0, wxALL, 5 ); - + m_staticTextCapacitanceUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("pF"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCapacitanceUnits->Wrap( -1 ); m_staticTextCapacitanceUnits->SetToolTip( _("pico-Farad") ); - + fgSizerTW_Results11->Add( m_staticTextCapacitanceUnits, 0, wxALL, 5 ); - + m_staticTextRiseTimeOutput = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Rise time degradation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRiseTimeOutput->Wrap( -1 ); m_staticTextRiseTimeOutput->SetToolTip( _("Rise time degradation for given Z0 and calculated capacitance") ); - + fgSizerTW_Results11->Add( m_staticTextRiseTimeOutput, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_RiseTimeOutput = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_RiseTimeOutput->Wrap( -1 ); fgSizerTW_Results11->Add( m_RiseTimeOutput, 0, wxALL, 5 ); - + m_staticTextRiseTimeOutputUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("ps"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRiseTimeOutputUnits->Wrap( -1 ); m_staticTextRiseTimeOutputUnits->SetToolTip( _("picoseconds") ); - + fgSizerTW_Results11->Add( m_staticTextRiseTimeOutputUnits, 0, wxALL, 5 ); - + m_staticTextInductance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Inductance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInductance->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticTextInductance, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_Inductance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Inductance->Wrap( -1 ); fgSizerTW_Results11->Add( m_Inductance, 0, wxALL, 5 ); - + m_staticTextInductanceUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("nH"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInductanceUnits->Wrap( -1 ); m_staticTextInductanceUnits->SetToolTip( _("nano-Henry") ); - + fgSizerTW_Results11->Add( m_staticTextInductanceUnits, 0, wxALL, 5 ); - + m_staticTextReactance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Reactance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextReactance->Wrap( -1 ); m_staticTextReactance->SetToolTip( _("Inductive reactance for given rise time and calculated inductance") ); - + fgSizerTW_Results11->Add( m_staticTextReactance, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_Reactance = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_Reactance->Wrap( -1 ); fgSizerTW_Results11->Add( m_Reactance, 0, wxALL, 5 ); - + m_staticTextReactanceUnits = new wxStaticText( sbSizerVS_Result->GetStaticBox(), wxID_ANY, _("Ohm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextReactanceUnits->Wrap( -1 ); fgSizerTW_Results11->Add( m_staticTextReactanceUnits, 0, wxALL, 5 ); - - + + sbSizerVS_Result->Add( fgSizerTW_Results11, 0, wxEXPAND, 5 ); - - + + bSizerViaSize->Add( sbSizerVS_Result, 1, wxEXPAND|wxALL, 5 ); - - + + m_panelViaSize->SetSizer( bSizerViaSize ); m_panelViaSize->Layout(); bSizerViaSize->Fit( m_panelViaSize ); @@ -1666,6 +1651,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow this->SetSizer( bmainFrameSizer ); this->Layout(); bmainFrameSizer->Fit( this ); + this->Centre( wxBOTH ); // Connect Events @@ -1700,8 +1686,6 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_choiceViaPadDia->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_textCtrlClearanceDia->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_choiceClearanceDia->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); - m_textCtrlBoardThickness->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); - m_choiceBoardThickness->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_textCtrlImpedance->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_choiceImpedance->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_textCtrlAppliedCurrent->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); @@ -1764,8 +1748,6 @@ PCB_CALCULATOR_FRAME_BASE::~PCB_CALCULATOR_FRAME_BASE() m_choiceViaPadDia->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_textCtrlClearanceDia->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_choiceClearanceDia->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); - m_textCtrlBoardThickness->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); - m_choiceBoardThickness->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_textCtrlImpedance->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_choiceImpedance->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); m_textCtrlAppliedCurrent->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnViaCalculate ), NULL, this ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 89eae2c0c5..c7b1100fc7 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -54,54 +54,7 @@ pcb_calculator wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL 1 - - - - - - - - - - - - - - - - OnClosePcbCalc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -124,36 +77,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177,36 +100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -270,38 +163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Regulators @@ -357,36 +218,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerMainReg @@ -476,36 +307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -564,36 +365,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -620,7 +391,6 @@ wxVERTICAL 1 none - 5 wxALL|wxALIGN_CENTER_HORIZONTAL @@ -680,36 +450,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -803,37 +543,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -895,36 +604,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -989,40 +668,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1084,36 +729,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1178,37 +793,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1270,36 +854,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1364,40 +918,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1459,36 +979,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,37 +1043,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1645,36 +1104,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1739,40 +1168,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1834,36 +1229,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1935,36 +1300,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2029,40 +1364,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2124,36 +1425,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2225,36 +1496,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2319,40 +1560,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2414,36 +1621,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2515,36 +1692,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2609,37 +1756,7 @@ - - - - - - - - OnRegulTypeSelection - - - - - - - - - - - - - - - - - - - - - - @@ -2724,37 +1841,7 @@ - - - - - - OnRegulatorCalcButtonClick - - - - - - - - - - - - - - - - - - - - - - - - @@ -2769,7 +1856,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -2832,37 +1918,7 @@ - - - - - - - - OnRegulatorSelection - - - - - - - - - - - - - - - - - - - - - - @@ -2924,36 +1980,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3027,40 +2053,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3133,37 +2125,7 @@ - - - - - - OnDataFileSelection - - - - - - - - - - - - - - - - - - - - - - - - @@ -3247,37 +2209,7 @@ - - - - - - OnEditRegulator - - - - - - - - - - - - - - - - - - - - - - - - @@ -3350,37 +2282,7 @@ - - - - - - OnAddRegulator - - - - - - - - - - - - - - - - - - - - - - - - @@ -3453,37 +2355,7 @@ - - - - - - OnRemoveRegulator - - - - - - - - - - - - - - - - - - - - - - - - @@ -3549,36 +2421,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3641,36 +2483,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerTrackWidth @@ -3697,7 +2509,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -3773,36 +2584,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3867,40 +2648,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWCalculateFromCurrent - - - - @@ -3962,36 +2710,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4053,36 +2771,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4147,40 +2835,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -4242,36 +2897,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4333,36 +2958,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4427,40 +3022,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -4525,37 +3087,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -4617,36 +3149,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4711,40 +3213,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -4806,36 +3275,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4898,39 +3337,6 @@ wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4956,7 +3362,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -5032,36 +3437,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5126,40 +3501,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWCalculateFromExtWidth - - - - @@ -5224,37 +3566,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -5316,36 +3628,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5410,40 +3692,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -5508,37 +3757,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -5597,36 +3816,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5685,36 +3874,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5773,36 +3932,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5864,36 +3993,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5955,36 +4054,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6046,36 +4115,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6137,36 +4176,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6228,36 +4237,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6319,36 +4298,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6410,36 +4359,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6501,36 +4420,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6592,36 +4481,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6683,36 +4542,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6774,36 +4603,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6865,36 +4664,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6913,7 +4682,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -6989,36 +4757,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7083,40 +4821,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWCalculateFromIntWidth - - - - @@ -7181,37 +4886,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -7273,36 +4948,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7367,40 +5012,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTWParametersChanged - - - - @@ -7465,37 +5077,7 @@ - - - - - - - - OnTWParametersChanged - - - - - - - - - - - - - - - - - - - - - - @@ -7557,36 +5139,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7648,36 +5200,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7739,36 +5261,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7830,36 +5322,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7921,36 +5383,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8012,36 +5444,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8103,36 +5505,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8194,36 +5566,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8285,36 +5627,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8376,36 +5688,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8467,36 +5749,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8558,36 +5810,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8654,36 +5876,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerViaSize @@ -8701,7 +5893,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -8750,7 +5941,7 @@ 0 0 wxID_ANY - D: + Finished hole diameter (D): 0 0 @@ -8772,41 +5963,11 @@ 0 - Finished hole dia + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8871,40 +6032,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -8969,37 +6097,7 @@ - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - @@ -9034,7 +6132,7 @@ 0 0 wxID_ANY - T: + Plating thickness (T): 0 0 @@ -9056,41 +6154,11 @@ 0 - Plating thickness + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9155,40 +6223,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -9253,37 +6288,7 @@ - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - @@ -9345,36 +6350,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9439,40 +6414,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -9537,37 +6479,7 @@ - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - @@ -9629,36 +6541,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -9723,40 +6605,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -9821,37 +6670,7 @@ - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - @@ -9913,36 +6732,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10007,40 +6796,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -10105,321 +6861,7 @@ - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - PCB thickness: - 0 - - 0 - - - 0 - - 1 - m_staticTextBoardThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrlBoardThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceBoardThickness - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - UNIT_SELECTOR_LEN; UnitSelector.h; Not forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - @@ -10481,36 +6923,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10575,40 +6987,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -10673,37 +7052,7 @@ - - - - - - - - OnViaCalculate - - - - - - - - - - - - - - - - - - - - - - @@ -10765,36 +7114,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10859,40 +7178,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -10954,36 +7240,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11045,36 +7301,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11139,40 +7365,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -11245,37 +7438,7 @@ - - - - - - OnViaRho_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -11337,36 +7500,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11431,40 +7564,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -11537,37 +7637,7 @@ - - - - - - OnViaEpsilonR_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -11629,36 +7699,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11723,40 +7763,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -11818,36 +7825,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11909,36 +7886,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12003,40 +7950,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnViaCalculate - - - - @@ -12098,36 +8012,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12188,36 +8072,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12276,36 +8130,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12322,7 +8146,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -12398,36 +8221,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12489,36 +8282,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12580,36 +8343,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12671,36 +8404,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12762,36 +8465,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12853,36 +8526,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -12944,36 +8587,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13035,36 +8648,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13126,36 +8709,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13217,36 +8770,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13308,36 +8831,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13399,36 +8892,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13490,36 +8953,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13581,36 +9014,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13672,36 +9075,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13763,36 +9136,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13854,36 +9197,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13945,36 +9258,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14036,36 +9319,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14127,36 +9380,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14218,36 +9441,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14309,36 +9502,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14400,36 +9563,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14491,36 +9624,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14582,36 +9685,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14673,36 +9746,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14764,36 +9807,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14858,36 +9871,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerElectricalClearance @@ -14964,37 +9947,7 @@ - - - - - - - - OnElectricalSpacingUnitsSelection - - - - - - - - - - - - - - - - - - - - - - @@ -15053,36 +10006,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15144,36 +10067,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15238,40 +10131,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15344,37 +10203,7 @@ - - - - - - OnElectricalSpacingRefresh - - - - - - - - - - - - - - - - - - - - - - - - @@ -15447,36 +10276,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15500,15 +10299,15 @@ 1 - wxALIGN_CENTRE + wxALIGN_CENTER wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 70 "B1" "B2" "B3" "B4" "A5" "A6" "A7" - wxALIGN_CENTRE + wxALIGN_CENTER 7 @@ -15554,7 +10353,7 @@ wxALIGN_RIGHT 100 "0 ... 15V" "16 ... 30V" "31 ... 50V" "51 ... 100V" "101 ... 150V" "151 ... 170V" "171 ... 250V" "251 ... 300V" "301 ... 500V" " > 500V" - wxALIGN_CENTRE + wxALIGN_CENTER 10 1 @@ -15565,68 +10364,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15688,36 +10425,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15780,36 +10487,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizeTransline @@ -15888,37 +10565,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - OnTranslineSelection - - - - - - @@ -15976,36 +10623,7 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - OnPaintTranslinePanel - - - - - - @@ -16066,36 +10684,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16119,7 +10707,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -16195,36 +10782,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16289,40 +10846,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16395,37 +10918,7 @@ - - - - - - OnTranslineEpsilonR_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -16487,36 +10980,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16581,40 +11044,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16687,37 +11116,7 @@ - - - - - - OnTranslineTanD_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -16779,36 +11178,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16873,40 +11242,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16979,37 +11314,7 @@ - - - - - - OnTranslineRho_Button - - - - - - - - - - - - - - - - - - - - - - - - @@ -17071,36 +11376,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17165,40 +11440,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17263,37 +11504,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17355,36 +11565,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17449,40 +11629,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17547,37 +11693,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17639,36 +11754,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17733,40 +11818,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17831,37 +11882,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17923,36 +11943,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18017,40 +12007,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18115,37 +12071,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18207,36 +12132,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18301,40 +12196,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18399,37 +12260,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18491,36 +12321,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18585,40 +12385,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18683,37 +12449,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18732,7 +12467,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -18808,36 +12542,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18902,40 +12606,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19000,37 +12670,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19102,36 +12741,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19209,36 +12818,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19300,36 +12879,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19359,7 +12908,6 @@ wxVERTICAL 1 none - 5 wxBOTTOM|wxEXPAND @@ -19444,36 +12992,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19538,40 +13056,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19636,37 +13120,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19731,37 +13184,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19823,36 +13245,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19917,40 +13309,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20015,37 +13373,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20110,37 +13437,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20202,36 +13498,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20296,40 +13562,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20394,37 +13626,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20531,37 +13732,7 @@ - - - - - - OnTranslineAnalyse - - - - - - - - - - - - - - - - - - - - - - - - @@ -20634,37 +13805,7 @@ - - - - - - OnTranslineAnalyse - - - - - - - - - - - - - - - - - - - - - - - - @@ -20737,37 +13878,7 @@ - - - - - - OnTranslineSynthetize - - - - - - - - - - - - - - - - - - - - - - - - @@ -20840,37 +13951,7 @@ - - - - - - OnTranslineSynthetize - - - - - - - - - - - - - - - - - - - - - - - - @@ -20889,7 +13970,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -20965,36 +14045,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21059,40 +14109,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21157,37 +14173,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21249,36 +14234,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21343,40 +14298,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21441,37 +14362,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21533,36 +14423,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21627,40 +14487,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21725,37 +14551,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21774,7 +14569,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -21850,36 +14644,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21941,36 +14705,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22032,36 +14766,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22123,36 +14827,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22214,36 +14888,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22305,36 +14949,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22396,36 +15010,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22487,36 +15071,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22578,36 +15132,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22669,36 +15193,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22760,36 +15254,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22851,36 +15315,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22942,36 +15376,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23033,36 +15437,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23129,36 +15503,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerAtt @@ -23237,37 +15581,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - OnAttenuatorSelection - - - - - - @@ -23325,36 +15639,7 @@ wxTAB_TRAVERSAL|wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - OnPaintAttenuatorPanel - - - - - - @@ -23380,7 +15665,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -23456,36 +15740,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23550,40 +15804,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23645,36 +15865,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23736,36 +15926,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23830,40 +15990,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23925,36 +16051,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24016,36 +16112,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24110,40 +16176,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24205,36 +16237,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24320,37 +16322,7 @@ - - - - - - OnCalculateAttenuator - - - - - - - - - - - - - - - - - - - - - - - - @@ -24423,37 +16395,7 @@ - - - - - - OnCalculateAttenuator - - - - - - - - - - - - - - - - - - - - - - - - @@ -24470,7 +16412,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP|wxBOTTOM @@ -24546,36 +16487,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24640,40 +16551,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24735,36 +16612,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24826,36 +16673,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -24920,40 +16737,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25015,36 +16798,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25106,36 +16859,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25200,40 +16923,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25295,36 +16984,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25390,36 +17049,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25478,39 +17107,6 @@ wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25527,7 +17123,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -25584,39 +17179,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25679,36 +17241,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerPanelColorCode @@ -25778,37 +17310,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - OnToleranceSelection - - - - - - @@ -25886,36 +17388,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -25977,36 +17449,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26068,36 +17510,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26159,36 +17571,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26250,36 +17632,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26341,36 +17693,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26429,36 +17751,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26517,36 +17809,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26605,36 +17867,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26693,36 +17925,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26781,36 +17983,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26869,36 +18041,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26961,36 +18103,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerBoardClass @@ -27058,37 +18170,7 @@ - - - - - - - - OnBoardClassesUnitsSelection - - - - - - - - - - - - - - - - - - - - - - @@ -27159,36 +18241,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -27212,15 +18264,15 @@ 1 - wxALIGN_CENTRE + wxALIGN_CENTER wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 70 "Class 1" "Class 2" "Class 3" "Class 4" "Class 5" "Class 6" - wxALIGN_CENTRE + wxALIGN_CENTER 6 @@ -27266,7 +18318,7 @@ wxALIGN_RIGHT 160 "Lines width" "Min clearance" "Via: (diam - drill)" "Plated Pad: (diam - drill)" "NP Pad: (diam - drill)" - wxALIGN_CENTRE + wxALIGN_CENTER 5 1 @@ -27277,68 +18329,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -27396,36 +18386,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index abc926aa3e..a00c73f9b9 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -161,9 +161,6 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER wxStaticText* m_staticTextClearanceDia; wxTextCtrl* m_textCtrlClearanceDia; UNIT_SELECTOR_LEN* m_choiceClearanceDia; - wxStaticText* m_staticTextBoardThickness; - wxTextCtrl* m_textCtrlBoardThickness; - UNIT_SELECTOR_LEN* m_choiceBoardThickness; wxStaticText* m_staticTextImpedance; wxTextCtrl* m_textCtrlImpedance; UNIT_SELECTOR_RESISTOR* m_choiceImpedance; diff --git a/pcb_calculator/params_read_write.cpp b/pcb_calculator/params_read_write.cpp index 2261943f4b..da7119d6a8 100644 --- a/pcb_calculator/params_read_write.cpp +++ b/pcb_calculator/params_read_write.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2011 jean-pierre.charras - * Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2011 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include diff --git a/pcb_calculator/pcb_calculator.cpp b/pcb_calculator/pcb_calculator.cpp index 62937e913b..548c9801c1 100644 --- a/pcb_calculator/pcb_calculator.cpp +++ b/pcb_calculator/pcb_calculator.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2015 jean-pierre.charras - * Copyright (C) 2015 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2015 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include #include diff --git a/pcb_calculator/pcb_calculator.h b/pcb_calculator/pcb_calculator.h index 355f1293ac..48504cdef8 100644 --- a/pcb_calculator/pcb_calculator.h +++ b/pcb_calculator/pcb_calculator.h @@ -1,11 +1,11 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 1992-2015 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2015 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -13,12 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /** diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp index 905fa9d36f..7da7d07724 100644 --- a/pcb_calculator/pcb_calculator_frame.cpp +++ b/pcb_calculator/pcb_calculator_frame.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 1992-2015 jean-pierre.charras - * Copyright (C) 1992-2015 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2015 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include #include diff --git a/pcb_calculator/regulators_funct.cpp b/pcb_calculator/regulators_funct.cpp index d82bd2d6ba..983be8b308 100644 --- a/pcb_calculator/regulators_funct.cpp +++ b/pcb_calculator/regulators_funct.cpp @@ -5,11 +5,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 1992-2011 jean-pierre.charras - * Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2011 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,12 +17,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include #include diff --git a/pcb_calculator/tracks_width_versus_current.cpp b/pcb_calculator/tracks_width_versus_current.cpp index ef5aa2a6a4..f77683e171 100644 --- a/pcb_calculator/tracks_width_versus_current.cpp +++ b/pcb_calculator/tracks_width_versus_current.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2011 jean-pierre.charras - * Copyright (C) 1992-2015 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2015 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /* see diff --git a/pcb_calculator/transline_dlg_funct.cpp b/pcb_calculator/transline_dlg_funct.cpp index 376552cbbb..207c4ad6f9 100644 --- a/pcb_calculator/transline_dlg_funct.cpp +++ b/pcb_calculator/transline_dlg_funct.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2011 jean-pierre.charras - * Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2011 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include #include @@ -29,6 +25,7 @@ #include #include +#include extern double DoubleFromString( const wxString& TextValue ); @@ -45,26 +42,7 @@ extern double DoubleFromString( const wxString& TextValue ); */ void PCB_CALCULATOR_FRAME::OnTranslineEpsilonR_Button( wxCommandEvent& event ) { - wxArrayString list; - - // EpsilonR ( relative dielectric constant) list - list.Add( wxT( "4.5 FR4" ) ); - list.Add( wxT( "3.67 Isola FR408" ) ); - list.Add( wxT( "4.04 Isola 370HR" ) ); - list.Add( wxT( "3.55 Rogers RO4003C" ) ); - list.Add( wxT( "3.66 Rogers R4350B" ) ); - list.Add( wxT( "9.8 alumina (Al2O3)" ) ); - list.Add( wxT( "3.78 fused quartz" ) ); - list.Add( wxT( "3.38 RO4003" ) ); - list.Add( wxT( "2.2 RT/duroid 5880" ) ); - list.Add( wxT( "10.2 RT/duroid 6010LM" ) ); - list.Add( wxT( "2.1 teflon (PTFE)" ) ); - list.Add( wxT( "4.0 PVC" ) ); - list.Add( wxT( "2.3 PE" ) ); - list.Add( wxT( "6.6 beryllia (BeO)" ) ); - list.Add( wxT( "8.7 aluminum nitride" ) ); - list.Add( wxT( "11.9 silicon" ) ); - list.Add( wxT( "12.9 GaAs" ) ); + wxArrayString list = StandardRelativeDielectricConstantList(); wxString value = wxGetSingleChoice( wxEmptyString, _("Relative Dielectric Constants"), list).BeforeFirst( ' ' ); @@ -79,28 +57,7 @@ void PCB_CALCULATOR_FRAME::OnTranslineEpsilonR_Button( wxCommandEvent& event ) */ void PCB_CALCULATOR_FRAME::OnTranslineTanD_Button( wxCommandEvent& event ) { - wxArrayString list; - - // List of current dielectric loss factor (tangent delta) - list.Clear(); - list.Add( wxT( "2e-2 FR4 @ 1GHz" ) ); - list.Add( wxT( "12e-3 Isola FR408 @ 2 GHz" ) ); - list.Add( wxT( "21e-3 Isola 370HR @ 2 GHz" ) ); - list.Add( wxT( "27e-4 Rogers RO4003C @ 10 GHz" ) ); - list.Add( wxT( "21e-4 Rogers RO4003C @ 2.5 GHz" ) ); - list.Add( wxT( "37e-4 Rogers RO4350B @ 10 GHz" ) ); - list.Add( wxT( "31e-4 Rogers RO4350B @ 2.5 GHz" ) ); - list.Add( wxT( "3e-4 beryllia @ 10GHz" ) ); - list.Add( wxT( "2e-4 aluminia (Al2O3) @ 10GHz" ) ); - list.Add( wxT( "1e-4 fused quartz @ 10GHz" ) ); - list.Add( wxT( "2e-3 RO4003 @ 10GHz" ) ); - list.Add( wxT( "9e-4 RT/duroid 5880 @ 10GHz" ) ); - list.Add( wxT( "2e-4 teflon (PTFE) @ 1MHz" ) ); - list.Add( wxT( "5e-2 PVC @ 1MHz" ) ); - list.Add( wxT( "2e-4 PE @ 1MHz" ) ); - list.Add( wxT( "1e-3 aluminum nitride @ 10GHz" ) ); - list.Add( wxT( "0.015 silicon @ 10GHz" ) ); - list.Add( wxT( "0.002 GaAs @ 10GHz" ) ); + wxArrayString list = StandardLossTangentList(); wxString value = wxGetSingleChoice( wxEmptyString, _("Dielectric Loss Factor"), list).BeforeFirst( ' ' ); @@ -115,20 +72,7 @@ void PCB_CALCULATOR_FRAME::OnTranslineTanD_Button( wxCommandEvent& event ) */ void PCB_CALCULATOR_FRAME::OnTranslineRho_Button( wxCommandEvent& event ) { - wxArrayString list; - - // Specific resistance list in ohms*meters (rho): - list.Clear(); - list.Add( wxT( "2.4e-8 gold" ) ); - list.Add( wxT( "1.72e-8 copper" ) ); - list.Add( wxT( "1.62e-8 silver" ) ); - list.Add( wxT( "12.4e-8 tin" ) ); - list.Add( wxT( "10.5e-8 platinum" ) ); - list.Add( wxT( "2.62e-8 aluminum" ) ); - list.Add( wxT( "6.9e-8 nickel" ) ); - list.Add( wxT( "3.9e-8 brass (66Cu 34Zn)" ) ); - list.Add( wxT( "9.71e-8 iron" ) ); - list.Add( wxT( "6.0e-8 zinc" ) ); + wxArrayString list = StandardResistivityList(); wxString value = wxGetSingleChoice( wxEmptyString, _("Specific Resistance"), list).BeforeFirst( ' ' ); diff --git a/pcb_calculator/transline_ident.cpp b/pcb_calculator/transline_ident.cpp index d93c7ed257..90bff3f623 100644 --- a/pcb_calculator/transline_ident.cpp +++ b/pcb_calculator/transline_ident.cpp @@ -2,11 +2,11 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011-2014 Jean-Pierre Charras - * Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2014 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /** diff --git a/pcb_calculator/transline_ident.h b/pcb_calculator/transline_ident.h index c9dd44e09f..5aa924dd87 100644 --- a/pcb_calculator/transline_ident.h +++ b/pcb_calculator/transline_ident.h @@ -2,11 +2,11 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011-2014 Jean-Pierre Charras - * Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2014 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /** diff --git a/pcb_calculator/units_scales.h b/pcb_calculator/units_scales.h index 3d996a7210..ca00c3bafd 100644 --- a/pcb_calculator/units_scales.h +++ b/pcb_calculator/units_scales.h @@ -2,11 +2,11 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011-2014 Jean-Pierre Charras - * Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,12 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /* diff --git a/pcb_calculator/via.cpp b/pcb_calculator/via.cpp index 7bdac91735..079f909eed 100644 --- a/pcb_calculator/via.cpp +++ b/pcb_calculator/via.cpp @@ -1,11 +1,11 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 1992-2019 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 1992-2019 Kicad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 3 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -13,12 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /* All calculations are based on this [1] online calculator: @@ -56,6 +52,8 @@ #include #include +#include + extern double DoubleFromString( const wxString& TextValue ); // Key words to read/write some parameters in config: @@ -69,8 +67,6 @@ extern double DoubleFromString( const wxString& TextValue ); #define KEYWORD_VS_PAD_DIA_UNIT wxT( "VS_Pad_Dia_Unit" ) #define KEYWORD_VS_CLEARANCE_DIA wxT( "VS_Clearance_Dia" ) #define KEYWORD_VS_CLEARANCE_DIA_UNIT wxT( "VS_Clearance_Dia_Unit" ) -#define KEYWORD_VS_PCB_THICKNESS wxT( "VS_PCB_Thickness" ) -#define KEYWORD_VS_PCB_THICKNESS_UNIT wxT( "VS_PCB_Thickness_Unit" ) #define KEYWORD_VS_CH_IMPEDANCE wxT( "VS_Characteristic_Impedance" ) #define KEYWORD_VS_CH_IMPEDANCE_UNIT wxT( "VS_Characteristic_Impedance_Unit" ) #define KEYWORD_VS_CURRENT wxT( "VS_Current" ) @@ -85,22 +81,7 @@ extern double DoubleFromString( const wxString& TextValue ); */ void PCB_CALCULATOR_FRAME::OnViaEpsilonR_Button( wxCommandEvent& event ) { - wxArrayString list; - - // EpsilonR ( relative dielectric constant) list - list.Add( wxT( "4.5 FR4" ) ); - list.Add( wxT( "9.8 alumina (Al2O3)" ) ); - list.Add( wxT( "3.78 fused quartz" ) ); - list.Add( wxT( "3.38 RO4003" ) ); - list.Add( wxT( "2.2 RT/duroid 5880" ) ); - list.Add( wxT( "10.2 RT/duroid 6010LM" ) ); - list.Add( wxT( "2.1 teflon (PTFE)" ) ); - list.Add( wxT( "4.0 PVC" ) ); - list.Add( wxT( "2.3 PE" ) ); - list.Add( wxT( "6.6 beryllia (BeO)" ) ); - list.Add( wxT( "8.7 aluminum nitride" ) ); - list.Add( wxT( "11.9 silicon" ) ); - list.Add( wxT( "12.9 GaAs" ) ); + wxArrayString list = StandardRelativeDielectricConstantList(); wxString value = wxGetSingleChoice( wxEmptyString, _("Relative Dielectric Constants"), list).BeforeFirst( ' ' ); @@ -114,20 +95,7 @@ void PCB_CALCULATOR_FRAME::OnViaEpsilonR_Button( wxCommandEvent& event ) */ void PCB_CALCULATOR_FRAME::OnViaRho_Button( wxCommandEvent& event ) { - wxArrayString list; - - // Specific resistance list in ohms*meters (rho): - list.Clear(); - list.Add( wxT( "2.4e-8 gold" ) ); - list.Add( wxT( "1.72e-8 copper" ) ); - list.Add( wxT( "1.62e-8 silver" ) ); - list.Add( wxT( "12.4e-8 tin" ) ); - list.Add( wxT( "10.5e-8 platinum" ) ); - list.Add( wxT( "2.62e-8 aluminum" ) ); - list.Add( wxT( "6.9e-8 nickel" ) ); - list.Add( wxT( "3.9e-8 brass (66Cu 34Zn)" ) ); - list.Add( wxT( "9.71e-8 iron" ) ); - list.Add( wxT( "6.0e-8 zinc" ) ); + wxArrayString list = StandardResistivityList(); wxString value = wxGetSingleChoice( wxEmptyString, _("Specific Resistance"), list).BeforeFirst( ' ' ); @@ -140,35 +108,38 @@ void PCB_CALCULATOR_FRAME::VS_Init( wxConfigBase* aCfg ) int tmp; wxString msg; + #define DEFAULT_UNIT_SEL_MM 0 // Read parameter values - aCfg->Read( KEYWORD_VS_HOLE_DIA, &msg, wxT( "18" ) ); + aCfg->Read( KEYWORD_VS_HOLE_DIA, &msg, wxT( "0.4" ) ); m_textCtrlHoleDia->SetValue( msg ); - aCfg->Read( KEYWORD_VS_HOLE_DIA_UNIT, &tmp, 0 ); + aCfg->Read( KEYWORD_VS_HOLE_DIA_UNIT, &tmp, DEFAULT_UNIT_SEL_MM ); m_choiceHoleDia->SetSelection( tmp ); - aCfg->Read( KEYWORD_VS_THICKNESS, &msg, wxT( "1" ) ); + + aCfg->Read( KEYWORD_VS_THICKNESS, &msg, wxT( "0.035" ) ); m_textCtrlPlatingThickness->SetValue( msg ); - aCfg->Read( KEYWORD_VS_THICKNESS_UNIT, &tmp, 0 ); + aCfg->Read( KEYWORD_VS_THICKNESS_UNIT, &tmp, DEFAULT_UNIT_SEL_MM ); m_choicePlatingThickness->SetSelection( tmp ); - aCfg->Read( KEYWORD_VS_LENGTH, &msg, wxT( "60" ) ); + + aCfg->Read( KEYWORD_VS_LENGTH, &msg, wxT( "1.6" ) ); m_textCtrlViaLength->SetValue( msg ); - aCfg->Read( KEYWORD_VS_LENGTH_UNIT, &tmp, 0 ); + aCfg->Read( KEYWORD_VS_LENGTH_UNIT, &tmp, DEFAULT_UNIT_SEL_MM ); m_choiceViaLength->SetSelection( tmp ); - aCfg->Read( KEYWORD_VS_PAD_DIA, &msg, wxT( "22" ) ); + + aCfg->Read( KEYWORD_VS_PAD_DIA, &msg, wxT( "0.6" ) ); m_textCtrlViaPadDia->SetValue( msg ); - aCfg->Read( KEYWORD_VS_PAD_DIA_UNIT, &tmp, 0 ); + aCfg->Read( KEYWORD_VS_PAD_DIA_UNIT, &tmp, DEFAULT_UNIT_SEL_MM ); m_choiceViaPadDia->SetSelection( tmp ); - aCfg->Read( KEYWORD_VS_CLEARANCE_DIA, &msg, wxT( "25" ) ); + + aCfg->Read( KEYWORD_VS_CLEARANCE_DIA, &msg, wxT( "1.0" ) ); m_textCtrlClearanceDia->SetValue( msg ); - aCfg->Read( KEYWORD_VS_CLEARANCE_DIA_UNIT, &tmp, 0 ); + aCfg->Read( KEYWORD_VS_CLEARANCE_DIA_UNIT, &tmp, DEFAULT_UNIT_SEL_MM ); m_choiceClearanceDia->SetSelection( tmp ); - aCfg->Read( KEYWORD_VS_PCB_THICKNESS, &msg, wxT( "70" ) ); - m_textCtrlBoardThickness->SetValue( msg ); - aCfg->Read( KEYWORD_VS_PCB_THICKNESS_UNIT, &tmp, 0 ); - m_choiceBoardThickness->SetSelection( tmp ); + aCfg->Read( KEYWORD_VS_CH_IMPEDANCE, &msg, wxT( "50" ) ); m_textCtrlImpedance->SetValue( msg ); - aCfg->Read( KEYWORD_VS_CH_IMPEDANCE_UNIT , &tmp, 0 ); + aCfg->Read( KEYWORD_VS_CH_IMPEDANCE_UNIT , &tmp, DEFAULT_UNIT_SEL_MM ); m_choiceImpedance->SetSelection( tmp ); + aCfg->Read( KEYWORD_VS_CURRENT, &msg, wxT( "1" ) ); m_textCtrlAppliedCurrent->SetValue( msg ); aCfg->Read( KEYWORD_VS_RESISTIVITY, &msg, wxT( "1.72e-8" ) ); @@ -194,8 +165,6 @@ void PCB_CALCULATOR_FRAME::VS_WriteConfig( wxConfigBase* aCfg ) aCfg->Write( KEYWORD_VS_PAD_DIA_UNIT, m_choiceViaPadDia->GetSelection() ); aCfg->Write( KEYWORD_VS_CLEARANCE_DIA, m_textCtrlClearanceDia->GetValue() ); aCfg->Write( KEYWORD_VS_CLEARANCE_DIA_UNIT, m_choiceClearanceDia->GetSelection() ); - aCfg->Write( KEYWORD_VS_PCB_THICKNESS, m_textCtrlBoardThickness->GetValue() ); - aCfg->Write( KEYWORD_VS_PCB_THICKNESS_UNIT, m_choiceBoardThickness->GetSelection() ); aCfg->Write( KEYWORD_VS_CH_IMPEDANCE, m_textCtrlImpedance->GetValue() ); aCfg->Write( KEYWORD_VS_CH_IMPEDANCE_UNIT, m_choiceImpedance->GetSelection() ); aCfg->Write( KEYWORD_VS_CURRENT, m_textCtrlAppliedCurrent->GetValue() ); @@ -213,7 +182,6 @@ void PCB_CALCULATOR_FRAME::OnViaCalculate( wxCommandEvent& event ) double viaLength = std::abs( DoubleFromString( m_textCtrlViaLength->GetValue() ) ); double padDia = std::abs( DoubleFromString( m_textCtrlViaPadDia->GetValue() ) ); double clearanceDia = std::abs( DoubleFromString( m_textCtrlClearanceDia->GetValue() ) ); - double pcbThickness = std::abs( DoubleFromString( m_textCtrlBoardThickness->GetValue() ) ); double charImpedance = std::abs( DoubleFromString( m_textCtrlImpedance->GetValue() ) ); double appliedCurrent = std::abs( DoubleFromString( m_textCtrlAppliedCurrent->GetValue() ) ); double platingResistivity = std::abs( DoubleFromString( m_textCtrlPlatingResistivity->GetValue() ) ); @@ -227,7 +195,6 @@ void PCB_CALCULATOR_FRAME::OnViaCalculate( wxCommandEvent& event ) viaLength *= m_choiceViaLength->GetUnitScale(); padDia *= m_choiceViaPadDia->GetUnitScale(); clearanceDia *= m_choiceClearanceDia->GetUnitScale(); - pcbThickness *= m_choiceBoardThickness->GetUnitScale(); charImpedance *= m_choiceImpedance->GetUnitScale(); platingResistivity = platingResistivity / 100; // Ohm-cm to Ohm-m @@ -279,30 +246,30 @@ void PCB_CALCULATOR_FRAME::VSDisplayValues( double aViaResistance, double aVolta { wxString msg; - msg.Printf( wxT( "%g" ), aViaResistance ); + msg.Printf( "%g", aViaResistance ); m_ViaResistance->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aVoltageDrop ); + msg.Printf( "%g", aVoltageDrop ); m_ViaVoltageDrop->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aPowerLoss ); + msg.Printf( "%g", aPowerLoss ); m_ViaPowerLoss->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aEstimatedAmpacity ); + msg.Printf( "%g", aEstimatedAmpacity ); m_ViaAmpacity->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aThermalResistance ); + msg.Printf( "%g", aThermalResistance ); m_ViaThermalResistance->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aCapacitance ); + msg.Printf( "%g", aCapacitance ); m_ViaCapacitance->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aTimeDegradation ); + msg.Printf( "%g", aTimeDegradation ); m_RiseTimeOutput->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aInductance ); + msg.Printf( "%g", aInductance ); m_Inductance->SetLabel( msg ); - msg.Printf( wxT( "%g" ), aReactance ); + msg.Printf( "%g", aReactance ); m_Reactance->SetLabel( msg ); }