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

Remove unused functionality.

This commit is contained in:
Jeff Young 2020-02-15 17:55:18 +00:00
parent 1a216f3703
commit d374abc79b
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/netlist_object.cpp
View File

@ -379,7 +379,7 @@ bool NETLIST_OBJECT::IsLabelBusMemberType() const
/* /*
* return the net name of the item * return the net name of the item
*/ */
wxString NETLIST_OBJECT::GetNetName( bool adoptTimestamp ) const wxString NETLIST_OBJECT::GetNetName() const
{ {
if( m_netNameCandidate == NULL ) if( m_netNameCandidate == NULL )
return wxEmptyString; return wxEmptyString;
@ -387,7 +387,7 @@ wxString NETLIST_OBJECT::GetNetName( bool adoptTimestamp ) const
wxString netName; wxString netName;
if( m_netNameCandidate->m_Type == NETLIST_ITEM::PIN ) if( m_netNameCandidate->m_Type == NETLIST_ITEM::PIN )
return GetShortNetName( adoptTimestamp ); return GetShortNetName();
if( !m_netNameCandidate->IsLabelGlobal() ) if( !m_netNameCandidate->IsLabelGlobal() )
{ {
@ -405,7 +405,7 @@ wxString NETLIST_OBJECT::GetNetName( bool adoptTimestamp ) const
* from the "best" label without any prefix. * from the "best" label without any prefix.
* 2 different nets can have the same short name * 2 different nets can have the same short name
*/ */
wxString NETLIST_OBJECT::GetShortNetName( bool adoptTimestamp ) const wxString NETLIST_OBJECT::GetShortNetName() const
{ {
if( m_netNameCandidate == NULL ) if( m_netNameCandidate == NULL )
return wxEmptyString; return wxEmptyString;
@ -419,10 +419,6 @@ wxString NETLIST_OBJECT::GetShortNetName( bool adoptTimestamp ) const
{ {
netName = wxT("Net-("); netName = wxT("Net-(");
netName << link->GetRef( &m_netNameCandidate->m_SheetPath ); netName << link->GetRef( &m_netNameCandidate->m_SheetPath );
if( adoptTimestamp && netName.Last() == '?' )
netName << link->GetTimeStamp();
netName << wxT("-Pad") << m_netNameCandidate->m_PinNum << wxT(")"); netName << wxT("-Pad") << m_netNameCandidate->m_PinNum << wxT(")");
} }
} }

15
eeschema/netlist_object.h
View File

@ -242,20 +242,17 @@ public:
/** /**
* Function GetNetName * Function GetNetName
* @param adoptTimestamp if annotation is not done (i.e. GetRef returns something with an ? at the end) * @return the full net name of the item, i.e. the net name from the "best" label,
* @return the full net name of the item, i.e. the net name * prefixed by the sheet path
* from the "best" label, prefixed by the sheet path
*/ */
wxString GetNetName( bool adoptTimestamp = false ) const; wxString GetNetName() const;
/** /**
* Function GetShortNetName * Function GetShortNetName
* @param adoptTimestamp if annotation is not done (i.e. GetRef returns something with an ? at the end) * @return the short net name of the item i.e. the net name from the "best" label
* @return the short net name of the item i.e. the net name * without any prefix. 2 different nets can have the same short name
* from the "best" label without any prefix.
* 2 different nets can have the same short name
*/ */
wxString GetShortNetName( bool adoptTimestamp = false ) const; wxString GetShortNetName() const;
/** /**
* Function ConvertBusToNetListItems * Function ConvertBusToNetListItems