From b691c18bfc5b8de6d83d8f378ee912158b31e716 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 5 Mar 2021 19:14:53 +0000 Subject: [PATCH] Allow netclass assignents to unnamed nets. Most of the code had already moved over to this, but there were a few hold-outs. Fixes https://gitlab.com/kicad/code/kicad/issues/7802 --- eeschema/schematic.cpp | 2 +- pcbnew/netlist_reader/board_netlist_updater.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/eeschema/schematic.cpp b/eeschema/schematic.cpp index 3f880422cd..47af7ed8c7 100644 --- a/eeschema/schematic.cpp +++ b/eeschema/schematic.cpp @@ -199,7 +199,7 @@ std::vector SCHEMATIC::GetNetClassAssignmentCandidates() { CONNECTION_SUBGRAPH* subgraph = pair.second[0]; - if( subgraph->GetDriverPriority() > CONNECTION_SUBGRAPH::PRIORITY::PIN ) + if( subgraph->GetDriverPriority() >= CONNECTION_SUBGRAPH::PRIORITY::PIN ) names.emplace_back( pair.first.first ); } diff --git a/pcbnew/netlist_reader/board_netlist_updater.cpp b/pcbnew/netlist_reader/board_netlist_updater.cpp index dd743f5e85..6b78dd7b97 100644 --- a/pcbnew/netlist_reader/board_netlist_updater.cpp +++ b/pcbnew/netlist_reader/board_netlist_updater.cpp @@ -1,8 +1,3 @@ -/** - * @file board_netlist_updater.h - * @brief BOARD_NETLIST_UPDATER class definition - */ - /* * This program source code file is part of KiCad, a free EDA CAD application. * @@ -11,7 +6,7 @@ * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2011 Wayne Stambaugh * - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -946,6 +941,7 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist ) m_commit.Push( _( "Update netlist" ) ); m_board->SynchronizeNetsAndNetClasses(); + m_frame->SaveProjectSettings(); } else if( m_deleteSinglePadNets && !m_newFootprintsCount ) {