Browse Source

Use m_numRefStr when converting back to string.

(It main contain leading zeroes.)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/19724
pcb_db
Jeff Young 9 months ago
parent
commit
469d2176dd
  1. 10
      eeschema/sch_reference_list.cpp
  2. 2
      eeschema/sch_reference_list.h

10
eeschema/sch_reference_list.cpp

@ -666,7 +666,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
if( m_flatList[ii].m_isNew ) // Not yet annotated
{
if( m_flatList[ii].m_numRef >= 0 )
tmp << m_flatList[ii].m_numRef;
tmp << m_flatList[ii].m_numRefStr;
else
tmp = wxT( "?" );
@ -694,7 +694,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
if( std::max( m_flatList[ii].GetLibPart()->GetUnitCount(), 1 ) < m_flatList[ii].m_unit )
{
if( m_flatList[ii].m_numRef >= 0 )
tmp << m_flatList[ii].m_numRef;
tmp << m_flatList[ii].m_numRefStr;
else
tmp = wxT( "?" );
@ -733,7 +733,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
if( first.m_unit == second.m_unit )
{
if( first.m_numRef >= 0 )
tmp << first.m_numRef;
tmp << first.m_numRefStr;
else
tmp = wxT( "?" );
@ -753,12 +753,12 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
if( first.GetLibPart()->GetUnitCount() != second.GetLibPart()->GetUnitCount() )
{
if( first.m_numRef >= 0 )
tmp << first.m_numRef;
tmp << first.m_numRefStr;
else
tmp = wxT( "?" );
if( second.m_numRef >= 0 )
tmp2 << second.m_numRef;
tmp2 << second.m_numRefStr;
else
tmp2 = wxT( "?" );

2
eeschema/sch_reference_list.h

@ -191,7 +191,7 @@ public:
if( GetSymbol() && GetLibPart() && GetLibPart()->IsPower() )
ref = wxT( "0" );
return ref << m_numRef;
return ref << m_numRefStr;
}
int CompareValue( const SCH_REFERENCE& item ) const

Loading…
Cancel
Save