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
8bafc54c
Commit
8bafc54c
authored
May 24, 2013
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug #1183802 : incorrect sheet Id (company name displayed instead of Id)
parent
7080828f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
title_block_shapes.cpp
common/title_block_shapes.cpp
+11
-8
No files found.
common/title_block_shapes.cpp
View file @
8bafc54c
...
...
@@ -80,7 +80,7 @@
* %% = replaced by %
* %K = Kicad version
* %Z = paper format name (A4, USLetter)
* %
N
= company name
* %
Y
= company name
* %D = date
* %R = revision
* %S = sheet number
...
...
@@ -223,7 +223,7 @@ Ki_WorkSheetData WS_Company =
&
WS_FullSheetName
,
BLOCK_COMMENT_X
,
BLOCK_COMPANY_Y
,
0
,
0
,
wxT
(
"%
N
"
),
// Company name
wxT
(
"%
Y
"
),
// Company name
USE_BOLD
|
SET_UPPER_LIMIT
|
USE_TEXT_COLOR
};
...
...
@@ -524,14 +524,14 @@ wxString BuildFullText( const wxString& aTextbase,
* %% = replaced by %
* %K = Kicad version
* %Z = paper format name (A4, USLetter)
* %
N
= company name
* %
Y
= company name
* %D = date
* %R = revision
* %S = sheet number
* %N = number of sheets
* %Cx = comment (x = 0 to 9 to identify the comment)
* %F = filename
* %P = sheet path
or sheet full name
* %P = sheet path
(sheet full name)
* %T = title
*/
...
...
@@ -546,7 +546,7 @@ wxString BuildFullText( const wxString& aTextbase,
if
(
ii
>=
aTextbase
.
Len
()
)
break
;
wxChar
format
=
aTextbase
[
ii
++
];
wxChar
format
=
aTextbase
[
ii
];
switch
(
format
)
{
case
'%'
:
...
...
@@ -570,11 +570,14 @@ wxString BuildFullText( const wxString& aTextbase,
msg
+=
aPaperFormat
;
break
;
case
'S'
:
msg
<<
aSheetNumber
;
break
;
case
'N'
:
msg
<<
aSheetCount
;
break
;
case
'F'
:
{
wxFileName
fn
(
aFileName
);
...
...
@@ -586,7 +589,7 @@ wxString BuildFullText( const wxString& aTextbase,
msg
+=
aSheetPathHumanReadable
;
break
;
case
'
N
'
:
case
'
Y
'
:
msg
=
aTitleBlock
.
GetCompany
();
break
;
...
...
@@ -595,7 +598,7 @@ wxString BuildFullText( const wxString& aTextbase,
break
;
case
'C'
:
format
=
aTextbase
[
ii
++
];
format
=
aTextbase
[
++
ii
];
switch
(
format
)
{
case
'1'
:
...
...
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