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

NET_LABEL should be sheet-local, not global throughout the hierarchy.

This commit is contained in:
lifekidyeaa 2008-02-12 22:44:15 +00:00
parent 0381261834
commit 10ded82dbd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/netlist.cpp
View File

@ -1098,16 +1098,16 @@ static void LabelConnect( ObjetNetListStruct* LabelRef )
if( netTable[i].m_SheetList != LabelRef->m_SheetList ) if( netTable[i].m_SheetList != LabelRef->m_SheetList )
{ {
if( netTable[i].m_Type != NET_LABEL // (***) if( netTable[i].m_Type != NET_PINLABEL
&& netTable[i].m_Type != NET_PINLABEL
&& netTable[i].m_Type != NET_GLOBLABEL && netTable[i].m_Type != NET_GLOBLABEL
&& netTable[i].m_Type != NET_GLOBBUSLABELMEMBER) && netTable[i].m_Type != NET_GLOBBUSLABELMEMBER
/*netTable[i].m_Type != NET_LABEL (***)*/ )
continue; continue;
} }
//regular labels are sheet-local; //regular labels are sheet-local;
//NET_HIERLABEL are used to connect sheets. //NET_HIERLABEL are used to connect sheets.
//NET_LABEL can be either sheet-local or global. //NET_LABEL is sheet-local (***)
//historically, it was global, so we must implement that (***) //NET_GLOBLABEL is global.
if( netTable[i].m_Type == NET_LABEL if( netTable[i].m_Type == NET_LABEL
|| netTable[i].m_Type == NET_GLOBLABEL || netTable[i].m_Type == NET_GLOBLABEL
|| netTable[i].m_Type == NET_BUSLABELMEMBER || netTable[i].m_Type == NET_BUSLABELMEMBER