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

Minor fixes in board_stackup_reporter.

This commit is contained in:
jean-pierre charras 2019-11-12 13:49:59 +01:00
parent 6ad3e4a565
commit a6b94b37ec
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/board_stackup_manager/board_stackup_reporter.cpp
View File

@ -57,6 +57,12 @@ wxString BuildStackupReport( BOARD_STACKUP& aStackup, EDA_UNITS_T aUnits )
txt.Printf( "layer \"%s\" type \"%s\"", item->GetLayerName(), item->GetTypeName() ); txt.Printf( "layer \"%s\" type \"%s\"", item->GetLayerName(), item->GetTypeName() );
report << txt; report << txt;
if( item->IsMaterialEditable() )
{
txt.Printf( " Material \"%s\"", item->GetMaterial() );
report << txt;
}
if( item->HasEpsilonRValue() ) if( item->HasEpsilonRValue() )
{ {
txt.Printf( " EpsilonR %s", item->FormatEpsilonR() ); txt.Printf( " EpsilonR %s", item->FormatEpsilonR() );
@ -69,18 +75,6 @@ wxString BuildStackupReport( BOARD_STACKUP& aStackup, EDA_UNITS_T aUnits )
report << txt; report << txt;
} }
if( item->IsMaterialEditable() )
{
txt.Printf( " Material \"%s\"", item->GetMaterial() );
report << txt;
}
if( item->GetType() == BS_ITEM_TYPE_DIELECTRIC )
{
txt.Printf( " \"%s\"", item->GetTypeName() );
report << txt;
}
if( item->IsThicknessEditable() ) if( item->IsThicknessEditable() )
{ {
txt.Printf( " Thickness %s", txt.Printf( " Thickness %s",

4
pcbnew/board_stackup_manager/panel_board_stackup.cpp
View File

@ -170,7 +170,7 @@ void PANEL_SETUP_BOARD_STACKUP::onAddDielectricLayer( wxCommandEvent& event )
void PANEL_SETUP_BOARD_STACKUP::onRemoveDielectricLayer( wxCommandEvent& event ) void PANEL_SETUP_BOARD_STACKUP::onRemoveDielectricLayer( wxCommandEvent& event )
{ {
// Build deletable Dielectric layers list. // Build deletable Dielectric layers list.
// A lyer can be deleted if there are 2 (or more) dielectric layers // A layer can be deleted if there are 2 (or more) dielectric layers
// between 2 copper layers // between 2 copper layers
wxArrayString d_list; wxArrayString d_list;
wxString previousD_Layer; wxString previousD_Layer;
@ -576,7 +576,7 @@ void PANEL_SETUP_BOARD_STACKUP::buildLayerStackPanel()
} }
else else
{ {
item->GetLayerName() = m_board->GetLayerName( item->GetBrdLayerId() ); item->SetLayerName( m_board->GetLayerName( item->GetBrdLayerId() ) );
wxStaticText* st_text = new wxStaticText( m_scGridWin, wxID_ANY, item->GetLayerName() ); wxStaticText* st_text = new wxStaticText( m_scGridWin, wxID_ANY, item->GetLayerName() );
m_fgGridSizer->Add( st_text, 0, wxALL|wxALIGN_CENTER_VERTICAL, 1 ); m_fgGridSizer->Add( st_text, 0, wxALL|wxALIGN_CENTER_VERTICAL, 1 );
st_text->Show( show_item ); st_text->Show( show_item );