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
6fb73118
Commit
6fb73118
authored
Sep 17, 2013
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix two more FPID empty string parsing bugs.
parent
028b0bd3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
readwrite_dlgs.cpp
cvpcb/readwrite_dlgs.cpp
+6
-7
legacy_plugin.cpp
pcbnew/legacy_plugin.cpp
+6
-1
No files found.
cvpcb/readwrite_dlgs.cpp
View file @
6fb73118
...
@@ -74,17 +74,16 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName )
...
@@ -74,17 +74,16 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName )
// Check to see if the component has already a footprint set.
// Check to see if the component has already a footprint set.
hasFootprint
=
!
component
->
GetFPID
().
empty
();
hasFootprint
=
!
component
->
GetFPID
().
empty
();
#if defined( USE_FP_LIB_TABLE )
FPID
fpid
;
FPID
fpid
;
if
(
!
aFootprintName
.
IsEmpty
()
)
{
wxCHECK_RET
(
fpid
.
Parse
(
aFootprintName
)
<
0
,
wxCHECK_RET
(
fpid
.
Parse
(
aFootprintName
)
<
0
,
wxString
::
Format
(
wxT
(
"<%s> is not a valid FPID."
),
wxString
::
Format
(
wxT
(
"<%s> is not a valid FPID."
),
GetChars
(
aFootprintName
)
)
);
GetChars
(
aFootprintName
)
)
);
}
component
->
SetFPID
(
fpid
);
component
->
SetFPID
(
fpid
);
#else
component
->
SetFPID
(
FPID
(
aFootprintName
)
);
#endif
// create the new component description
// create the new component description
description
.
Printf
(
CMP_FORMAT
,
componentIndex
+
1
,
description
.
Printf
(
CMP_FORMAT
,
componentIndex
+
1
,
...
...
pcbnew/legacy_plugin.cpp
View file @
6fb73118
...
@@ -278,8 +278,13 @@ void LEGACY_PLUGIN::loadAllSections( bool doAppend )
...
@@ -278,8 +278,13 @@ void LEGACY_PLUGIN::loadAllSections( bool doAppend )
{
{
auto_ptr
<
MODULE
>
module
(
new
MODULE
(
m_board
)
);
auto_ptr
<
MODULE
>
module
(
new
MODULE
(
m_board
)
);
FPID
fpid
;
std
::
string
fpName
=
StrPurge
(
line
+
SZ
(
"$MODULE"
)
);
std
::
string
fpName
=
StrPurge
(
line
+
SZ
(
"$MODULE"
)
);
module
->
SetFPID
(
FPID
(
fpName
)
);
if
(
!
fpName
.
empty
()
)
fpid
=
FPID
(
fpName
);
module
->
SetFPID
(
fpid
);
LoadMODULE
(
module
.
get
()
);
LoadMODULE
(
module
.
get
()
);
m_board
->
Add
(
module
.
release
(),
ADD_APPEND
);
m_board
->
Add
(
module
.
release
(),
ADD_APPEND
);
...
...
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