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

PANEL_SETUP_BOARD_STACKUP: Do not limit the EpsilonR mantissa to 1 or 2 digits. 

Fixes #8956
https://gitlab.com/kicad/code/kicad/issues/8956
This commit is contained in:
jean-pierre charras 2021-08-14 09:42:05 +02:00
parent 9aa9857685
commit 3d61c8b0c4
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/board_stackup_manager/board_stackup.cpp
View File

@ -28,6 +28,7 @@
#include <board.h>
#include <i18n_utility.h> // For _HKI definition
#include "stackup_predefined_prms.h"
#include <string_utils.h> // for Double2Str()
BOARD_STACKUP_ITEM::BOARD_STACKUP_ITEM( BOARD_STACKUP_ITEM_TYPE aType )
@ -284,8 +285,8 @@ bool BOARD_STACKUP_ITEM::IsThicknessEditable() const
wxString BOARD_STACKUP_ITEM::FormatEpsilonR( int aDielectricSubLayer ) const
{
// return a wxString to print/display Epsilon R
wxString txt;
txt.Printf( "%.2f", GetEpsilonR( aDielectricSubLayer ) );
// note: we do not want scientific notation
wxString txt = Double2Str( GetEpsilonR( aDielectricSubLayer ) );
return txt;
}
@ -293,8 +294,8 @@ wxString BOARD_STACKUP_ITEM::FormatEpsilonR( int aDielectricSubLayer ) const
wxString BOARD_STACKUP_ITEM::FormatLossTangent( int aDielectricSubLayer ) const
{
// return a wxString to print/display Loss Tangent
wxString txt;
txt.Printf( "%g", GetLossTangent( aDielectricSubLayer ) );
// note: we do not want scientific notation
wxString txt = Double2Str( GetLossTangent( aDielectricSubLayer ) );
return txt;
}

1
pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp
View File

@ -27,6 +27,7 @@ DIALOG_DIELECTRIC_MATERIAL::DIALOG_DIELECTRIC_MATERIAL( wxWindow* aParent,
m_materialList( aMaterialList )
{
initMaterialList();
m_sdbSizerOK->SetDefault();
}
DIALOG_DIELECTRIC_MATERIAL::~DIALOG_DIELECTRIC_MATERIAL()

11
pcbnew/board_stackup_manager/dielectric_material.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2009-2019 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2009-2021 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
@ -30,6 +30,7 @@
#include "stackup_predefined_prms.h"
#include "dielectric_material.h"
#include <core/arraydim.h>
#include <string_utils.h> // for Double2Str()
// A list of available substrate material
@ -71,8 +72,8 @@ static DIELECTRIC_SUBSTRATE silkscreenMaterial[] =
wxString DIELECTRIC_SUBSTRATE::FormatEpsilonR()
{
// return a wxString to print/display Epsilon R
wxString txt;
txt.Printf( "%.1f", m_EpsilonR );
// note: we do not want scientific notation
wxString txt = Double2Str( m_EpsilonR );
return txt;
}
@ -80,8 +81,8 @@ wxString DIELECTRIC_SUBSTRATE::FormatEpsilonR()
wxString DIELECTRIC_SUBSTRATE::FormatLossTangent()
{
// return a wxString to print/display Loss Tangent
wxString txt;
txt.Printf( "%g", m_LossTangent );
// note: we do not want scientific notation
wxString txt = Double2Str( m_LossTangent );
return txt;
}

13
pcbnew/board_stackup_manager/panel_board_stackup.cpp
View File

@ -48,6 +48,7 @@
#include <locale_io.h>
#include <eda_list_dialog.h>
#include <string_utils.h> // for Double2Str()
// Some wx widget ID to know what widget has fired a event:
@ -564,8 +565,7 @@ void PANEL_SETUP_BOARD_STACKUP::synchronizeWithBoard( bool aFullSync )
if( item->HasEpsilonRValue() )
{
wxString txt;
txt.Printf( "%.2f", item->GetEpsilonR( sub_item ) );
wxString txt = Double2Str( item->GetEpsilonR( sub_item ) );
wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( ui_row_item.m_EpsilonCtrl );
if( textCtrl )
@ -574,8 +574,7 @@ void PANEL_SETUP_BOARD_STACKUP::synchronizeWithBoard( bool aFullSync )
if( item->HasLossTangentValue() )
{
wxString txt;
txt.Printf( "%g", item->GetLossTangent( sub_item ) );
wxString txt = Double2Str( item->GetLossTangent( sub_item ) );
wxTextCtrl* textCtrl = dynamic_cast<wxTextCtrl*>( ui_row_item.m_LossTgCtrl );
if( textCtrl )
@ -822,8 +821,7 @@ BOARD_STACKUP_ROW_UI_ITEM PANEL_SETUP_BOARD_STACKUP::createRowData( int aRow,
if( item->HasEpsilonRValue() )
{
wxString txt;
txt.Printf( "%.2f", item->GetEpsilonR( aSublayerIdx ) );
wxString txt = Double2Str( item->GetEpsilonR( aSublayerIdx ) );
wxTextCtrl* textCtrl = new wxTextCtrl( m_scGridWin, wxID_ANY, wxEmptyString,
wxDefaultPosition, m_numericFieldsSize );
textCtrl->SetValue( txt );
@ -837,8 +835,7 @@ BOARD_STACKUP_ROW_UI_ITEM PANEL_SETUP_BOARD_STACKUP::createRowData( int aRow,
if( item->HasLossTangentValue() )
{
wxString txt;
txt.Printf( "%g", item->GetLossTangent( aSublayerIdx ) );
wxString txt = Double2Str( item->GetLossTangent( aSublayerIdx ) );;
wxTextCtrl* textCtrl = new wxTextCtrl( m_scGridWin, wxID_ANY, wxEmptyString,
wxDefaultPosition, m_numericFieldsSize );
textCtrl->SetValue( txt );