From 7062a3b29bbe6d3fe79c3fab75da2c1db9a21d92 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 18 Sep 2020 23:04:10 +0100 Subject: [PATCH] Fix bug in net <-> netclass matching. Also adds a "Default" setting for Edit Text and Graphics Properties so the linestyle can be batch-edited back to default. Fixes https://gitlab.com/kicad/code/kicad/issues/5674 --- .../dialogs/dialog_global_edit_text_and_graphics.cpp | 9 ++++++++- eeschema/sch_line.cpp | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp index 2fb162a0ed..bab0db4683 100644 --- a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp +++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp @@ -62,6 +62,8 @@ static bool g_filterByNet; static wxString g_netFilter; +#define DEFAULT_STYLE _( "Default" ) + class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS : public DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE { SCH_EDIT_FRAME* m_parent; @@ -106,6 +108,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( SCH_ if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) m_parent->RecalculateConnections( NO_CLEANUP ); + m_lineStyle->Append( DEFAULT_STYLE ); m_lineStyle->Append( INDETERMINATE_ACTION ); m_sdbSizerButtonsOK->SetDefault(); @@ -279,7 +282,11 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( const SCH_SHEET_PATH& aS if( m_lineStyle->GetStringSelection() != INDETERMINATE_ACTION ) { - lineItem->SetLineStyle( m_lineStyle->GetSelection() ); + if( m_lineStyle->GetStringSelection() == DEFAULT_STYLE ) + lineItem->SetLineStyle( PLOT_DASH_TYPE::DEFAULT ); + else + lineItem->SetLineStyle( m_lineStyle->GetSelection() ); + m_hasChange = true; } diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index a69e84d0ab..eb14c8bd0d 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -820,7 +820,7 @@ void SCH_LINE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList ) conn->AppendInfoToMsgPanel( aList ); NET_SETTINGS& netSettings = Schematic()->Prj().GetProjectFile().NetSettings(); - wxString netname = conn->Name( true ); + wxString netname = conn->Name(); wxString netclassName = netSettings.m_NetClasses.GetDefaultPtr()->GetName(); if( netSettings.m_NetClassAssignments.count( netname ) )