Commit f53e8971 authored by Vladimir Ur's avatar Vladimir Ur

Annotation of multiparts gets CHINAME compared. This fixes bug when annotating...

Annotation of multiparts gets CHINAME compared. This fixes bug when annotating components of same value (model) in several forms (e.g. dual opamp in single-body and dedicated representation).
parent baa0d792
...@@ -438,6 +438,9 @@ void SCH_REFERENCE_LIST::Annotate( bool aUseSheetNum, int aSheetIntervalId ) ...@@ -438,6 +438,9 @@ void SCH_REFERENCE_LIST::Annotate( bool aUseSheetNum, int aSheetIntervalId )
if( componentFlatList[jj].CompareValue( componentFlatList[ii] ) != 0 ) if( componentFlatList[jj].CompareValue( componentFlatList[ii] ) != 0 )
continue; continue;
if( componentFlatList[jj].CompareLibName( componentFlatList[ii] ) != 0 )
continue;
if( !componentFlatList[jj].m_IsNew ) if( !componentFlatList[jj].m_IsNew )
continue; continue;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "class_libentry.h" #include "class_libentry.h"
#include "sch_sheet_path.h" #include "sch_sheet_path.h"
#include "sch_component.h"
class SCH_COMPONENT; class SCH_COMPONENT;
...@@ -154,6 +155,11 @@ public: ...@@ -154,6 +155,11 @@ public:
return m_Ref.compare( item.m_Ref ); return m_Ref.compare( item.m_Ref );
} }
int CompareLibName( const SCH_REFERENCE& item ) const
{
return m_RootCmp->GetLibName().CmpNoCase( item.m_RootCmp->GetLibName() );
}
bool IsPartsLocked() bool IsPartsLocked()
{ {
return m_Entry->UnitsLocked(); return m_Entry->UnitsLocked();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment