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

Eeschema: fix spelling "propageNetCode" -> "propagateNetCode"

This commit is contained in:
Simon Richter 2016-06-07 21:07:49 -04:00 committed by Wayne Stambaugh
parent 35883bb74b
commit 961fe1abe8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/class_netlist_object.h
View File

@ -423,7 +423,7 @@ private:
* used to interconnect group of items already physically connected, * used to interconnect group of items already physically connected,
* when a new connection is found between aOldNetCode and aNewNetCode * when a new connection is found between aOldNetCode and aNewNetCode
*/ */
void propageNetCode( int aOldNetCode, int aNewNetCode, bool aIsBus ); void propagateNetCode( int aOldNetCode, int aNewNetCode, bool aIsBus );
/* /*
* This function merges the net codes of groups of objects already connected * This function merges the net codes of groups of objects already connected

16
eeschema/netlist.cpp
View File

@ -635,7 +635,7 @@ void NETLIST_OBJECT_LIST::sheetLabelConnect( NETLIST_OBJECT* SheetLabel )
// Propagate Netcode having all the objects of the same Netcode. // Propagate Netcode having all the objects of the same Netcode.
if( ObjetNet->GetNet() ) if( ObjetNet->GetNet() )
propageNetCode( ObjetNet->GetNet(), SheetLabel->GetNet(), IS_WIRE ); propagateNetCode( ObjetNet->GetNet(), SheetLabel->GetNet(), IS_WIRE );
else else
ObjetNet->SetNet( SheetLabel->GetNet() ); ObjetNet->SetNet( SheetLabel->GetNet() );
} }
@ -677,7 +677,7 @@ void NETLIST_OBJECT_LIST::connectBusLabels()
LabelInTst->SetNet( Label->GetNet() ); LabelInTst->SetNet( Label->GetNet() );
else else
// Merge the 2 net codes, they are connected. // Merge the 2 net codes, they are connected.
propageNetCode( LabelInTst->GetNet(), Label->GetNet(), IS_WIRE ); propagateNetCode( LabelInTst->GetNet(), Label->GetNet(), IS_WIRE );
} }
} }
} }
@ -685,7 +685,7 @@ void NETLIST_OBJECT_LIST::connectBusLabels()
} }
void NETLIST_OBJECT_LIST::propageNetCode( int aOldNetCode, int aNewNetCode, bool aIsBus ) void NETLIST_OBJECT_LIST::propagateNetCode( int aOldNetCode, int aNewNetCode, bool aIsBus )
{ {
if( aOldNetCode == aNewNetCode ) if( aOldNetCode == aNewNetCode )
return; return;
@ -747,7 +747,7 @@ void NETLIST_OBJECT_LIST::pointToPointConnect( NETLIST_OBJECT* aRef, bool aIsBus
if( item->GetNet() == 0 ) if( item->GetNet() == 0 )
item->SetNet( netCode ); item->SetNet( netCode );
else else
propageNetCode( item->GetNet(), netCode, IS_WIRE ); propagateNetCode( item->GetNet(), netCode, IS_WIRE );
} }
break; break;
@ -799,7 +799,7 @@ void NETLIST_OBJECT_LIST::pointToPointConnect( NETLIST_OBJECT* aRef, bool aIsBus
if( item->m_BusNetCode == 0 ) if( item->m_BusNetCode == 0 )
item->m_BusNetCode = netCode; item->m_BusNetCode = netCode;
else else
propageNetCode( item->m_BusNetCode, netCode, IS_BUS ); propagateNetCode( item->m_BusNetCode, netCode, IS_BUS );
} }
break; break;
} }
@ -836,14 +836,14 @@ void NETLIST_OBJECT_LIST::segmentToPointConnect( NETLIST_OBJECT* aJonction,
if( aIsBus == IS_WIRE ) if( aIsBus == IS_WIRE )
{ {
if( segment->GetNet() ) if( segment->GetNet() )
propageNetCode( segment->GetNet(), aJonction->GetNet(), aIsBus ); propagateNetCode( segment->GetNet(), aJonction->GetNet(), aIsBus );
else else
segment->SetNet( aJonction->GetNet() ); segment->SetNet( aJonction->GetNet() );
} }
else else
{ {
if( segment->m_BusNetCode ) if( segment->m_BusNetCode )
propageNetCode( segment->m_BusNetCode, aJonction->m_BusNetCode, aIsBus ); propagateNetCode( segment->m_BusNetCode, aJonction->m_BusNetCode, aIsBus );
else else
segment->m_BusNetCode = aJonction->m_BusNetCode; segment->m_BusNetCode = aJonction->m_BusNetCode;
} }
@ -887,7 +887,7 @@ void NETLIST_OBJECT_LIST::labelConnect( NETLIST_OBJECT* aLabelRef )
continue; continue;
if( item->GetNet() ) if( item->GetNet() )
propageNetCode( item->GetNet(), aLabelRef->GetNet(), IS_WIRE ); propagateNetCode( item->GetNet(), aLabelRef->GetNet(), IS_WIRE );
else else
item->SetNet( aLabelRef->GetNet() ); item->SetNet( aLabelRef->GetNet() );
} }