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

Place hidden PDF text behind words better 

Rather than hiding a single line at once, we align each word in the
string with the approximate location of the output word.  This allows
better selecting text in the output pdf

Fixes https://gitlab.com/kicad/code/kicad/issues/12159
This commit is contained in:
Seth Hillbrand 2023-01-19 15:25:07 -08:00
parent 5a2f4c445b
commit da1707d5ba
1 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
common/plotters/PDF_plotter.cpp
View File

@ -35,6 +35,7 @@
#include <advanced_config.h> #include <advanced_config.h>
#include <eda_text.h> // for IsGotoPageHref #include <eda_text.h> // for IsGotoPageHref
#include <font/font.h>
#include <ignore.h> #include <ignore.h>
#include <macros.h> #include <macros.h>
#include <trigo.h> #include <trigo.h>
@ -1367,6 +1368,7 @@ void PDF_PLOTTER::Text( const VECTOR2I& aPos,
// be pixel-accurate, but it doesn't matter for searching. // be pixel-accurate, but it doesn't matter for searching.
int render_mode = 3; // invisible int render_mode = 3; // invisible
VECTOR2I pos( aPos );
const char *fontname = aItalic ? ( aBold ? "/KicadFontBI" : "/KicadFontI" ) const char *fontname = aItalic ? ( aBold ? "/KicadFontBI" : "/KicadFontI" )
: ( aBold ? "/KicadFontB" : "/KicadFont" ); : ( aBold ? "/KicadFontB" : "/KicadFont" );
@ -1381,20 +1383,56 @@ void PDF_PLOTTER::Text( const VECTOR2I& aPos,
SetColor( aColor ); SetColor( aColor );
SetCurrentLineWidth( aWidth, aData ); SetCurrentLineWidth( aWidth, aData );
/* We use the full CTM instead of the text matrix because the same wxStringTokenizer str_tok( aText, " ", wxTOKEN_RET_DELIMS );
coordinate system will be used for the overlining. Also the %f
for the trig part of the matrix to avoid %g going in exponential
format (which is not supported) */
fprintf( m_workFile, "q %f %f %f %f %g %g cm BT %s %g Tf %d Tr %g Tz ",
ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f,
fontname, heightFactor, render_mode, wideningFactor * 100 );
// The text must be escaped correctly VECTOR2I full_box( aFont->StringBoundaryLimits( aText, aSize, aWidth, aBold, aItalic ) );
std:: string txt_pdf = encodeStringForPlotter( aText ); VECTOR2I box_x( full_box.x, 0 );
fprintf( m_workFile, "%s Tj ET\n", txt_pdf.c_str() ); VECTOR2I box_y( 0, full_box.y );
// Restore the CTM RotatePoint( box_x, aOrient );
fputs( "Q\n", m_workFile ); RotatePoint( box_y, aOrient );
if( aH_justify == GR_TEXT_H_ALIGN_CENTER )
pos -= box_x / 2;
else if( aH_justify == GR_TEXT_H_ALIGN_RIGHT )
pos -= box_x;
if( aV_justify == GR_TEXT_V_ALIGN_CENTER )
pos += box_y / 2;
else if( aV_justify == GR_TEXT_V_ALIGN_TOP )
pos += box_y;
while( str_tok.HasMoreTokens() )
{
wxString word = str_tok.GetNextToken();
computeTextParameters( pos, word, aOrient, aSize, m_plotMirror, GR_TEXT_H_ALIGN_LEFT,
GR_TEXT_V_ALIGN_BOTTOM, aWidth, aItalic, aBold, &wideningFactor, &ctm_a,
&ctm_b, &ctm_c, &ctm_d, &ctm_e, &ctm_f, &heightFactor );
// Extract the changed width and rotate by the orientation to get the offset for the
// next word
VECTOR2I bbox( aFont->StringBoundaryLimits( word, aSize, aWidth, aBold, aItalic ).x, 0 );
RotatePoint( bbox, aOrient );
pos += bbox;
// Don't try to output a blank string
if( word.Trim( false ).Trim( true ).empty() )
continue;
/* We use the full CTM instead of the text matrix because the same
coordinate system will be used for the overlining. Also the %f
for the trig part of the matrix to avoid %g going in exponential
format (which is not supported) */
fprintf( m_workFile, "q %f %f %f %f %g %g cm BT %s %g Tf %d Tr %g Tz ",
ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f,
fontname, heightFactor, render_mode, wideningFactor * 100 );
std::string txt_pdf = encodeStringForPlotter( word );
fprintf( m_workFile, "%s Tj ET\n", txt_pdf.c_str() );
// Restore the CTM
fputs( "Q\n", m_workFile );
}
// Plot the stroked text (if requested) // Plot the stroked text (if requested)
PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify, aWidth, aItalic, PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify, aWidth, aItalic,