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
d247025d
Commit
d247025d
authored
Sep 30, 2010
by
Andrey Fedorushkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor improvement for russian GOST build BOM
parent
22f483e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
build_BOM.cpp
eeschema/build_BOM.cpp
+19
-1
schframe.cpp
eeschema/schframe.cpp
+3
-0
No files found.
eeschema/build_BOM.cpp
View file @
d247025d
...
...
@@ -789,6 +789,10 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
wxString
refName
;
wxString
fullRefName
;
// reference + part Id (for multiple parts per package
wxString
valName
;
#if defined(KICAD_GOST)
wxString
footName
;
wxString
datsName
;
#endif
wxString
refNames
;
wxString
lastRef
;
wxString
unitId
;
...
...
@@ -819,6 +823,10 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
refName
=
aList
[
ii
].
GetRef
();
valName
=
currCmp
->
GetField
(
VALUE
)
->
m_Text
;
#if defined(KICAD_GOST)
footName
=
currCmp
->
GetField
(
FOOTPRINT
)
->
m_Text
;
datsName
=
currCmp
->
GetField
(
DATASHEET
)
->
m_Text
;
#endif
int
multi
=
0
;
if
(
aIncludeSubComponents
)
...
...
@@ -850,7 +858,13 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
lastRef
=
refName
;
// if the next cmoponent has same value the line will be printed after.
#if defined(KICAD_GOST)
if
(
nextCmp
&&
nextCmp
->
GetField
(
VALUE
)
->
m_Text
.
CmpNoCase
(
valName
)
==
0
&&
nextCmp
->
GetField
(
FOOTPRINT
)
->
m_Text
.
CmpNoCase
(
footName
)
==
0
&&
nextCmp
->
GetField
(
DATASHEET
)
->
m_Text
.
CmpNoCase
(
datsName
)
==
0
)
#else
if
(
nextCmp
&&
nextCmp
->
GetField
(
VALUE
)
->
m_Text
.
CmpNoCase
(
valName
)
==
0
)
#endif
continue
;
// Print line for the current component value:
...
...
@@ -858,11 +872,15 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
if
(
IsFieldChecked
(
FOOTPRINT
)
)
fprintf
(
f
,
"%c%15s"
,
s_ExportSeparatorSymbol
,
#if defined(KICAD_GOST)
CONV_TO_UTF8
(
footName
)
);
#else
CONV_TO_UTF8
(
currCmp
->
GetField
(
FOOTPRINT
)
->
m_Text
)
);
#endif
#if defined(KICAD_GOST)
fprintf
(
f
,
"%c%20s"
,
s_ExportSeparatorSymbol
,
CONV_TO_UTF8
(
currCmp
->
GetField
(
DATASHEET
)
->
m_Text
)
);
CONV_TO_UTF8
(
datsName
)
);
#endif
// wrap the field in quotes, since it has commas in it.
...
...
eeschema/schframe.cpp
View file @
d247025d
...
...
@@ -465,6 +465,9 @@ wxString WinEDA_SchematicFrame::GetUniqueFilenameForCurrentSheet()
filename
+=
m_CurrentSheet
->
PathHumanReadable
();
filename
.
Replace
(
wxT
(
"/"
),
wxT
(
"-"
)
);
filename
.
RemoveLast
();
#if defined(KICAD_GOST)
filename
.
Remove
(
0
,
1
);
#endif
}
else
{
...
...
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