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

Gerber plots: Ensure reserved chars are not used in Gerber field strings. 

In gerber fields, reserved chars (,*%) must be replaced, because they are separators.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18275
This commit is contained in:
jean-pierre charras 2024-06-25 10:49:41 +02:00
parent 1ddac57748
commit 0a5784fc9e
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcbnew/pcbplot.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2024 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -273,6 +273,17 @@ static wxString& makeStringCompatX1( wxString& aText, bool aUseX1CompatibilityMo
} }
// A helper function to replace reserved chars (separators in gerber fields)
// in a gerber string field.
// reserved chars are replaced by _ (for ,) or an escaped sequence (for * and %)
static void replaceReservedCharsField( wxString& aMsg )
{
aMsg.Replace( wxT( "," ), wxT( "_" ) ); // can be replaced by \\u002C
aMsg.Replace( wxT( "*" ), wxT( "\\u002A" ) );
aMsg.Replace( wxT( "%" ), wxT( "\\u0025" ) );
}
void AddGerberX2Header( PLOTTER* aPlotter, const BOARD* aBoard, bool aUseX1CompatibilityMode ) void AddGerberX2Header( PLOTTER* aPlotter, const BOARD* aBoard, bool aUseX1CompatibilityMode )
{ {
wxString text; wxString text;
@ -303,13 +314,13 @@ void AddGerberX2Header( PLOTTER* aPlotter, const BOARD* aBoard, bool aUseX1Compa
wxString guid = GbrMakeProjectGUIDfromString( msg ); wxString guid = GbrMakeProjectGUIDfromString( msg );
// build the <project id> string: this is the board short filename (without ext) // build the <project id> string: this is the board short filename (without ext)
// and all non ASCII chars and comma are replaced by '_' // and all non ASCII chars and reserved chars (, * % ) are replaced by '_'
msg = fn.GetName(); msg = fn.GetName();
msg.Replace( wxT( "," ), wxT( "_" ) ); replaceReservedCharsField( msg );
// build the <revision id> string. All non ASCII chars and comma are replaced by '_' // build the <revision id> string. All non ASCII chars and reserved chars are replaced by '_'
wxString rev = ExpandTextVars( aBoard->GetTitleBlock().GetRevision(), aBoard->GetProject() ); wxString rev = ExpandTextVars( aBoard->GetTitleBlock().GetRevision(), aBoard->GetProject() );
rev.Replace( wxT( "," ), wxT( "_" ) ); replaceReservedCharsField( rev );
if( rev.IsEmpty() ) if( rev.IsEmpty() )
rev = wxT( "rev?" ); rev = wxT( "rev?" );