From efa0c97da99598aae8aac8de021bc3ca7a73542d Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Wed, 1 May 2019 20:48:27 -0400 Subject: [PATCH] Make sure net name prefixes carry through to netlist --- eeschema/connection_graph.cpp | 2 ++ eeschema/sch_connection.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp index 8d4150e0c2..9e9e603a86 100644 --- a/eeschema/connection_graph.cpp +++ b/eeschema/connection_graph.cpp @@ -1022,6 +1022,8 @@ void CONNECTION_GRAPH::buildConnectionGraph() m_net_name_to_subgraphs_map[new_name].emplace_back( subgraph ); name = new_name; + + subgraph->UpdateItemConnections(); } } diff --git a/eeschema/sch_connection.cpp b/eeschema/sch_connection.cpp index 077ae1bf86..45faa93937 100644 --- a/eeschema/sch_connection.cpp +++ b/eeschema/sch_connection.cpp @@ -212,16 +212,16 @@ void SCH_CONNECTION::Clone( SCH_CONNECTION& aOther ) m_sheet = aOther.Sheet(); m_name = aOther.m_name; m_prefix = aOther.Prefix(); - // Don't clone suffix, it will be rolled into the name - //m_suffix = aOther.Suffix(); + m_suffix = aOther.Suffix(); m_members = aOther.Members(); m_net_code = aOther.NetCode(); m_bus_code = aOther.BusCode(); - //m_subgraph_code = aOther.SubgraphCode(); m_vector_start = aOther.VectorStart(); m_vector_end = aOther.VectorEnd(); m_vector_index = aOther.VectorIndex(); m_vector_prefix = aOther.VectorPrefix(); + + // Note: subgraph code isn't cloned, it should remain with the original object }