Commit 301ef32e authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Fix error when opening component library file names with dot.

parent c2f1113e

eeschema/eelibs_read_libraryfiles.cpp

+9 −10
Original line number Original line Diff line number Diff line 
/*****************************************************************/

/**

/*  Functions to handle component library files : read functions */

 * @file eelibs_read_libraryfiles.cpp

/*****************************************************************/

 * @brief Functions to handle reading component library files.

 */





#include "fctsys.h"

#include "fctsys.h"

#include "confirm.h"

#include "confirm.h"
@@ -14,11 +15,6 @@ 
#include "html_messagebox.h"

#include "html_messagebox.h"









/**

 * Function LoadLibraries

 *

 * Clear all already loaded libraries and load all of the project libraries.

 */

void SCH_EDIT_FRAME::LoadLibraries( void )

void SCH_EDIT_FRAME::LoadLibraries( void )

{

{

    size_t         ii;

    size_t         ii;
@@ -47,7 +43,8 @@ void SCH_EDIT_FRAME::LoadLibraries( void ) 
    /* Load missing libraries. */

    /* Load missing libraries. */

    for( ii = 0; ii < m_ComponentLibFiles.GetCount(); ii++ )

    for( ii = 0; ii < m_ComponentLibFiles.GetCount(); ii++ )

    {

    {

        fn = m_ComponentLibFiles[ii];

        fn.Clear();

        fn.SetName( m_ComponentLibFiles[ii] );

        fn.SetExt( CompLibFileExtension );

        fn.SetExt( CompLibFileExtension );





        /* Skip if the file name is not valid.. */

        /* Skip if the file name is not valid.. */
@@ -57,6 +54,7 @@ void SCH_EDIT_FRAME::LoadLibraries( void ) 
        if( !fn.FileExists() )

        if( !fn.FileExists() )

        {

        {

            tmp = wxGetApp().FindLibraryPath( fn );

            tmp = wxGetApp().FindLibraryPath( fn );



            if( !tmp )

            if( !tmp )

            {

            {

                libraries_not_found += fn.GetName() + _( "\n" );

                libraries_not_found += fn.GetName() + _( "\n" );
@@ -116,6 +114,7 @@ void SCH_EDIT_FRAME::LoadLibraries( void ) 
    for ( i = CMP_LIBRARY::GetLibraryList().begin();

    for ( i = CMP_LIBRARY::GetLibraryList().begin();

          i < CMP_LIBRARY::GetLibraryList().end(); i++ )

          i < CMP_LIBRARY::GetLibraryList().end(); i++ )

        wxLogDebug( wxT( "    " ) + i->GetName() );

        wxLogDebug( wxT( "    " ) + i->GetName() );



    wxLogDebug( wxT( "end LoadLibraries ()" ) );

    wxLogDebug( wxT( "end LoadLibraries ()" ) );

#endif

#endif

}
 
}

include/wxEeschemaStruct.h

+6 −6
Original line number Original line Diff line number Diff line 
/***********************************************************/

/**

/*              wxEeschemaStruct.h:                        */

 * @file wxEeschemaStruct.h

/***********************************************************/

 */





#ifndef  WX_EESCHEMA_STRUCT_H

#ifndef  WX_EESCHEMA_STRUCT_H

#define  WX_EESCHEMA_STRUCT_H

#define  WX_EESCHEMA_STRUCT_H
@@ -938,10 +938,10 @@ public: 
     */

     */

    void SaveUndoItemInUndoList( SCH_ITEM* aItem );

    void SaveUndoItemInUndoList( SCH_ITEM* aItem );





    // ERC:



    /**

    /**

     * Load component libraries defined in project file.

     * Function LoadLibraries

     *

     * Clear all libraries currently loaded and load all of the project libraries.

     */

     */

    void LoadLibraries( void );

    void LoadLibraries( void );