Initial work on new component library stucture.

* Use C++ map in component library instead of boost::ptr_vector.
* Drop Boost pointer containers for standard C++ containers.
* Moved duplicate name user interface elements from library object to
  library editor.
* Added code to support direct addition and replacement of component
  alias objects into libraries.
* Removed temporary strings used to add and remove alias objects.
* Libraries only store alias objects, components now accessed thru alias.
* Simplify library API for adding, removing, and replacing components.
* Updated edit component in library dialog and library editor to reflect
  component library object changes.
* Fixed bug in library viewer when displaying alias name.
* Made a few header files compile stand alone per the new coding policy.
* Remove some dead code and the usual code formatting fixes.

common/drawpanel.cpp

@@ -817,7 +817,7 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
     if( double_size )
     {
         wxRealPoint dblgrid = screen_grid_size + screen_grid_size;
-        m_Parent->PutOnGrid(&org, &dblgrid);
+        m_Parent->PutOnGrid( &org, &dblgrid );
     }
 
     // Draw grid: the best algorithm depend on the platform.
@@ -862,9 +862,9 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
             break;
         xpos = org.x + xg;
         xpos = GRMapX( xpos );
-        if( xpos < m_ClipBox.GetOrigin().x) // column not in active screen area.
+        if( xpos < m_ClipBox.GetOrigin().x ) // column not in active screen area.
             continue;
-        if( xpos > m_ClipBox.GetEnd().x)    // end of active area reached.
+        if( xpos > m_ClipBox.GetEnd().x )    // end of active area reached.
             break;
         for( jj = 0; ; jj += increment )
         {
@@ -872,9 +872,9 @@ void WinEDA_DrawPanel::DrawGrid( wxDC* DC )
             if( yg > size.y )
                 break;
             ypos = org.y + yg;
-            if( ypos < m_ClipBox.GetOrigin().y) // column not in active screen area.
+            if( ypos < m_ClipBox.GetOrigin().y ) // column not in active screen area.
                 continue;
-            if( ypos > m_ClipBox.GetEnd().y)    // end of active area reached.
+            if( ypos > m_ClipBox.GetEnd().y )    // end of active area reached.
                 break;
             DC->DrawPoint( xpos, GRMapY( ypos ) );
         }

eeschema/annotate.cpp

@@ -76,7 +76,7 @@ void ReAnnotatePowerSymbolsOnly( void )
             LIB_COMPONENT* Entry =
                 CMP_LIBRARY::FindLibraryComponent( DrawLibItem->m_ChipName );
 
-            if( ( Entry == NULL ) || !Entry->isPower() )
+            if( ( Entry == NULL ) || !Entry->IsPower() )
                 continue;
 
             //DrawLibItem->ClearAnnotation(sheet); this clears all annotation :(

eeschema/class_libentry.h

@@ -8,11 +8,27 @@
 #include "classes_body_items.h"
 #include "class_libentry_fields.h"
 
-#include <boost/ptr_container/ptr_vector.hpp>
+#include <map>
 
 
 class CMP_LIBRARY;
+class LIB_ALIAS;
 
+/**
+ * LIB_ALIAS map sorting.
+ */
+struct AliasMapSort
+{
+    bool operator() ( const wxString& aItem1, const wxString& aItem2 ) const
+        { return aItem1.CmpNoCase( aItem2 ) < 0; }
+};
+
+/**
+ * Alias map used by component library object.
+ */
+typedef std::map< wxString, LIB_ALIAS*, AliasMapSort > LIB_ALIAS_MAP;
+
+typedef std::vector< LIB_ALIAS* > LIB_ALIAS_LIST;
 
 /* Types for components in libraries
  * components can be a true component or an alias of a true component.
@@ -114,10 +130,9 @@ public:
     {
         return !( *this == aName );
     }
-};
-
-typedef boost::ptr_vector< CMP_LIB_ENTRY > LIB_ENTRY_LIST;
 
+    bool operator==( const wxString& aName ) const { return *this == ( const wxChar* ) aName; }
+};
 
 extern bool operator<( const CMP_LIB_ENTRY& aItem1, const CMP_LIB_ENTRY& aItem2 );
 
@@ -142,42 +157,21 @@ class LIB_COMPONENT : public CMP_LIB_ENTRY
     LibrEntryOptions   m_options;        ///< Special component features such as POWER or NORMAL.)
     int                unitCount;        ///< Number of units (parts) per package.
     LIB_DRAW_ITEM_LIST drawings;         ///< How to draw this part.
-    wxArrayString      m_aliasListData;  /* ALIAS data (name, doc, keywords and doc filename).
-                                          * Used only by the component editor LibEdit
-                                          * to store aliases info during edition
-                                          * usually void outside the component editor */
-    wxArrayString      m_AliasList;      ///< List of alias names for the component.
     wxArrayString      m_FootprintList;  /**< List of suitable footprint names for the
-                                              component (wildcard names accepted). */
-
+                                              component (wild card names accepted). */
+    LIB_ALIAS_LIST     m_aliases;        ///< List of alias object pointers associated with the
+                                         ///< component.
 
     void deleteAllFields();
 
     friend class CMP_LIBRARY;
+    friend class LIB_ALIAS;
 
 public:
-    /* Offsets used in editing library component,
-     * for handle aliases data in m_AliasListData array string
-     * when editing a library component, aliases data is stored
-     * in m_AliasListData.
-     * 4 strings by alias are stored:
-     * name, doc, keywords and doc filename
-     * these constants are indexes in m_AliasListData
-     * to read/write strings for a given alias
-     */
-    enum alias_idx
-    {
-        ALIAS_NAME_IDX         = 0,
-        ALIAS_DOC_IDX          = 1,
-        ALIAS_KEYWORD_IDX      = 2,
-        ALIAS_DOC_FILENAME_IDX = 3,
-        ALIAS_NEXT_IDX         = 4
-    };
-
     LIB_COMPONENT( const wxString& aName, CMP_LIBRARY* aLibrary = NULL );
     LIB_COMPONENT( LIB_COMPONENT& aComponent, CMP_LIBRARY* aLibrary = NULL );
 
-    ~LIB_COMPONENT();
+    virtual ~LIB_COMPONENT();
 
     virtual wxString GetClass() const
     {
@@ -191,72 +185,31 @@ public:
         GetValueField().m_Text = aName;
     }
 
-    wxArrayString& GetAliasList() { return m_AliasList; }
+    wxArrayString GetAliasNames( bool aIncludeRoot = true ) const;
 
-    wxArrayString& GetFootPrints() { return m_FootprintList; }
+    size_t GetAliasCount() const { return m_aliases.size(); }
 
-    /* accessors to aliases data, used by the component editor, during edition
-    */
-    /** Function CollectAliasesData
-     * store in m_aliasListData alias data (doc, keywords, docfile)
-     * for each alias found in m_AliasList
-    */
-    void CollectAliasesData( CMP_LIBRARY* aLibrary );
+    LIB_ALIAS* GetAlias( size_t aIndex );
 
-    /** Function LocateAliasData
-     * @return an index in array string to the alias data (doc, keywords, docfile)
-     *         or -1 if not found
-     * @param aAliasName = the alias name
-     * @param aCreateIfNotExist = true if the alias data must be created, when not exists
-     */
-    int LocateAliasData( const wxString & aAliasName, bool aCreateIfNotExist = false );
+    LIB_ALIAS* GetAlias( const wxString& aName );
 
-    /** Function GetAliasDataDoc
-     * @param aAliasName = the alias name
-     * @return the Doc string
-     */
-    wxString GetAliasDataDoc( const wxString & aAliasName );
-
-    /** Function GetAliasDataKeyWords
-     * @param aAliasName = the alias name
-     * @return aAliasData = the keywords string
-     */
-    wxString GetAliasDataKeyWords( const wxString & aAliasName );
-
-    /** Function GetAliasDataDocFileName
-     * @param aAliasName = the alias name
-     * @return the Doc filename string
-     */
-    wxString GetAliasDataDocFileName( const wxString & aAliasName );
-
-    /** Function SetAliasDataDoc
-     * @param aAliasName = the alias name
-     * @return aAliasData = the Doc string
+    /**
+     * Test if alias \a aName is in component alias list.
+     *
+     * Alias name comparisons are case insensitive.
+     *
+     * @param aName - Name of alias.
+     * @return True if alias name in alias list.
      */
-    void SetAliasDataDoc( const wxString & aAliasName, const wxString & aAliasData );
+    bool HasAlias( const wxString& aName ) const;
 
-    /** Function SetAliasDataKeywords
-     * @param aAliasName = the alias name
-     * @param aAliasData = the keywords string
-     */
-    void SetAliasDataKeywords( const wxString & aAliasName, const wxString & aAliasData );
+    void SetAliases( const wxArrayString& aAliasList );
 
-    /** Function SetAliasDataDocFileName
-     * @param aAliasName = the alias name
-     * @param aAliasData = the Doc filename string
-     */
-    void SetAliasDataDocFileName( const wxString & aAliasName, const wxString & aAliasData );
+    void RemoveAlias( const wxString& aName );
 
-    /** Function ClearAliasDataDoc
-     * clear aliases data list
-     */
-    void ClearAliasDataDoc( ) { m_aliasListData.Clear(); }
+    LIB_ALIAS* RemoveAlias( LIB_ALIAS* aAlias );
 
-    /** Function RemoveAliasData
-     * remove an alias data from list
-     * @param aAliasName = the alias name
-     */
-    void RemoveAliasData(const wxString & aAliasName );
+    wxArrayString& GetFootPrints() { return m_FootprintList; }
 
     EDA_Rect GetBoundaryBox( int aUnit, int aConvert );
 
@@ -286,8 +239,8 @@ public:
     bool LoadAliases( char* aLine, wxString& aErrorMsg );
     bool LoadFootprints( FILE* aFile, char* aLine, int* aLineNum, wxString& aErrorMsg );
 
-    bool isPower() { return m_options == ENTRY_POWER; }
-    bool isNormal() { return m_options == ENTRY_NORMAL; }
+    bool IsPower() { return m_options == ENTRY_POWER; }
+    bool IsNormal() { return m_options == ENTRY_NORMAL; }
 
     void SetPower() { m_options = ENTRY_POWER; }
     void SetNormal() { m_options = ENTRY_NORMAL; }
@@ -301,7 +254,7 @@ public:
      * in \a aFieldsList.  The only known caller of this function is the
      * library component field editor, and it establishes needed behavior.
      *
-     * @param aFieldsList is a set of fields to import, removing all previous fields.
+`     * @param aFieldsList is a set of fields to import, removing all previous fields.
      */
     void SetFields( const std::vector <LIB_FIELD>& aFieldsList );
 
@@ -460,20 +413,6 @@ public:
      */
     bool HasConversion() const;
 
-    /**
-     * Test if alias \a aName is in component alias list.
-     *
-     * Alias name comparisons are case insensitive.
-     *
-     * @param aName - Name of alias.
-     * @return True if alias name in alias list.
-     */
-    bool HasAlias( const wxChar* aName )
-    {
-        wxASSERT( aName != NULL );
-        return m_AliasList.Index( aName ) != wxNOT_FOUND;
-    }
-
     /**
      * Clears the status flag all draw objects in this component.
      */
@@ -630,6 +569,8 @@ public:
     void SetShowPinNumbers( bool aShow ) { m_showPinNumbers = aShow; }
 
     bool ShowPinNumbers() { return m_showPinNumbers; }
+
+    bool operator==( const LIB_COMPONENT* aComponent ) const { return this == aComponent; }
 };
 
 
@@ -641,23 +582,24 @@ public:
  */
 class LIB_ALIAS : public CMP_LIB_ENTRY
 {
+    friend class LIB_COMPONENT;
+
 protected:
     /**
      * The actual component of the alias.
      *
-     * @note - Do not delete the root component.  The root component is owned
-     *         by library the component is part of.  Deleting the root component
-     *         will likely cause EESchema to crash.
-     *         Or, if the root component is deleted, aliases must be deleted or their .root member
-     *         must be changed to point a new root component
+     * @note - Do not delete the root component.  The root component is actually shared by
+     *         all of the aliases associated with it.  The component pointer will be delete
+     *         in the destructor of the last alias that shares this component is deleted.
+     *         Deleting the root component will likely cause EESchema to crash.
      */
     LIB_COMPONENT* root;
 
 public:
-    LIB_ALIAS( const wxString& aName, LIB_COMPONENT* aRootComponent,
-               CMP_LIBRARY* aLibrary = NULL );
-    LIB_ALIAS( LIB_ALIAS& aAlias, CMP_LIBRARY* aLibrary = NULL );
-    ~LIB_ALIAS();
+    LIB_ALIAS( const wxString& aName, LIB_COMPONENT* aRootComponent );
+    LIB_ALIAS( LIB_ALIAS& aAlias, LIB_COMPONENT* aRootComponent = NULL );
+
+    virtual ~LIB_ALIAS();
 
     virtual wxString GetClass() const
     {
@@ -672,10 +614,9 @@ public:
         return root;
     }
 
-    /**
-     * Set the alias root component.
-     */
-    void SetComponent( LIB_COMPONENT* aComponent );
+    bool IsRoot() const { return name.CmpNoCase( root->GetName() ) == 0; }
+
+    bool operator==( const LIB_ALIAS* aAlias ) const { return this == aAlias; }
 };
 
 

eeschema/class_libentry_fields.h

@@ -5,7 +5,7 @@
 #ifndef CLASS_LIBENTRY_FIELDS_H
 #define CLASS_LIBENTRY_FIELDS_H
 
-
+#include "program.h"
 #include "classes_body_items.h"
 
 

eeschema/class_library.h

@@ -62,11 +62,11 @@ class CMP_LIBRARY
     wxDateTime         timeStamp;       ///< Library save time and date.
     int                versionMajor;    ///< Library major version number.
     int                versionMinor;    ///< Library minor version number.
-    LIB_ENTRY_LIST entries;         ///< Parts themselves are saved here.
     bool               isCache;         /**< False for the "standard" libraries,
                                              True for the library cache */
     wxString           header;          ///< first line of loaded library.
     bool               isModified;      ///< Library modification status.
+    LIB_ALIAS_MAP      aliases;         ///< Map of aliases objects associated with the library.
 
     static CMP_LIBRARY_LIST libraryList;
     static wxArrayString    libraryListSortOrder;
@@ -82,12 +82,6 @@ public:
     }
     ~CMP_LIBRARY();
 
-    /** Modify flags handling:
-     */
-    void SetModifyFlags( ) { isModified = true; }
-    void ClearModifyFlag( ) { isModified = false; }
-    bool getModifyFlag( ) { return isModified;}
-
     /**
      * Function Save
      * saves library to a file.
@@ -136,17 +130,6 @@ private:
     bool LoadHeader( FILE* aFile, int* aLineNum );
     void LoadAliases( LIB_COMPONENT* aComponent );
 
-    /**
-     * Function RemoveEntryName
-     * removes an \a aName entry from the library list names.
-     * Warning: this is a partied remove, because if aname is an alias
-     * it is not removed from its root component.
-     * this is for internal use only
-     * Use RemoveEntry( CMP_LIB_ENTRY* aEntry ) to remove safely an entry.
-     * @param aName - Entry name to remove from library.
-     */
-    void RemoveEntryName( const wxString& aName );
-
 public:
     /**
      * Get library entry status.
@@ -155,7 +138,7 @@ public:
      */
     bool IsEmpty() const
     {
-        return entries.empty();
+        return aliases.empty();
     }
 
     /**
@@ -166,7 +149,7 @@ public:
      */
     int GetCount() const
     {
-        return entries.size();
+        return aliases.size();
     }
 
     bool IsModified() const
@@ -176,8 +159,6 @@ public:
 
     bool IsCache() const { return isCache; }
 
-    void SetModified( void ) { isModified = true; }
-
     void SetCache( void ) { isCache = true; }
 
    /**
@@ -214,25 +195,23 @@ public:
      * @param aRe - Regular expression used to search component key words.
      * @param aSort - Sort component name list.
      */
-    void SearchEntryNames( wxArrayString& aNames, const wxRegEx& aRe,
-                           bool aSort = true );
+    void SearchEntryNames( wxArrayString& aNames, const wxRegEx& aRe, bool aSort = true );
 
     /**
-     * Find entry by name.
+     * Checks \a aComponent for name conflict in the library.
      *
-     * @param aName - Name of entry, case insensitive.
-     * @return Entry if found.  NULL if not found.
+     * @param aComponent - The component to check.
+     * @erturn True if a conflict exists.  Otherwise false.
      */
-    CMP_LIB_ENTRY* FindEntry( const wxChar* aName );
+    bool Conflicts( LIB_COMPONENT* aComponent );
 
     /**
-     * Find entry by \a aName and \a aType.
+     * Find entry by name.
      *
      * @param aName - Name of entry, case insensitive.
-     * @param aType - Type of entry, root or alias.
      * @return Entry if found.  NULL if not found.
      */
-    CMP_LIB_ENTRY* FindEntry( const wxChar* aName, LibrEntryType aType );
+    CMP_LIB_ENTRY* FindEntry( const wxChar* aName );
 
     /**
      * Find component by \a aName.
@@ -256,7 +235,7 @@ public:
      */
     LIB_ALIAS* FindAlias( const wxChar* aName )
     {
-        return (LIB_ALIAS*) FindEntry( aName, ALIAS );
+        return (LIB_ALIAS*) FindEntry( aName );
     }
 
     /**
@@ -285,18 +264,17 @@ public:
     LIB_COMPONENT* AddComponent( LIB_COMPONENT* aComponent );
 
     /**
-     * Remove safely an \a aEntry from the library.
+     * Safely remove \a aEntry from the library and return the next entry.
      *
-     * If the entry is an alias, the alias is removed from the library and from
-     * the alias list of the root component.  If the entry is a root component
-     * with no aliases, it is removed from the library.  If the entry is a root
-     * component with aliases, the root component is renamed to the name of
-     * the first alias and the root name for all remaining aliases are updated
-     * to reflect the new root name.
+     * The next entry returned depends on the entry being removed.  If the entry being
+     * remove also removes the component, then the next entry from the list is returned.
+     * If the entry being used only removes an alias from a component, then the next alias
+     * of the component is returned.
      *
      * @param aEntry - Entry to remove from library.
+     * @return The next entry in the library or NULL if the library is empty.
      */
-    void RemoveEntry( CMP_LIB_ENTRY* aEntry );
+    CMP_LIB_ENTRY* RemoveEntry( CMP_LIB_ENTRY* aEntry );
 
     /**
      * Replace an existing component entry in the library.
@@ -410,8 +388,7 @@ public:
      * @return Library object if library file loaded successfully,
      *         otherwise NULL.
      */
-    static CMP_LIBRARY* LoadLibrary( const wxFileName& aFileName,
-                                     wxString& aErrorMsg );
+    static CMP_LIBRARY* LoadLibrary( const wxFileName& aFileName, wxString& aErrorMsg );
 
     /**
      * Function AddLibrary
@@ -443,6 +420,8 @@ public:
      */
     static void RemoveLibrary( const wxString& aName );
 
+    static void RemoveAllLibraries() { libraryList.clear(); }
+
     /**
      * Function FindLibrary
      * finds a component library by \a aName.

eeschema/class_sch_component.cpp

@@ -1158,7 +1158,7 @@ void SCH_COMPONENT::DisplayInfo( WinEDA_DrawFrame* frame )
                            GetRef( ( (WinEDA_SchematicFrame*) frame )->GetSheet() ),
                            DARKCYAN );
 
-    if( root_component->isPower() )
+    if( root_component->IsPower() )
         msg = _( "Power symbol" );
     else
         msg = _( "Name" );

eeschema/classes_body_items.h

@@ -9,6 +9,8 @@
 
 #include "base_struct.h"
 
+#include <boost/ptr_container/ptr_vector.hpp>
+
 
 class LIB_COMPONENT;
 class PLOTTER;

eeschema/dialog_edit_component_in_lib.cpp

@@ -27,9 +27,9 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::DIALOG_EDIT_COMPONENT_IN_LIBRARY( WinEDA_Libed
 
 	Init();
 
-    if (GetSizer())
+    if( GetSizer() )
     {
-        GetSizer()->SetSizeHints(this);
+        GetSizer()->SetSizeHints( this );
     }
 }
 
@@ -40,7 +40,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::~DIALOG_EDIT_COMPONENT_IN_LIBRARY()
 
 /* Initialize state of check boxes and texts
 */
-void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init( )
+void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init()
 {
     SetFocus();
     m_AliasLocation = -1;
@@ -55,7 +55,9 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init( )
 
     wxString title = _( "Properties for " );
 
-    if( !m_Parent->GetAliasName().IsEmpty() )
+    bool isRoot = m_Parent->GetAliasName().CmpNoCase( component->GetName() ) == 0;
+
+    if( !isRoot )
     {
         title += m_Parent->GetAliasName() + _( " (alias of " ) +
             component->GetName() + wxT( ")" );
@@ -63,20 +65,19 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init( )
     else
     {
         title += component->GetName();
-        m_Parent->GetAliasName().Empty();
     }
 
     SetTitle( title );
     InitPanelDoc();
     InitBasicPanel();
 
-    if( !m_Parent->GetAliasName().IsEmpty() )
+    if( isRoot && component->GetAliasCount() == 1 )
         m_ButtonDeleteAllAlias->Enable( false );
 
     /* Place list of alias names in listbox */
-    m_PartAliasListCtrl->Append( component->GetAliasList() );
+    m_PartAliasListCtrl->Append( component->GetAliasNames( false ) );
 
-    if( component->GetAliasList().GetCount() == 0 )
+    if( component->GetAliasCount() <= 1 )
     {
         m_ButtonDeleteAllAlias->Enable( false );
         m_ButtonDeleteOneAlias->Enable( false );
@@ -102,23 +103,24 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::OnCancelClick( wxCommandEvent& event )
 
 void DIALOG_EDIT_COMPONENT_IN_LIBRARY::InitPanelDoc()
 {
+    LIB_ALIAS* alias;
     LIB_COMPONENT* component = m_Parent->GetComponent();
 
     if( component == NULL )
         return;
 
     wxString aliasname = m_Parent->GetAliasName();
-    if( aliasname.IsEmpty() )       // The root component is selected
-    {
-        m_DocCtrl->SetValue( component->GetDescription() );
-        m_KeywordsCtrl->SetValue( component->GetKeyWords() );
-        m_DocfileCtrl->SetValue( component->GetDocFileName() );
-    }
-    else    // An alias is currently selected
+
+    if( aliasname.IsEmpty() )
+        return;
+
+    alias = component->GetAlias( aliasname );
+
+    if( alias != NULL )
     {
-        m_DocCtrl->SetValue( component->GetAliasDataDoc( aliasname ) );
-        m_KeywordsCtrl->SetValue( component->GetAliasDataKeyWords( aliasname ) );
-        m_DocfileCtrl->SetValue( component->GetAliasDataDocFileName( aliasname ) );
+        m_DocCtrl->SetValue( alias->GetDescription() );
+        m_KeywordsCtrl->SetValue( alias->GetKeyWords() );
+        m_DocfileCtrl->SetValue( alias->GetDocFileName() );
     }
 }
 
@@ -151,6 +153,6 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::InitBasicPanel()
     m_PinsNameInsideButt->SetValue( component->GetPinNameOffset() != 0 );
     m_SelNumberOfUnits->SetValue( component->GetPartCount() );
     m_SetSkew->SetValue( component->GetPinNameOffset() );
-    m_OptionPower->SetValue( component->isPower() );
+    m_OptionPower->SetValue( component->IsPower() );
     m_OptionPartsLocked->SetValue( component->UnitsLocked() );
 }

eeschema/dialog_edit_component_in_schematic.cpp

@@ -253,7 +253,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnOKButtonClick( wxCommandEvent& event
     LIB_COMPONENT* entry =
         CMP_LIBRARY::FindLibraryComponent( m_Cmp->m_ChipName );
 
-    if( entry &&  entry->isPower() )
+    if( entry &&  entry->IsPower() )
         m_FieldsBuf[VALUE].m_Text = m_Cmp->m_ChipName;
 
     // copy all the fields back, and change the length of m_Fields.
@@ -592,7 +592,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copySelectedFieldToPanel()
 
     // For power symbols, the value is NOR editable, because value and pin
     // name must be same and can be edited only in library editor
-    if( fieldNdx == VALUE && m_LibEntry && m_LibEntry->isPower() )
+    if( fieldNdx == VALUE && m_LibEntry && m_LibEntry->IsPower() )
         fieldValueTextCtrl->Enable( false );
     else
         fieldValueTextCtrl->Enable( true );

eeschema/dialog_edit_libentry_fields_in_lib.cpp

@@ -221,9 +221,8 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::OnOKButtonClick( wxCommandEvent& event
     /* A new name could be entered in VALUE field.
      *  Must not be an existing alias name in alias list box */
     wxString* newvalue = &m_FieldsBuf[VALUE].m_Text;
-    for( size_t i = 0; i < m_LibEntry->GetAliasList().GetCount(); i++ )
-    {
-        if( newvalue->CmpNoCase( m_LibEntry->GetAliasList()[i] ) == 0 )
+
+    if( m_LibEntry->HasAlias( *newvalue ) )
     {
         wxString msg;
         msg.Printf( _( "A new name is entered for this component\n\
@@ -232,7 +231,6 @@ An alias %s already exists!\nCannot update this component" ),
         DisplayError( this, msg );
         return;
     }
-    }
 
     /* save old cmp in undo list */
     m_Parent->SaveCopyInUndoList( m_LibEntry, IS_CHANGED );

eeschema/edit_component_in_schematic.cpp

@@ -102,7 +102,7 @@ void WinEDA_SchematicFrame::EditCmpFieldText( SCH_FIELD* Field, wxDC* DC )
     {
         Entry = CMP_LIBRARY::FindLibraryComponent( Cmp->m_ChipName );
 
-        if( Entry && Entry->isPower() )
+        if( Entry && Entry->IsPower() )
         {
             DisplayInfoMessage( this, _( "Part is a POWER, value cannot be \
 modified!\nYou must create a new power"  ) );

eeschema/libedit.cpp

@@ -89,6 +89,7 @@ saved.\n\nDiscard current changes?" ) ) )
     if( m_component )
     {
         SAFE_DELETE( m_component );
+        m_aliasName.Empty();
     }
 
     /* Load the new library component */
@@ -96,8 +97,7 @@ saved.\n\nDiscard current changes?" ) ) )
 
     if( LibEntry == NULL )
     {
-        msg.Printf( _( "Component or alias name \"%s\" not found in \
-library \"%s\"." ),
+        msg.Printf( _( "Component or alias name \"%s\" not found in library \"%s\"." ),
                     GetChars( CmpName ),
                     GetChars( m_library->GetName() ) );
         DisplayError( this, msg );
@@ -113,7 +113,7 @@ library \"%s\"." ),
     GetScreen()->ClearUndoRedoList();
     Zoom_Automatique( false );
     DrawPanel->Refresh();
-    SetShowDeMorgan(m_component->HasConversion() );
+    SetShowDeMorgan( m_component->HasConversion() );
     m_HToolBar->Refresh();
 }
 
@@ -125,28 +125,26 @@ library \"%s\"." ),
  * 1 if error
  * m_component advanced copy and created
  */
-bool WinEDA_LibeditFrame::LoadOneLibraryPartAux( CMP_LIB_ENTRY* LibEntry,
-                                                 CMP_LIBRARY*   Library )
+bool WinEDA_LibeditFrame::LoadOneLibraryPartAux( CMP_LIB_ENTRY* aEntry, CMP_LIBRARY* aLibrary )
 {
     wxString msg, cmpName, rootName;
     LIB_COMPONENT* component;
 
-    if( ( LibEntry == NULL ) || ( Library == NULL ) )
+    if( ( aEntry == NULL ) || ( aLibrary == NULL ) )
         return false;
 
-    if( LibEntry->GetName().IsEmpty() )
+    if( aEntry->GetName().IsEmpty() )
     {
         wxLogWarning( wxT( "Entry in library <%s> has empty name field." ),
-                      GetChars( Library->GetName() ) );
+                      GetChars( aLibrary->GetName() ) );
         return false;
     }
 
-    cmpName = LibEntry->GetName();
-    m_aliasName.Empty();
+    cmpName = m_aliasName = aEntry->GetName();
 
-    if( LibEntry->isAlias() )
+    if( aEntry->isAlias() )
     {
-        LIB_ALIAS* alias = (LIB_ALIAS*) LibEntry;
+        LIB_ALIAS* alias = (LIB_ALIAS*) aEntry;
         component = alias->GetComponent();
 
         wxASSERT( component != NULL && component->isComponent() );
@@ -154,28 +152,30 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPartAux( CMP_LIB_ENTRY* LibEntry,
         wxLogDebug( wxT( "\"<%s>\" is alias of \"<%s>\"" ),
                     GetChars( cmpName ),
                     GetChars( component->GetName() ) );
-
-        m_aliasName = cmpName;
     }
     else
     {
-        component = (LIB_COMPONENT*) LibEntry;
+        component = (LIB_COMPONENT*) aEntry;
     }
 
     if( m_component )
+    {
         SAFE_DELETE( m_component );
+        m_aliasName.Empty();
+    }
 
     m_component = new LIB_COMPONENT( *component );
 
     if( m_component == NULL )
     {
         msg.Printf( _( "Could not create copy of part <%s> in library <%s>." ),
-                    GetChars( LibEntry->GetName() ),
-                    GetChars( Library->GetName() ) );
+                    GetChars( aEntry->GetName() ),
+                    GetChars( aLibrary->GetName() ) );
         DisplayError( this, msg );
         return false;
     }
 
+    m_aliasName = aEntry->GetName();
     m_unit = 1;
     m_convert = 1;
 
@@ -184,9 +184,6 @@ bool WinEDA_LibeditFrame::LoadOneLibraryPartAux( CMP_LIB_ENTRY* LibEntry,
     if( m_component->HasConversion() )
         m_showDeMorgan = true;
 
-    // Collect aliases data and store it in the root component, for edition:
-    m_component->CollectAliasesData( Library );
-
     GetBaseScreen()->ClrModify();
     DisplayLibInfos();
     UpdateAliasSelectList();
@@ -294,8 +291,7 @@ void WinEDA_LibeditFrame::SaveActiveLibrary( wxCommandEvent& event )
 
     if( !success )
     {
-        msg = _( "Error while saving library file \"" ) + fn.GetFullPath() +
-              _( "\"." );
+        msg = _( "Error while saving library file \"" ) + fn.GetFullPath() + _( "\"." );
         AppendMsgPanel( _( "*** ERROR: ***" ), msg, RED );
         DisplayError( this, msg );
     }
@@ -303,8 +299,7 @@ void WinEDA_LibeditFrame::SaveActiveLibrary( wxCommandEvent& event )
     {
         msg = _( "Library file \"" ) + fn.GetFullName() + wxT( "\" Ok" );
         fn.SetExt( DOC_EXT );
-        wxString msg1 = _( "Document file \"" ) + fn.GetFullPath() +
-                        wxT( "\" Ok" );
+        wxString msg1 = _( "Document file \"" ) + fn.GetFullPath() + wxT( "\" Ok" );
         AppendMsgPanel( msg, msg1, BLUE );
     }
 }
@@ -318,6 +313,7 @@ void WinEDA_LibeditFrame::SaveActiveLibrary( wxCommandEvent& event )
 void WinEDA_LibeditFrame::DisplayCmpDoc()
 {
     wxString msg;
+    LIB_ALIAS* alias;
 
     ClearMsgPanel();
 
@@ -328,11 +324,15 @@ void WinEDA_LibeditFrame::DisplayCmpDoc()
 
     AppendMsgPanel( _( "Part" ), msg, BLUE, 8 );
 
-    if( m_aliasName.IsEmpty() )
+    if( m_aliasName == m_component->GetName() )
         msg = _( "None" );
     else
         msg = m_aliasName;
 
+    alias = m_component->GetAlias( m_aliasName );
+
+    wxCHECK_RET( alias != NULL, wxT( "Alias not found in component." ) );
+
     AppendMsgPanel( _( "Alias" ), msg, RED, 8 );
 
     static wxChar UnitLetter[] = wxT( "?ABCDEFGHIJKLMNOPQRSTUVWXYZ" );
@@ -347,34 +347,15 @@ void WinEDA_LibeditFrame::DisplayCmpDoc()
 
     AppendMsgPanel( _( "Body" ), msg, GREEN, 8 );
 
-    if( m_component->isPower() )
+    if( m_component->IsPower() )
         msg = _( "Power Symbol" );
     else
         msg = _( "Component" );
 
     AppendMsgPanel( _( "Type" ), msg, MAGENTA, 8 );
-
-    if( m_aliasName.IsEmpty() )
-
-        msg = m_component->GetDescription();
-    else
-        msg = m_component->GetAliasDataDoc( m_aliasName );
-
-    AppendMsgPanel( _( "Description" ), msg, CYAN, 8 );
-
-    if( m_aliasName.IsEmpty() )
-        msg = m_component->GetKeyWords();
-    else
-        msg = m_component->GetAliasDataKeyWords( m_aliasName );
-
-    AppendMsgPanel( _( "Key words" ), msg, DARKDARKGRAY );
-
-    if( m_aliasName.IsEmpty() )
-        msg = m_component->GetDocFileName();
-    else
-        msg = m_component->GetAliasDataDocFileName( m_aliasName );
-
-    AppendMsgPanel( _( "Datasheet" ), msg, DARKDARKGRAY );
+    AppendMsgPanel( _( "Description" ), alias->GetDescription(), CYAN, 8 );
+    AppendMsgPanel( _( "Key words" ), alias->GetKeyWords(), DARKDARKGRAY );
+    AppendMsgPanel( _( "Datasheet" ), alias->GetDocFileName(), DARKDARKGRAY );
 }
 
 
@@ -419,10 +400,8 @@ void WinEDA_LibeditFrame::DeleteOnePart( wxCommandEvent& event )
 
     if( ListNames.IsEmpty() )
     {
-        msg.Printf( _( "Component library <%s> is empty." ),
-                    GetChars( m_library->GetName() ) );
-        wxMessageBox( msg, _( "Delete Entry Error" ),
-                      wxID_OK | wxICON_EXCLAMATION, this );
+        msg.Printf( _( "Component library <%s> is empty." ), GetChars( m_library->GetName() ) );
+        wxMessageBox( msg, _( "Delete Entry Error" ), wxID_OK | wxICON_EXCLAMATION, this );
         return;
     }
 
@@ -453,9 +432,7 @@ void WinEDA_LibeditFrame::DeleteOnePart( wxCommandEvent& event )
     if( !IsOK( this, msg ) )
         return;
 
-    if( m_component == NULL
-        || ( m_component->GetName().CmpNoCase( LibEntry->GetName() ) != 0
-             && !m_component->HasAlias( LibEntry->GetName() ) ) )
+    if( m_component == NULL || !m_component->HasAlias( LibEntry->GetName() ) )
     {
         m_library->RemoveEntry( LibEntry );
         return;
@@ -470,47 +447,24 @@ void WinEDA_LibeditFrame::DeleteOnePart( wxCommandEvent& event )
 All changes will be lost. Discard changes?" ) ) )
         return;
 
-    wxString newCmpName;
-    CMP_LIB_ENTRY* nextEntry;
-
-    /*
-     * If the current component has no aliases, then the next entry
-     * in the library will be shown.  If the current component has
-     * aliases, the updated component will be shown
-     */
-    if( m_component->GetName().CmpNoCase( LibEntry->GetName() ) == 0 )
-    {
-        if( m_component->GetAliasList().IsEmpty() )
-        {
-            nextEntry = m_library->GetNextEntry( m_component->GetName() );
+    CMP_LIB_ENTRY* nextEntry = m_library->RemoveEntry( LibEntry );
 
     if( nextEntry != NULL )
-                newCmpName = nextEntry->GetName();
-        }
-        else
     {
-            newCmpName = m_component->GetAliasList()[ 0 ];
-        }
+        if( LoadOneLibraryPartAux( nextEntry, m_library ) )
+            Zoom_Automatique( false );
     }
     else
     {
-        newCmpName = m_component->GetName();
+        SAFE_DELETE( m_component );
+        m_aliasName.Empty();
     }
 
-    m_library->RemoveEntry( LibEntry );
-
-    if( !newCmpName.IsEmpty() )
-    {
-        nextEntry = m_library->FindEntry( newCmpName );
-
-        if( nextEntry != NULL && LoadOneLibraryPartAux( nextEntry, m_library ) )
-            Zoom_Automatique( false );
-
     DrawPanel->Refresh();
-    }
 }
 
 
+
 /*
  * Routine to create a new library component
  *
@@ -537,8 +491,7 @@ lost!\n\nClear the current component from the screen?" ) ) )
 
     if( dlg.GetName().IsEmpty() )
     {
-        wxMessageBox( _( "This new component has no name and cannot be \
-created. Aborted" ) );
+        wxMessageBox( _( "This new component has no name and cannot be created. Aborted" ) );
         return;
     }
 
@@ -582,12 +535,16 @@ created. Aborted" ) );
     if( dlg.GetPartCount() < 2 )
         component->LockUnits( false );
 
+    m_aliasName = component->GetName();
+
     if( m_component )
     {
         SAFE_DELETE( m_component );
+        m_aliasName.Empty();
     }
 
     m_component = component;
+    m_aliasName = m_component->GetName();
     m_unit = 1;
     m_convert  = 1;
     DisplayLibInfos();

eeschema/libfield.cpp

@@ -186,7 +186,7 @@ void WinEDA_LibeditFrame::EditField( wxDC* DC, LIB_FIELD* Field )
         wxString msg;
 
         /* Test for an existing name in the current components alias list. */
-        if( Field->GetParent()->GetAliasList().Index( Text, false ) != wxNOT_FOUND )
+        if( Field->GetParent()->HasAlias( Text ) )
         {
             msg.Printf( _( "The field name <%s> is an existing alias of the \
 component <%s>.\nPlease choose another name that does not conflict with any \

eeschema/onrightclick.cpp

@@ -284,7 +284,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )
     msg = AddHotkeyName( _( "Edit" ), s_Schematic_Hokeys_Descr, HK_EDIT );
     ADD_MENUITEM( editmenu, ID_POPUP_SCH_EDIT_CMP, msg, edit_component_xpm );
 
-    if( libComponent && libComponent->isNormal() )
+    if( libComponent && libComponent->IsNormal() )
     {
         msg = AddHotkeyName( _( "Value " ), s_Schematic_Hokeys_Descr, HK_EDIT_COMPONENT_VALUE );
         ADD_MENUITEM( editmenu, ID_POPUP_SCH_EDIT_VALUE_CMP, msg, edit_comp_value_xpm );

eeschema/schframe.cpp

@@ -19,6 +19,7 @@
 #include "eeschema_id.h"
 #include "netlist.h"
 #include "class_pin.h"
+#include "class_library.h"
 
 #include "annotate_dialog.h"
 #include "dialog_build_BOM.h"
@@ -258,6 +259,7 @@ WinEDA_SchematicFrame::~WinEDA_SchematicFrame()
     SAFE_DELETE( g_RootSheet );
     SAFE_DELETE( m_CurrentSheet );     // a SCH_SHEET_PATH, on the heap.
     SAFE_DELETE( m_findReplaceData );
+    CMP_LIBRARY::RemoveAllLibraries();
 }
 
 

eeschema/viewlib_frame.cpp

@@ -54,8 +54,7 @@ BEGIN_EVENT_TABLE( WinEDA_ViewlibFrame, WinEDA_DrawFrame )
     EVT_LISTBOX( ID_LIBVIEW_LIB_LIST, WinEDA_ViewlibFrame::ClickOnLibList )
     EVT_LISTBOX( ID_LIBVIEW_CMP_LIST, WinEDA_ViewlibFrame::ClickOnCmpList )
 
-    EVT_MENU( ID_SET_RELATIVE_OFFSET,
-              WinEDA_ViewlibFrame::OnSetRelativeOffset )
+    EVT_MENU( ID_SET_RELATIVE_OFFSET, WinEDA_ViewlibFrame::OnSetRelativeOffset )
 END_EVENT_TABLE()
 
 
@@ -136,8 +135,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow*    father,
         m_LibListWindow->SetAlignment( wxLAYOUT_LEFT );
         m_LibListWindow->SetSashVisible( wxSASH_RIGHT, TRUE );
         m_LibListWindow->SetExtraBorderSize( EXTRA_BORDER_SIZE );
-        m_LibList =
-            new wxListBox( m_LibListWindow, ID_LIBVIEW_LIB_LIST,
+        m_LibList = new wxListBox( m_LibListWindow, ID_LIBVIEW_LIB_LIST,
                                    wxPoint( 0, 0 ), wxDefaultSize,
                                    0, NULL, wxLB_HSCROLL );
     }

eeschema/viewlibs.cpp

@@ -266,43 +266,36 @@ void WinEDA_ViewlibFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
     if( entry == NULL )
         return;
 
-    DrawPanel->DrawBackGround( DC );
+    wxCHECK_RET( entry->isAlias(),
+                 wxT( "Entry \"" ) + entry->GetName() + wxT( "\" found in library <" ) +
+                 lib->GetName() + wxT( "> is not a LIB_ALIAS object." ) );
 
-    if( entry->isAlias() )
-    {
     LIB_ALIAS* alias = (LIB_ALIAS*) entry;
     component = alias->GetComponent();
 
-        if( component == NULL )     // Should not occur
-        {
-            wxASSERT( component != NULL );
-            return;
-        }
-        if( ! component->isComponent() )
+    DrawPanel->DrawBackGround( DC );
+
+    if( !alias->IsRoot() )
     {
-            wxASSERT( component->isComponent() );
+        if( component == NULL )     // Should not occur
             return;
-        }
 
+        // Temporarily change the name field text to reflect the alias name.
         msg = alias->GetName();
-
-        /* Temporarily change the name field text to reflect the alias name. */
         tmp = component->GetName();
-        component->SetName( alias->GetName() );
+        component->SetName( msg );
+
         if( m_unit < 1 )
             m_unit = 1;
         if( m_convert < 1 )
             m_convert = 1;
-        component->SetName( tmp );
     }
     else
     {
-        component = (LIB_COMPONENT*) entry;
         msg = _( "None" );
     }
 
-    component->Draw( DrawPanel, DC, wxPoint( 0, 0 ), m_unit, m_convert,
-                     GR_DEFAULT_DRAWMODE );
+    component->Draw( DrawPanel, DC, wxPoint( 0, 0 ), m_unit, m_convert, GR_DEFAULT_DRAWMODE );
 
     /* Redraw the cursor */
     DrawPanel->DrawCursor( DC );

include/colors.h

@@ -5,6 +5,8 @@
 #ifndef _COLORS_H
 #define _COLORS_H
 
+#include <wx/wx.h>
+
 /* Number of colors ( 32 bit palette. ) */
 #define NBCOLOR             24