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

Connectivity rebuild must be done after commit push. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10608
This commit is contained in:
Jeff Young 2022-02-25 23:15:10 +00:00
parent 9c2bc98fd3
commit b17eb3a584
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/edit_zone_helpers.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* Some code comes from FreePCB. * Some code comes from FreePCB.
* *
@ -124,28 +124,23 @@ void PCB_EDIT_FRAME::Edit_Zone_Params( ZONE* aZone )
commit.Stage( pickedList ); commit.Stage( pickedList );
// Only auto-refill zones here if in user preferences // Only auto-refill zones here if in user preferences
if( Settings().m_AutoRefillZones ) if( Settings().m_AutoRefillZones && zones_to_refill.size() )
{ {
if( zones_to_refill.size() ) ZONE_FILLER filler( GetBoard(), &commit );
{ wxString title = wxString::Format( _( "Refill %d Zones" ), (int) zones_to_refill.size() );
ZONE_FILLER filler( GetBoard(), &commit );
wxString title = wxString::Format( _( "Refill %d Zones" ),
(int) zones_to_refill.size() );
std::unique_ptr<WX_PROGRESS_REPORTER> reporter; std::unique_ptr<WX_PROGRESS_REPORTER> reporter;
reporter = std::make_unique<WX_PROGRESS_REPORTER>( this, title, 4 ); reporter = std::make_unique<WX_PROGRESS_REPORTER>( this, title, 4 );
filler.SetProgressReporter( reporter.get() ); filler.SetProgressReporter( reporter.get() );
if( !filler.Fill( zones_to_refill ) ) filler.Fill( zones_to_refill );
{
GetBoard()->GetConnectivity()->Build( GetBoard() );
// User has already OK'ed dialog so we're going to go ahead and commit even if the
// fill was cancelled.
}
}
} }
commit.Push( _( "Modify zone properties" ) ); commit.Push( _( "Modify zone properties" ) );
if( Settings().m_AutoRefillZones && zones_to_refill.size() )
GetBoard()->GetConnectivity()->Build( GetBoard() );
GetBoard()->GetConnectivity()->RecalculateRatsnest(); GetBoard()->GetConnectivity()->RecalculateRatsnest();
pickedList.ClearItemsList(); // s_ItemsListPicker is no longer owner of picked items pickedList.ClearItemsList(); // s_ItemsListPicker is no longer owner of picked items