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

Handle arcs in global track width changes 

Also add defensive code against invalid indices

Fixes https://gitlab.com/kicad/code/kicad/issues/10325

(cherry picked from commit bd7841bf96)
This commit is contained in:
Seth Hillbrand 2022-01-10 17:19:11 -08:00
parent fcfe42d67c
commit 70b0ac15ea
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
View File

@ -308,14 +308,19 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::processItem( PICKED_ITEMS_LIST* aUndoLi
{ {
BOARD_DESIGN_SETTINGS& brdSettings = m_brd->GetDesignSettings(); BOARD_DESIGN_SETTINGS& brdSettings = m_brd->GetDesignSettings();
bool isTrack = aItem->Type() == PCB_TRACE_T; bool isTrack = aItem->Type() == PCB_TRACE_T;
bool isArc = aItem->Type() == PCB_ARC_T;
bool isVia = aItem->Type() == PCB_VIA_T; bool isVia = aItem->Type() == PCB_VIA_T;
if( m_setToSpecifiedValues->GetValue() ) if( m_setToSpecifiedValues->GetValue() )
{ {
if( isTrack && m_trackWidthSelectBox->GetStringSelection() != INDETERMINATE_ACTION ) if( ( isArc || isTrack )
&& m_trackWidthSelectBox->GetStringSelection() != INDETERMINATE_ACTION )
{ {
unsigned int prevTrackWidthIndex = brdSettings.GetTrackWidthIndex(); unsigned int prevTrackWidthIndex = brdSettings.GetTrackWidthIndex();
brdSettings.SetTrackWidthIndex( (unsigned) m_trackWidthSelectBox->GetSelection() ); int trackWidthIndex = m_trackWidthSelectBox->GetSelection();
if( trackWidthIndex >= 0 )
brdSettings.SetTrackWidthIndex( static_cast<unsigned>( trackWidthIndex ) );
m_parent->SetTrackSegmentWidth( aItem, aUndoList, false ); m_parent->SetTrackSegmentWidth( aItem, aUndoList, false );
@ -324,14 +329,17 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::processItem( PICKED_ITEMS_LIST* aUndoLi
else if( isVia && m_viaSizesSelectBox->GetStringSelection() != INDETERMINATE_ACTION ) else if( isVia && m_viaSizesSelectBox->GetStringSelection() != INDETERMINATE_ACTION )
{ {
unsigned int prevViaSizeIndex = brdSettings.GetViaSizeIndex(); unsigned int prevViaSizeIndex = brdSettings.GetViaSizeIndex();
brdSettings.SetViaSizeIndex( (unsigned) m_viaSizesSelectBox->GetSelection() ); int viaSizeIndex = m_viaSizesSelectBox->GetSelection();
if( viaSizeIndex >= 0 )
brdSettings.SetViaSizeIndex( static_cast<unsigned>( viaSizeIndex ) );
m_parent->SetTrackSegmentWidth( aItem, aUndoList, false ); m_parent->SetTrackSegmentWidth( aItem, aUndoList, false );
brdSettings.SetViaSizeIndex( prevViaSizeIndex ); brdSettings.SetViaSizeIndex( prevViaSizeIndex );
} }
if( isTrack && m_layerBox->GetLayerSelection() != UNDEFINED_LAYER ) if( ( isArc || isTrack ) && m_layerBox->GetLayerSelection() != UNDEFINED_LAYER )
{ {
if( aUndoList->FindItem( aItem ) < 0 ) if( aUndoList->FindItem( aItem ) < 0 )
{ {
@ -403,6 +411,8 @@ bool DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::TransferDataFromWindow()
visitItem( &itemsListPicker, track ); visitItem( &itemsListPicker, track );
else if ( m_vias->GetValue() && track->Type() == PCB_VIA_T ) else if ( m_vias->GetValue() && track->Type() == PCB_VIA_T )
visitItem( &itemsListPicker, track ); visitItem( &itemsListPicker, track );
else if ( m_vias->GetValue() && track->Type() == PCB_ARC_T )
visitItem( &itemsListPicker, track );
} }
if( itemsListPicker.GetCount() > 0 ) if( itemsListPicker.GetCount() > 0 )