Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
301ef32e
Commit
301ef32e
authored
Oct 02, 2011
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error when opening component library file names with dot.
parent
c2f1113e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
16 deletions
+15
-16
eelibs_read_libraryfiles.cpp
eeschema/eelibs_read_libraryfiles.cpp
+9
-10
wxEeschemaStruct.h
include/wxEeschemaStruct.h
+6
-6
No files found.
eeschema/eelibs_read_libraryfiles.cpp
View file @
301ef32e
/*****************************************************************/
/**
/* 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 @@
...
@@ -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 )
...
@@ -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 )
...
@@ -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
"
);
...
@@ -109,13 +107,14 @@ void SCH_EDIT_FRAME::LoadLibraries( void )
...
@@ -109,13 +107,14 @@ void SCH_EDIT_FRAME::LoadLibraries( void )
wxLogDebug( wxT( "LoadLibraries() requested component library sort order:" ) );
wxLogDebug( wxT( "LoadLibraries() requested component library sort order:" ) );
for( size_t i = 0; i < sortOrder.GetCount(); i++ )
for( size_t i = 0; i < sortOrder.GetCount(); i++ )
wxLogDebug( wxT( " " ) + sortOrder[i] );
wxLogDebug( wxT( " " ) + sortOrder[i] );
wxLogDebug( wxT( "Real component library sort order:" ) );
wxLogDebug( wxT( "Real component library sort order:" ) );
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
View file @
301ef32e
/**
*********************************************************/
/**
/* 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:
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment