AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improvements to printing text in wxSVGFileDC.

Browse Source 
Support underlined and strike-through text.
Set the text length (see http://trac.wxwidgets.org/ticket/17271).
Preserve leading and trailing white-space.
Use wxS macro consistently.
Closes #17271.
This commit is contained in:
Maarten Bent 2016-03-15 21:58:02 +01:00
parent b4c9927892
commit b424445078
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/common/dcsvg.cpp
View File

@ -365,7 +365,7 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
{ {
//known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW
NewGraphicsIfNeeded(); NewGraphicsIfNeeded();
wxString s, sTmp; wxString s;
// Get extent of whole text. // Get extent of whole text.
wxCoord w, h, heightLine; wxCoord w, h, heightLine;
@ -376,11 +376,11 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
const double dx = heightLine * sin(rad); const double dx = heightLine * sin(rad);
const double dy = heightLine * cos(rad); const double dy = heightLine * cos(rad);
// wxT("upper left") and wxT("upper right") // wxS("upper left") and wxS("upper right")
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad))); CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
// wxT("bottom left") and wxT("bottom right") // wxS("bottom left") and wxS("bottom right")
CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad))); CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
CalcBoundingBox((wxCoord)(x + h*sin(rad) + w*cos(rad)), (wxCoord)(y + h*cos(rad) - w*sin(rad))); CalcBoundingBox((wxCoord)(x + h*sin(rad) + w*cos(rad)), (wxCoord)(y + h*cos(rad) - w*sin(rad)));
@ -388,12 +388,11 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
{ {
// draw background first // draw background first
// just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background
s += wxString::Format(wxS(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" "), x, y, w, h);
sTmp.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" "), x, y, w, h ); s += wxS("style=\"") + wxBrushString(m_textBackgroundColour);
s = sTmp + wxT("style=\"") + wxBrushString(m_textBackgroundColour); s += wxS("stroke-width:1; ") + wxPenString(m_textBackgroundColour);
s += wxT("stroke-width:1; ") + wxPenString(m_textBackgroundColour); s += wxString::Format(wxS("\" transform=\"rotate(%s %d %d)\"/>"), NumStr(-angle), x, y);
sTmp.Printf ( wxT("\" transform=\"rotate( %s %d %d ) \" />"), NumStr(-angle), x,y ); s += wxS("\n");
s += sTmp + wxT("\n");
write(s); write(s);
} }
@ -408,11 +407,13 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
int yy = y + wxRound(lineNum * dy) + (hh - desc) * cos(rad); int yy = y + wxRound(lineNum * dy) + (hh - desc) * cos(rad);
//now do the text itself //now do the text itself
s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "), xx, yy ); s += wxString::Format(wxS(" <text x=\"%d\" y=\"%d\" textLength=\"%d\" "), xx, yy, ww);
sTmp = m_font.GetFaceName(); wxString fontName(m_font.GetFaceName());
if (sTmp.Len() > 0) s += wxT("style=\"font-family:") + sTmp + wxT("; "); if (fontName.Len() > 0)
else s += wxT("style=\" "); s += wxS("style=\"font-family:") + fontName + wxS("; ");
else
s += wxS("style=\" ");
wxString fontweight; wxString fontweight;
switch (m_font.GetWeight()) switch (m_font.GetWeight())
@ -436,7 +437,7 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
wxASSERT_MSG(!fontweight.empty(), wxS("unknown font weight value")); wxASSERT_MSG(!fontweight.empty(), wxS("unknown font weight value"));
s += wxT("font-weight:") + fontweight + wxT("; "); s += wxS("font-weight:") + fontweight + wxS("; ");
wxString fontstyle; wxString fontstyle;
switch (m_font.GetStyle()) switch (m_font.GetStyle())
@ -460,18 +461,26 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
wxASSERT_MSG(!fontstyle.empty(), wxS("unknown font style value")); wxASSERT_MSG(!fontstyle.empty(), wxS("unknown font style value"));
s += wxT("font-style:") + fontstyle + wxT("; "); s += wxS("font-style:") + fontstyle + wxS("; ");
sTmp.Printf(wxT("font-size:%dpt; "), m_font.GetPointSize()); wxString textDecoration;
s += sTmp; if (m_font.GetUnderlined())
textDecoration += wxS(" underline");
if (m_font.GetStrikethrough())
textDecoration += wxS(" line-through");
if (textDecoration.IsEmpty())
textDecoration = wxS(" none");
s += wxS("text-decoration:") + textDecoration + wxS("; ");
s += wxString::Format(wxS("font-size:%dpt; "), m_font.GetPointSize());
//text will be solid, unless alpha value isn't opaque in the foreground colour //text will be solid, unless alpha value isn't opaque in the foreground colour
s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour); s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour);
sTmp.Printf ( wxT("stroke-width:0;\" transform=\"rotate( %s %d %d ) \" >"), NumStr(-angle), xx, yy ); s += wxString::Format(wxS("stroke-width:0;\" transform=\"rotate(%s %d %d)\""), NumStr(-angle), xx, yy);
s += sTmp + wxMarkupParser::Quote(lines[lineNum]) + wxT("</text> ") + wxT("\n"); s += wxS(" xml:space=\"preserve\">");
if (m_OK) s += wxMarkupParser::Quote(lines[lineNum]) + wxS("</text>\n");
{
write(s); write(s);
}
} }
} }