From c409646aad08b8124ff7dcc2200c8ce5d3ad4f3b Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 18 Nov 2022 00:45:14 +0000 Subject: [PATCH] Update message panel after rebuilding connectivity. Fixes https://gitlab.com/kicad/code/kicad/issues/10122 --- common/tool/actions.cpp | 2 ++ include/tool/actions.h | 2 ++ pcbnew/edit_zone_helpers.cpp | 3 +++ pcbnew/files.cpp | 1 + pcbnew/teardrop/dialog_teardrop.cpp | 6 +++++- pcbnew/tools/pcb_control.cpp | 1 + pcbnew/tools/zone_filler_tool.cpp | 4 ++++ 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp index 5f59505b69..2345301f32 100644 --- a/common/tool/actions.cpp +++ b/common/tool/actions.cpp @@ -688,6 +688,8 @@ const TOOL_EVENT EVENTS::SelectedEvent( TC_MESSAGE, TA_ACTION, "common.Interacti const TOOL_EVENT EVENTS::UnselectedEvent( TC_MESSAGE, TA_ACTION, "common.Interactive.unselected" ); const TOOL_EVENT EVENTS::ClearedEvent( TC_MESSAGE, TA_ACTION, "common.Interactive.cleared" ); +const TOOL_EVENT EVENTS::ConnectivityChangedEvent( TC_MESSAGE, TA_ACTION, "common.Interactive.connectivityChanged" ); + const TOOL_EVENT EVENTS::SelectedItemsModified( TC_MESSAGE, TA_ACTION, "common.Interactive.modified" ); const TOOL_EVENT EVENTS::SelectedItemsMoved( TC_MESSAGE, TA_ACTION, "common.Interactive.moved" ); const TOOL_EVENT EVENTS::InhibitSelectionEditing( TC_MESSAGE, TA_ACTION, "common.Interactive.inhibit" ); diff --git a/include/tool/actions.h b/include/tool/actions.h index 1b05cb50be..2c56cd797b 100644 --- a/include/tool/actions.h +++ b/include/tool/actions.h @@ -207,6 +207,8 @@ public: const static TOOL_EVENT UnselectedEvent; const static TOOL_EVENT ClearedEvent; + const static TOOL_EVENT ConnectivityChangedEvent; + ///< Selected item had a property changed (except movement) const static TOOL_EVENT SelectedItemsModified; diff --git a/pcbnew/edit_zone_helpers.cpp b/pcbnew/edit_zone_helpers.cpp index 9afaac1405..4a7fccba8b 100644 --- a/pcbnew/edit_zone_helpers.cpp +++ b/pcbnew/edit_zone_helpers.cpp @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -103,6 +105,7 @@ void PCB_EDIT_FRAME::Edit_Zone_Params( ZONE* aZone ) commit.Push( _( "Modify zone properties" ), SKIP_CONNECTIVITY ); GetBoard()->BuildConnectivity(); + GetToolManager()->PostEvent( EVENTS::ConnectivityChangedEvent ); pickedList.ClearItemsList(); // s_ItemsListPicker is no longer owner of picked items } diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 9e2971c137..113fcb5edf 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -988,6 +988,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector& aFileSet, in commit.Push( _( "Convert Zone(s)" ), SKIP_CONNECTIVITY ); GetBoard()->BuildConnectivity( &progressReporter ); + GetToolManager()->PostEvent( EVENTS::ConnectivityChangedEvent ); } // from EDA_APPL which was first loaded BOARD only: diff --git a/pcbnew/teardrop/dialog_teardrop.cpp b/pcbnew/teardrop/dialog_teardrop.cpp index e75d58bd91..e8422c34f1 100644 --- a/pcbnew/teardrop/dialog_teardrop.cpp +++ b/pcbnew/teardrop/dialog_teardrop.cpp @@ -26,7 +26,8 @@ #include #include #include - +#include +#include #include "teardrop.h" #include "dialog_teardrop_base.h" #include @@ -216,6 +217,8 @@ void PCB_EDIT_FRAME::OnRunTeardropTool( wxCommandEvent& event ) int added_count = trdm.SetTeardrops( &committer, dlg.CanUseTwoTracks() ); + GetToolManager()->PostEvent( EVENTS::ConnectivityChangedEvent ); + m_infoBar->RemoveAllButtons(); m_infoBar->AddCloseButton(); m_infoBar->ShowMessageFor( wxString::Format( _( "%d teardrops created" ), added_count ), @@ -232,6 +235,7 @@ void PCB_EDIT_FRAME::OnRemoveTeardropTool( wxCommandEvent& event ) GetCanvas()->RedrawRatsnest(); GetCanvas()->Refresh(); + GetToolManager()->PostEvent( EVENTS::SelectedItemsModified ); m_infoBar->RemoveAllButtons(); m_infoBar->AddCloseButton(); diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp index 88dc918d5f..7d33dca6a4 100644 --- a/pcbnew/tools/pcb_control.cpp +++ b/pcbnew/tools/pcb_control.cpp @@ -1628,6 +1628,7 @@ void PCB_CONTROL::setTransitions() Go( &PCB_CONTROL::UpdateMessagePanel, EVENTS::UnselectedEvent ); Go( &PCB_CONTROL::UpdateMessagePanel, EVENTS::ClearedEvent ); Go( &PCB_CONTROL::UpdateMessagePanel, EVENTS::SelectedItemsModified ); + Go( &PCB_CONTROL::UpdateMessagePanel, EVENTS::ConnectivityChangedEvent ); // Add library by dropping file Go( &PCB_CONTROL::DdAddLibrary, ACTIONS::ddAddLibrary.MakeEvent() ); diff --git a/pcbnew/tools/zone_filler_tool.cpp b/pcbnew/tools/zone_filler_tool.cpp index 848d6d450b..acbe692b05 100644 --- a/pcbnew/tools/zone_filler_tool.cpp +++ b/pcbnew/tools/zone_filler_tool.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include "pcb_actions.h" #include "zone_filler_tool.h" #include "zone_filler.h" @@ -97,6 +98,7 @@ void ZONE_FILLER_TOOL::CheckAllZones( wxWindow* aCaller, PROGRESS_REPORTER* aRep } board()->BuildConnectivity(); + m_toolMgr->PostEvent( EVENTS::ConnectivityChangedEvent ); refresh(); @@ -173,6 +175,7 @@ void ZONE_FILLER_TOOL::FillAllZones( wxWindow* aCaller, PROGRESS_REPORTER* aRepo } board()->BuildConnectivity( reporter.get() ); + m_toolMgr->PostEvent( EVENTS::ConnectivityChangedEvent ); if( filler.IsDebug() ) frame->UpdateUserInterface(); @@ -256,6 +259,7 @@ int ZONE_FILLER_TOOL::ZoneFillDirty( const TOOL_EVENT& aEvent ) commit.Revert(); board()->BuildConnectivity( reporter.get() ); + m_toolMgr->PostEvent( EVENTS::ConnectivityChangedEvent ); if( filler.IsDebug() ) frame->UpdateUserInterface();