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

Separate width adjustments between single track and diff pair. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6572
This commit is contained in:
Jeff Young 2020-12-02 16:23:59 +00:00
parent 8d3d648975
commit 96c9680922
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pcbnew/tools/pcb_editor_control.cpp
View File

@ -58,6 +58,7 @@
#include <project/project_file.h> // LAST_PATH_TYPE #include <project/project_file.h> // LAST_PATH_TYPE
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tools/tool_event_utils.h> #include <tools/tool_event_utils.h>
#include <router/router_tool.h>
#include <view/view_controls.h> #include <view/view_controls.h>
#include <view/view_group.h> #include <view/view_group.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
@ -574,6 +575,24 @@ int PCB_EDITOR_CONTROL::TrackWidthInc( const TOOL_EVENT& aEvent )
} }
commit.Push( "Increase Track Width" ); commit.Push( "Increase Track Width" );
return 0;
}
ROUTER_TOOL* routerTool = m_toolMgr->GetTool<ROUTER_TOOL>();
if( routerTool && routerTool->IsToolActive()
&& routerTool->Router()->Mode() == PNS::PNS_MODE_ROUTE_DIFF_PAIR )
{
int widthIndex = designSettings.GetDiffPairIndex() + 1;
// If we go past the last track width entry in the list, start over at the beginning
if( widthIndex >= (int) designSettings.m_DiffPairDimensionsList.size() )
widthIndex = 0;
designSettings.SetDiffPairIndex( widthIndex );
designSettings.UseCustomDiffPairDimensions( false );
m_toolMgr->RunAction( PCB_ACTIONS::trackViaSizeChanged, true );
} }
else else
{ {
@ -581,9 +600,7 @@ int PCB_EDITOR_CONTROL::TrackWidthInc( const TOOL_EVENT& aEvent )
// If we go past the last track width entry in the list, start over at the beginning // If we go past the last track width entry in the list, start over at the beginning
if( widthIndex >= (int) designSettings.m_TrackWidthList.size() ) if( widthIndex >= (int) designSettings.m_TrackWidthList.size() )
{
widthIndex = 0; widthIndex = 0;
}
designSettings.SetTrackWidthIndex( widthIndex ); designSettings.SetTrackWidthIndex( widthIndex );
designSettings.UseCustomTrackViaSize( false ); designSettings.UseCustomTrackViaSize( false );
@ -626,19 +643,32 @@ int PCB_EDITOR_CONTROL::TrackWidthDec( const TOOL_EVENT& aEvent )
} }
commit.Push( "Decrease Track Width" ); commit.Push( "Decrease Track Width" );
return 0;
}
ROUTER_TOOL* routerTool = m_toolMgr->GetTool<ROUTER_TOOL>();
if( routerTool && routerTool->IsToolActive()
&& routerTool->Router()->Mode() == PNS::PNS_MODE_ROUTE_DIFF_PAIR )
{
int widthIndex = designSettings.GetDiffPairIndex() - 1;
// If we get to the lowest entry start over at the highest
if( widthIndex < 0 )
widthIndex = designSettings.m_DiffPairDimensionsList.size() - 1;
designSettings.SetDiffPairIndex( widthIndex );
designSettings.UseCustomDiffPairDimensions( false );
m_toolMgr->RunAction( PCB_ACTIONS::trackViaSizeChanged, true );
} }
else else
{ {
int widthIndex = 0; // Assume we only have a single track width entry int widthIndex = designSettings.GetTrackWidthIndex() - 1;
// If there are more, cycle through them backwards // If we get to the lowest entry start over at the highest
if( designSettings.m_TrackWidthList.size() > 0 ) if( widthIndex < 0 )
{ widthIndex = designSettings.m_TrackWidthList.size() - 1;
widthIndex = designSettings.GetTrackWidthIndex() - 1;
// If we get to the lowest entry start over at the highest
if( widthIndex < 0 )
widthIndex = designSettings.m_TrackWidthList.size() - 1;
}
designSettings.SetTrackWidthIndex( widthIndex ); designSettings.SetTrackWidthIndex( widthIndex );
designSettings.UseCustomTrackViaSize( false ); designSettings.UseCustomTrackViaSize( false );