haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug #1183802 : incorrect sheet Id (company name displayed instead of Id)

This commit is contained in:
jean-pierre charras 2013-05-24 16:06:58 +02:00
parent 7080828fe2
commit 8bafc54cdc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/title_block_shapes.cpp
View File

@ -80,7 +80,7 @@
* %% = replaced by % * %% = replaced by %
* %K = Kicad version * %K = Kicad version
* %Z = paper format name (A4, USLetter) * %Z = paper format name (A4, USLetter)
* %N = company name * %Y = company name
* %D = date * %D = date
* %R = revision * %R = revision
* %S = sheet number * %S = sheet number
@ -223,7 +223,7 @@ Ki_WorkSheetData WS_Company =
&WS_FullSheetName, &WS_FullSheetName,
BLOCK_COMMENT_X,BLOCK_COMPANY_Y, BLOCK_COMMENT_X,BLOCK_COMPANY_Y,
0, 0, 0, 0,
wxT("%N"), // Company name wxT("%Y"), // Company name
USE_BOLD | SET_UPPER_LIMIT | USE_TEXT_COLOR USE_BOLD | SET_UPPER_LIMIT | USE_TEXT_COLOR
}; };
@ -524,14 +524,14 @@ wxString BuildFullText( const wxString& aTextbase,
* %% = replaced by % * %% = replaced by %
* %K = Kicad version * %K = Kicad version
* %Z = paper format name (A4, USLetter) * %Z = paper format name (A4, USLetter)
* %N = company name * %Y = company name
* %D = date * %D = date
* %R = revision * %R = revision
* %S = sheet number * %S = sheet number
* %N = number of sheets * %N = number of sheets
* %Cx = comment (x = 0 to 9 to identify the comment) * %Cx = comment (x = 0 to 9 to identify the comment)
* %F = filename * %F = filename
* %P = sheet path or sheet full name * %P = sheet path (sheet full name)
* %T = title * %T = title
*/ */
@ -546,7 +546,7 @@ wxString BuildFullText( const wxString& aTextbase,
if( ii >= aTextbase.Len() ) if( ii >= aTextbase.Len() )
break; break;
wxChar format = aTextbase[ii++]; wxChar format = aTextbase[ii];
switch( format ) switch( format )
{ {
case '%': case '%':
@ -570,11 +570,14 @@ wxString BuildFullText( const wxString& aTextbase,
msg += aPaperFormat; msg += aPaperFormat;
break; break;
case 'S': case 'S':
msg << aSheetNumber; msg << aSheetNumber;
break; break;
case 'N':
msg << aSheetCount;
break;
case 'F': case 'F':
{ {
wxFileName fn( aFileName ); wxFileName fn( aFileName );
@ -586,7 +589,7 @@ wxString BuildFullText( const wxString& aTextbase,
msg += aSheetPathHumanReadable; msg += aSheetPathHumanReadable;
break; break;
case 'N': case 'Y':
msg = aTitleBlock.GetCompany(); msg = aTitleBlock.GetCompany();
break; break;
@ -595,7 +598,7 @@ wxString BuildFullText( const wxString& aTextbase,
break; break;
case 'C': case 'C':
format = aTextbase[ii++]; format = aTextbase[++ii];
switch( format ) switch( format )
{ {
case '1': case '1':