From 62042b620ef90b4a867f1a6e15c3901cd009a05e Mon Sep 17 00:00:00 2001 From: Tim Vandermeersch Date: Sun, 17 Apr 2011 10:41:02 +0000 Subject: [PATCH] SVG format: Use thicker lines --- src/depict/depict.cpp | 10 +++++----- src/depict/svgpainter.cpp | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/depict/depict.cpp b/src/depict/depict.cpp index 6d48ea30bd..4c6cf41715 100644 --- a/src/depict/depict.cpp +++ b/src/depict/depict.cpp @@ -520,7 +520,7 @@ namespace OpenBabel orthogonalLine.normalize(); orthogonalLine *= 0.5 * bondWidth; - double lines[7] = { 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70 }; + double lines[7] = { 0.20, 0.35, 0.50, 0.65 }; for (int k = 0; k < 7; ++k) { double w = lines[k]; @@ -538,9 +538,9 @@ namespace OpenBabel vector3 vb = end - begin; if (HasLabel(beginAtom)) - begin += 0.26 * vb; + begin += 0.33 * vb; if (HasLabel(endAtom)) - end -= 0.26 * vb; + end -= 0.33 * vb; if (order == 1) { painter->DrawLine(begin.x(), begin.y(), end.x(), end.y()); @@ -581,9 +581,9 @@ namespace OpenBabel vector3 vbb = end - begin; if (HasLabel(beginAtom)) - begin += 0.26 * vbb; + begin += 0.33 * vbb; if (HasLabel(endAtom)) - end -= 0.26 * vbb; + end -= 0.33 * vbb; painter->DrawLine(begin.x(), begin.y(), end.x(), end.y()); if (HasLabel(beginAtom)) diff --git a/src/depict/svgpainter.cpp b/src/depict/svgpainter.cpp index 2730dc33af..2ae99c0155 100644 --- a/src/depict/svgpainter.cpp +++ b/src/depict/svgpainter.cpp @@ -106,6 +106,8 @@ namespace OpenBabel << x2 << "\" y2=\"" << y2 << "\""; if(m_Pencolor!=m_OrigBondcolor) m_ofs << " stroke=" << MakeRGB(m_Pencolor); + m_ofs << " stroke-width=\"4\""; + m_ofs << " stroke-linecap=\"round\""; m_ofs << "/>\n"; m_ofs.precision(oldprec); } @@ -116,8 +118,10 @@ namespace OpenBabel std::vector >::const_iterator i; for (i = points.begin(); i != points.end(); ++i) m_ofs << i->first << ' ' << i->second << ' '; - - m_ofs << "\" />\n"; + m_ofs << "\""; + m_ofs << " stroke-width=\"4\""; + m_ofs << " stroke-linejoin=\"round\""; + m_ofs << "/>\n"; } void SVGPainter::DrawCircle(double x, double y, double r)