From 93999f7af66caacac3fb1ed91322e962f04d7f8e Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 15 Feb 2018 15:09:39 +0000 Subject: [PATCH] Change "Automatic neckdown" to "Optimize pad connections". Fixes: lp:1485202 * https://bugs.launchpad.net/kicad/+bug/1485202 --- pcbnew/dialogs/dialog_pns_settings.cpp | 4 ++-- pcbnew/dialogs/dialog_pns_settings_base.cpp | 8 ++++---- pcbnew/dialogs/dialog_pns_settings_base.fbp | 4 ++-- pcbnew/dialogs/dialog_pns_settings_base.h | 4 ++-- pcbnew/router/pns_optimizer.cpp | 2 +- pcbnew/router/pns_routing_settings.h | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pcbnew/dialogs/dialog_pns_settings.cpp b/pcbnew/dialogs/dialog_pns_settings.cpp index 0fa1b43f16..2cfa1d60e0 100644 --- a/pcbnew/dialogs/dialog_pns_settings.cpp +++ b/pcbnew/dialogs/dialog_pns_settings.cpp @@ -44,7 +44,7 @@ DIALOG_PNS_SETTINGS::DIALOG_PNS_SETTINGS( wxWindow* aParent, PNS::ROUTING_SETTIN m_backPressure->SetValue( m_settings.JumpOverObstacles() ); m_removeLoops->SetValue( m_settings.RemoveLoops() ); m_suggestEnding->SetValue( m_settings.SuggestFinish() ); - m_autoNeckdown->SetValue( m_settings.SmartPads() ); + m_smartPads->SetValue( m_settings.SmartPads() ); m_effort->SetValue( m_settings.OptimizerEffort() ); m_smoothDragged->SetValue( m_settings.SmoothDraggedSegments() ); m_violateDrc->SetValue( m_settings.CanViolateDRC() ); @@ -65,7 +65,7 @@ void DIALOG_PNS_SETTINGS::OnOkClick( wxCommandEvent& aEvent ) m_settings.SetJumpOverObstacles( m_backPressure->GetValue() ); m_settings.SetRemoveLoops( m_removeLoops->GetValue() ); m_settings.SetSuggestFinish ( m_suggestEnding->GetValue() ); - m_settings.SetSmartPads( m_autoNeckdown->GetValue() ); + m_settings.SetSmartPads( m_smartPads->GetValue() ); m_settings.SetOptimizerEffort( (PNS::PNS_OPTIMIZATION_EFFORT) m_effort->GetValue() ); m_settings.SetSmoothDraggedSegments( m_smoothDragged->GetValue() ); m_settings.SetCanViolateDRC( m_violateDrc->GetValue() ); diff --git a/pcbnew/dialogs/dialog_pns_settings_base.cpp b/pcbnew/dialogs/dialog_pns_settings_base.cpp index 5828ea4ddc..fac214f84f 100644 --- a/pcbnew/dialogs/dialog_pns_settings_base.cpp +++ b/pcbnew/dialogs/dialog_pns_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -63,10 +63,10 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID bOptions->Add( m_removeLoops, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_autoNeckdown = new wxCheckBox( bOptions->GetStaticBox(), wxID_ANY, _("Automatic neckdown"), wxDefaultPosition, wxDefaultSize, 0 ); - m_autoNeckdown->SetToolTip( _("When enabled, the router tries to break out pads/vias in a clean way, avoiding acute angles and jagged breakout traces.") ); + m_smartPads = new wxCheckBox( bOptions->GetStaticBox(), wxID_ANY, _("Optimize pad connections"), wxDefaultPosition, wxDefaultSize, 0 ); + m_smartPads->SetToolTip( _("When enabled, the router tries to break out pads/vias in a clean way, avoiding acute angles and jagged breakout traces.") ); - bOptions->Add( m_autoNeckdown, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + bOptions->Add( m_smartPads, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_smoothDragged = new wxCheckBox( bOptions->GetStaticBox(), wxID_ANY, _("Smooth dragged segments"), wxDefaultPosition, wxDefaultSize, 0 ); m_smoothDragged->SetToolTip( _("When enabled, the router attempts to merge several jagged segments into a single straight one (dragging mode).") ); diff --git a/pcbnew/dialogs/dialog_pns_settings_base.fbp b/pcbnew/dialogs/dialog_pns_settings_base.fbp index ea4469a152..7fabd05669 100644 --- a/pcbnew/dialogs/dialog_pns_settings_base.fbp +++ b/pcbnew/dialogs/dialog_pns_settings_base.fbp @@ -770,7 +770,7 @@ 0 0 wxID_ANY - Automatic neckdown + Optimize pad connections 0 @@ -778,7 +778,7 @@ 0 1 - m_autoNeckdown + m_smartPads 1 diff --git a/pcbnew/dialogs/dialog_pns_settings_base.h b/pcbnew/dialogs/dialog_pns_settings_base.h index 8584ee34d8..328dcd8c60 100644 --- a/pcbnew/dialogs/dialog_pns_settings_base.h +++ b/pcbnew/dialogs/dialog_pns_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -46,7 +46,7 @@ class DIALOG_PNS_SETTINGS_BASE : public DIALOG_SHIM wxCheckBox* m_shoveVias; wxCheckBox* m_backPressure; wxCheckBox* m_removeLoops; - wxCheckBox* m_autoNeckdown; + wxCheckBox* m_smartPads; wxCheckBox* m_smoothDragged; wxCheckBox* m_violateDrc; wxCheckBox* m_suggestEnding; diff --git a/pcbnew/router/pns_optimizer.cpp b/pcbnew/router/pns_optimizer.cpp index a916d7fdbd..d9b969ad6b 100644 --- a/pcbnew/router/pns_optimizer.cpp +++ b/pcbnew/router/pns_optimizer.cpp @@ -838,7 +838,7 @@ int OPTIMIZER::smartPadsSingle( LINE* aLine, ITEM* aPad, bool aEnd, int aEndVert SOLID* solid = dyn_cast( aPad ); - // don't do auto-neckdown for offset pads + // don't do optimized connections for offset pads if( solid && solid->Offset() != VECTOR2I( 0, 0 ) ) return -1; diff --git a/pcbnew/router/pns_routing_settings.h b/pcbnew/router/pns_routing_settings.h index 8615c05591..46534bc3f8 100644 --- a/pcbnew/router/pns_routing_settings.h +++ b/pcbnew/router/pns_routing_settings.h @@ -92,10 +92,10 @@ public: ///> Enables displaying suggestions for finishing the currently placed track. void SetSuggestFinish( bool aSuggestFinish ) { m_suggestFinish = aSuggestFinish; } - ///> Returns true if Smart Pads (automatic neckdown) is enabled. + ///> Returns true if Smart Pads (optimized connections) is enabled. bool SmartPads() const { return m_smartPads; } - ///> Enables/disables Smart Pads (automatic neckdown). + ///> Enables/disables Smart Pads (optimized connections). void SetSmartPads( bool aSmartPads ) { m_smartPads = aSmartPads; } ///> Returns true if follow mouse mode is active (permanently on for the moment).