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

Consistency in via dimensions terminology. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11024
This commit is contained in:
Jeff Young 2022-03-03 21:47:05 +00:00
parent 9d927f3135
commit ec5b7a57ec
10 changed files with 328 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
View File

@ -227,10 +227,10 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::buildNetclassesGrid()
m_netclassGrid->SetCellValue( row, col, StringFromValue( m_parent->GetUserUnits(), val, true ) ) m_netclassGrid->SetCellValue( row, col, StringFromValue( m_parent->GetUserUnits(), val, true ) )
m_netclassGrid->SetCellValue( 0, GRID_TRACKSIZE, _( "Track Width" ) ); m_netclassGrid->SetCellValue( 0, GRID_TRACKSIZE, _( "Track Width" ) );
m_netclassGrid->SetCellValue( 0, GRID_VIASIZE, _( "Via Size" ) ); m_netclassGrid->SetCellValue( 0, GRID_VIASIZE, _( "Via Diameter" ) );
m_netclassGrid->SetCellValue( 0, GRID_VIADRILL, _( "Via Drill" ) ); m_netclassGrid->SetCellValue( 0, GRID_VIADRILL, _( "Via Hole" ) );
m_netclassGrid->SetCellValue( 0, GRID_uVIASIZE, _( "uVia Size" ) ); m_netclassGrid->SetCellValue( 0, GRID_uVIASIZE, _( "uVia Diameter" ) );
m_netclassGrid->SetCellValue( 0, GRID_uVIADRILL, _( "uVia Drill" ) ); m_netclassGrid->SetCellValue( 0, GRID_uVIADRILL, _( "uVia Hole" ) );
NETCLASSES& netclasses = m_brd->GetDesignSettings().GetNetClasses(); NETCLASSES& netclasses = m_brd->GetDesignSettings().GetNetClasses();
NETCLASS* defaultNetclass = m_brd->GetDesignSettings().GetDefault(); NETCLASS* defaultNetclass = m_brd->GetDesignSettings().GetDefault();

3
pcbnew/dialogs/dialog_track_via_size.cpp
View File

@ -2,6 +2,7 @@
* KiRouter - a push-and-(sometimes-)shove PCB router * KiRouter - a push-and-(sometimes-)shove PCB router
* *
* Copyright (C) 2014 CERN * Copyright (C) 2014 CERN
* Copyright (C) 2014-2022 KiCad Developers, see AUTHORS.txt for contributors.
* Author: Maciej Suminski <maciej.suminski@cern.ch> * Author: Maciej Suminski <maciej.suminski@cern.ch>
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
@ -55,7 +56,7 @@ bool DIALOG_TRACK_VIA_SIZE::TransferDataFromWindow()
if( m_viaDrill.GetValue() >= m_viaDiameter.GetValue() ) if( m_viaDrill.GetValue() >= m_viaDiameter.GetValue() )
{ {
DisplayError( GetParent(), _( "Via drill size must be smaller than via diameter" ) ); DisplayError( GetParent(), _( "Via hole size must be smaller than via diameter" ) );
m_viaDrillText->SetFocus(); m_viaDrillText->SetFocus();
return false; return false;
} }

56
pcbnew/dialogs/dialog_track_via_size_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -12,69 +12,69 @@
DIALOG_TRACK_VIA_SIZE_BASE::DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) DIALOG_TRACK_VIA_SIZE_BASE::DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
wxBoxSizer* bSizes; wxBoxSizer* bSizes;
bSizes = new wxBoxSizer( wxVERTICAL ); bSizes = new wxBoxSizer( wxVERTICAL );
wxFlexGridSizer* fgSizer1; wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 );
fgSizer1->AddGrowableCol( 1 ); fgSizer1->AddGrowableCol( 1 );
fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetFlexibleDirection( wxBOTH );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_trackWidthLabel = new wxStaticText( this, wxID_ANY, _("Track width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_trackWidthLabel = new wxStaticText( this, wxID_ANY, _("Track width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_trackWidthLabel->Wrap( -1 ); m_trackWidthLabel->Wrap( -1 );
fgSizer1->Add( m_trackWidthLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( m_trackWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_trackWidthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_trackWidthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer1->Add( m_trackWidthText, 1, wxALL|wxEXPAND, 5 ); fgSizer1->Add( m_trackWidthText, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_trackWidthUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_trackWidthUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_trackWidthUnits->Wrap( -1 ); m_trackWidthUnits->Wrap( -1 );
fgSizer1->Add( m_trackWidthUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( m_trackWidthUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_viaDiameterLabel = new wxStaticText( this, wxID_ANY, _("Via diameter:"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaDiameterLabel = new wxStaticText( this, wxID_ANY, _("Via diameter:"), wxDefaultPosition, wxDefaultSize, 0 );
m_viaDiameterLabel->Wrap( -1 ); m_viaDiameterLabel->Wrap( -1 );
fgSizer1->Add( m_viaDiameterLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( m_viaDiameterLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_viaDiameterText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_viaDiameterText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer1->Add( m_viaDiameterText, 1, wxALL|wxEXPAND, 5 ); fgSizer1->Add( m_viaDiameterText, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_viaDiameterUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaDiameterUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_viaDiameterUnits->Wrap( -1 ); m_viaDiameterUnits->Wrap( -1 );
fgSizer1->Add( m_viaDiameterUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( m_viaDiameterUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_viaDrillLabel = new wxStaticText( this, wxID_ANY, _("Via drill:"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaDrillLabel = new wxStaticText( this, wxID_ANY, _("Via hole:"), wxDefaultPosition, wxDefaultSize, 0 );
m_viaDrillLabel->Wrap( -1 ); m_viaDrillLabel->Wrap( -1 );
fgSizer1->Add( m_viaDrillLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( m_viaDrillLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_viaDrillText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_viaDrillText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer1->Add( m_viaDrillText, 1, wxALL|wxEXPAND, 5 ); fgSizer1->Add( m_viaDrillText, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_viaDrillUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaDrillUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_viaDrillUnits->Wrap( -1 ); m_viaDrillUnits->Wrap( -1 );
fgSizer1->Add( m_viaDrillUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer1->Add( m_viaDrillUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
bSizes->Add( fgSizer1, 1, wxEXPAND|wxALL, 5 ); bSizes->Add( fgSizer1, 1, wxEXPAND|wxALL, 10 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizes->Add( m_staticline1, 0, wxEXPAND, 5 ); bSizes->Add( m_staticline1, 0, wxEXPAND, 5 );
m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtons = new wxStdDialogButtonSizer();
m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtonsOK = new wxButton( this, wxID_OK );
m_stdButtons->AddButton( m_stdButtonsOK ); m_stdButtons->AddButton( m_stdButtonsOK );
m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); m_stdButtonsCancel = new wxButton( this, wxID_CANCEL );
m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->AddButton( m_stdButtonsCancel );
m_stdButtons->Realize(); m_stdButtons->Realize();
bSizes->Add( m_stdButtons, 0, wxEXPAND|wxALL, 5 ); bSizes->Add( m_stdButtons, 0, wxEXPAND|wxALL, 5 );
this->SetSizer( bSizes ); this->SetSizer( bSizes );
this->Layout(); this->Layout();
bSizes->Fit( this ); bSizes->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );
} }

837
pcbnew/dialogs/dialog_track_via_size_base.fbp
View File

File diff suppressed because it is too large Load Diff

16
pcbnew/dialogs/dialog_track_via_size_base.h
View File

@ -1,12 +1,11 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_TRACK_VIA_SIZE_BASE_H__ #pragma once
#define __DIALOG_TRACK_VIA_SIZE_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
@ -33,7 +32,7 @@
class DIALOG_TRACK_VIA_SIZE_BASE : public DIALOG_SHIM class DIALOG_TRACK_VIA_SIZE_BASE : public DIALOG_SHIM
{ {
private: private:
protected: protected:
wxStaticText* m_trackWidthLabel; wxStaticText* m_trackWidthLabel;
wxTextCtrl* m_trackWidthText; wxTextCtrl* m_trackWidthText;
@ -48,12 +47,11 @@ class DIALOG_TRACK_VIA_SIZE_BASE : public DIALOG_SHIM
wxStdDialogButtonSizer* m_stdButtons; wxStdDialogButtonSizer* m_stdButtons;
wxButton* m_stdButtonsOK; wxButton* m_stdButtonsOK;
wxButton* m_stdButtonsCancel; wxButton* m_stdButtonsCancel;
public: public:
DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Track Width and Via Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Track and Via Dimensions"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_TRACK_VIA_SIZE_BASE(); ~DIALOG_TRACK_VIA_SIZE_BASE();
}; };
#endif //__DIALOG_TRACK_VIA_SIZE_BASE_H__

2
pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
View File

@ -95,7 +95,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
m_viaSizesGrid->EnableDragColMove( false ); m_viaSizesGrid->EnableDragColMove( false );
m_viaSizesGrid->EnableDragColSize( false ); m_viaSizesGrid->EnableDragColSize( false );
m_viaSizesGrid->SetColLabelSize( 24 ); m_viaSizesGrid->SetColLabelSize( 24 );
m_viaSizesGrid->SetColLabelValue( 0, _("Size") ); m_viaSizesGrid->SetColLabelValue( 0, _("Diameter") );
m_viaSizesGrid->SetColLabelValue( 1, _("Hole") ); m_viaSizesGrid->SetColLabelValue( 1, _("Hole") );
m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

2
pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
View File

@ -433,7 +433,7 @@
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property> <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">24</property> <property name="col_label_size">24</property>
<property name="col_label_values">&quot;Size&quot; &quot;Hole&quot;</property> <property name="col_label_values">&quot;Diameter&quot; &quot;Hole&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property> <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">2</property> <property name="cols">2</property>
<property name="column_sizes"></property> <property name="column_sizes"></property>

6
pcbnew/pcb_track.cpp
View File

@ -4,7 +4,7 @@
* Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -794,7 +794,7 @@ void PCB_VIA::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITE
msg = MessageTextFromValue( aFrame->GetUserUnits(), GetDrillValue() ); msg = MessageTextFromValue( aFrame->GetUserUnits(), GetDrillValue() );
aList.emplace_back( _( "Drill" ), msg ); aList.emplace_back( _( "Hole" ), msg );
wxString source; wxString source;
int clearance = GetOwnClearance( GetLayer(), &source ); int clearance = GetOwnClearance( GetLayer(), &source );
@ -1209,7 +1209,7 @@ static struct TRACK_VIA_DESC
propMgr.ReplaceProperty( TYPE_HASH( PCB_TRACK ), _HKI( "Width" ), propMgr.ReplaceProperty( TYPE_HASH( PCB_TRACK ), _HKI( "Width" ),
new PROPERTY<PCB_VIA, int, PCB_TRACK>( _HKI( "Diameter" ), new PROPERTY<PCB_VIA, int, PCB_TRACK>( _HKI( "Diameter" ),
&PCB_VIA::SetWidth, &PCB_VIA::GetWidth, PROPERTY_DISPLAY::DISTANCE ) ); &PCB_VIA::SetWidth, &PCB_VIA::GetWidth, PROPERTY_DISPLAY::DISTANCE ) );
propMgr.AddProperty( new PROPERTY<PCB_VIA, int>( _HKI( "Drill" ), propMgr.AddProperty( new PROPERTY<PCB_VIA, int>( _HKI( "Hole" ),
&PCB_VIA::SetDrill, &PCB_VIA::GetDrillValue, PROPERTY_DISPLAY::DISTANCE ) ); &PCB_VIA::SetDrill, &PCB_VIA::GetDrillValue, PROPERTY_DISPLAY::DISTANCE ) );
propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ), propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ),
new PROPERTY_ENUM<PCB_VIA, PCB_LAYER_ID, BOARD_ITEM>( _HKI( "Layer Top" ), new PROPERTY_ENUM<PCB_VIA, PCB_LAYER_ID, BOARD_ITEM>( _HKI( "Layer Top" ),

4
pcbnew/router/router_tool.cpp
View File

@ -2,7 +2,7 @@
* KiRouter - a push-and-(sometimes-)shove PCB router * KiRouter - a push-and-(sometimes-)shove PCB router
* *
* Copyright (C) 2013-2017 CERN * Copyright (C) 2013-2017 CERN
* Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2017-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch> * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* *
@ -244,7 +244,7 @@ protected:
else else
{ {
if( via.m_Drill > 0 ) if( via.m_Drill > 0 )
msg.Printf( _("Via %s, drill %s" ), msg.Printf( _("Via %s, hole %s" ),
MessageTextFromValue( units, via.m_Diameter ), MessageTextFromValue( units, via.m_Diameter ),
MessageTextFromValue( units, via.m_Drill ) ); MessageTextFromValue( units, via.m_Drill ) );
else else

2
pcbnew/tools/drawing_tool.cpp
View File

@ -113,7 +113,7 @@ protected:
if( via.m_Drill > 0 ) if( via.m_Drill > 0 )
{ {
msg.Printf( _("Via %s, drill %s" ), msg.Printf( _("Via %s, hole %s" ),
MessageTextFromValue( units, via.m_Diameter ), MessageTextFromValue( units, via.m_Diameter ),
MessageTextFromValue( units, via.m_Drill ) ); MessageTextFromValue( units, via.m_Drill ) );
} }