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).

eeschema/component_references_lister.cpp

@@ -438,6 +438,9 @@ void SCH_REFERENCE_LIST::Annotate( bool aUseSheetNum, int aSheetIntervalId  )
                 if( componentFlatList[jj].CompareValue( componentFlatList[ii] ) != 0 )
                     continue;
 
+                if( componentFlatList[jj].CompareLibName( componentFlatList[ii] ) != 0 )
+                    continue;
+
                 if( !componentFlatList[jj].m_IsNew )
                     continue;
 

eeschema/netlist.h

@@ -36,6 +36,7 @@
 
 #include "class_libentry.h"
 #include "sch_sheet_path.h"
+#include "sch_component.h"
 
 
 class SCH_COMPONENT;
@@ -154,6 +155,11 @@ public:
         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()
     {
         return m_Entry->UnitsLocked();