mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-03 21:44:30 +08:00
* First working version with DrawText classes, original functionality only. No font scaling. * Added font scaling. * Added atom colours. * First stab at freetype text drawing. A stash prior to major surgery. * Freetype seems to be working. On to whack-a-mole. * Added class flag to atom labels and annotations. * Another intermim commit whilst re-factoring all string drawing code from MolDraw2D. * Fixed scaling and implemented max font size. * Fixed bugs in non-FT Cairo and SVG drawing. * More re-factoring of drawStrings - now creates StringRwct for each char in all strings. * More re-factoring of string drawing - all mentions removed from MolDraw2D, I think.. * Working native Cairo, simple tests. * Working native Cairo, simple tests. * Padding roumd rectangles. * Working FT Cairo, FT SVG, native SVG, simple tests. * Two line labels mostly sorted. Native SVG wrong. * Two line SVG labels sorted. * Two line SVG labels sorted. * Tidied out debug writes. * Tweaked merge. * Annotations working, radicals now failing. * Fixed radicals crash. * All tests passed for freetype drawings. Grid drawings not right. * Fixed bug in grid drawings. * Better font size. * Fixed legends in grids. * Fixed rect intersection bug. * Tidied up font sizes. * moldraw2DTest1 all passing. * All catch tests pass. * Few rixes, and reactions look ok. * Added minimum font size. * Fixed radical drawing when max/min font size hit. * Interim cmmmit, most test1.cpp working. * Fixed uninitialised min_font_size_ in DrawText. Took out use of MolDraw2D::setFontSize() which probably needs to go back in at some point. * More test1.cpp passing. * test1.cpp all pass, freetype and non-freetype * Fixed superscripts hitting min font size in test860. Made superscripts and subscripts same size. * testc.pp all pass. * Fixed bug in freetype text. All testt1.cpp pass. * All tests passed.d * Added option for different font. * Added option for explicit terminal methyls. * Added option to explicitly not use Freetype in drawers. Used same in catch_tests.cpp. * Got sense of NO_FREETYPE wrong in catch_tests.cpp. D'oh! * Fixed Python draw tests. * Added new options to JSON interpreter. * Fixed scale of text in contoured plots. * Added optional molecule to grid drawer to help set scale. * Fixed Python wrappers for drawing 2D grids . * Added Greg's CMakeLists.txt * Moved fonts out of code tree. Improved handling of font files not found, including logging to rdWarningLog. * Interim commit. * Tidied up some namespace std issues. * Reverted to previous version. Took out 'using namespace std;' * update expected java results * Added multi-line legends. Also carves out a reserved bit for the legend, and sets the font size so the legend will fit. * enable annotations on windows with freetype * Removed stray font file. * Removed stray font file. * Re-instanted fontSize() and setFontSize(), though with change of units. * Added RDK_BUILD_FREETYPE_SUPPORT to cmake. * re-expose the fontsize controls to python. document API change w.r.t. font size * Update ReleaseNotes.md Co-authored-by: David Cosgrove <david@cozchemix.co.uk> Co-authored-by: greg landrum <greg.landrum@gmail.com>
130 lines
4.3 KiB
C++
130 lines
4.3 KiB
C++
//
|
|
// @@ All Rights Reserved @@
|
|
// This file is part of the RDKit.
|
|
// The contents are covered by the terms of the BSD license
|
|
// which is included in the file license.txt, found at the root
|
|
// of the RDKit source tree.
|
|
//
|
|
// Original author: David Cosgrove (CozChemIx) on 29/04/2020.
|
|
//
|
|
// A concrete class derived from DrawText that uses SVG
|
|
// to draw text onto a picture.
|
|
|
|
#include <sstream>
|
|
#include <boost/algorithm/string.hpp>
|
|
|
|
#include <GraphMol/MolDraw2D/DrawTextSVG.h>
|
|
#include <GraphMol/MolDraw2D/MolDraw2DSVG.h>
|
|
#include <GraphMol/MolDraw2D/MolDraw2DDetails.h>
|
|
|
|
namespace RDKit {
|
|
|
|
std::string DrawColourToSVG(const RDKit::DrawColour &col);
|
|
|
|
// ****************************************************************************
|
|
DrawTextSVG::DrawTextSVG(double max_fnt_sz, double min_fnt_sz,
|
|
std::ostream &oss, std::string &d_act_class) :
|
|
DrawText(max_fnt_sz, min_fnt_sz), oss_(oss), d_active_class_(d_act_class) {
|
|
}
|
|
|
|
namespace {
|
|
void escape_xhtml(std::string &data) {
|
|
boost::algorithm::replace_all(data, "&", "&");
|
|
boost::algorithm::replace_all(data, "\"", """);
|
|
boost::algorithm::replace_all(data, "\'", "'");
|
|
boost::algorithm::replace_all(data, "<", "<");
|
|
boost::algorithm::replace_all(data, ">", ">");
|
|
}
|
|
} // namespace
|
|
|
|
// ****************************************************************************
|
|
// draw the char, with the bottom left hand corner at cds
|
|
void DrawTextSVG::drawChar(char c, const Point2D &cds) {
|
|
|
|
unsigned int fontSz = fontSize();
|
|
std::string col = DrawColourToSVG(colour());
|
|
|
|
oss_ << "<text";
|
|
oss_ << " x='" << cds.x;
|
|
oss_ << "' y='" << cds.y << "'";
|
|
if (!d_active_class_.empty()) {
|
|
oss_ << " class='" << d_active_class_ << "'";
|
|
}
|
|
std::string cs;
|
|
cs += c;
|
|
escape_xhtml(cs);
|
|
oss_ << " style='font-size:" << fontSz
|
|
<< "px;font-style:normal;font-weight:normal;fill-opacity:1;stroke:none;"
|
|
"font-family:sans-serif;text-anchor:start;"
|
|
<< "fill:" << col << "'";
|
|
oss_ << " >";
|
|
oss_ << cs;
|
|
oss_ << "</text>" << std::endl;
|
|
|
|
}
|
|
|
|
// ****************************************************************************
|
|
void DrawTextSVG::getStringRects(const std::string &text,
|
|
std::vector<std::shared_ptr<StringRect> > &rects,
|
|
std::vector<TextDrawType> &draw_modes,
|
|
std::vector<char> &draw_chars) const {
|
|
|
|
double running_x = 0.0;
|
|
double act_font_size = fontSize();
|
|
double char_height;
|
|
double max_width = 0.0;
|
|
TextDrawType draw_mode = TextDrawType::TextDrawNormal;
|
|
for (size_t i = 0; i < text.length(); ++i) {
|
|
// setStringDrawMode moves i along to the end of any <sub> or <sup>
|
|
// markup
|
|
if ('<' == text[i] && setStringDrawMode(text, draw_mode, i)) {
|
|
continue;
|
|
}
|
|
draw_modes.push_back(draw_mode);
|
|
draw_chars.push_back(text[i]);
|
|
|
|
max_width = std::max(max_width,
|
|
static_cast<double>(MolDraw2D_detail::char_widths[(int)text[i]]));
|
|
}
|
|
|
|
for (size_t i = 0; i < draw_chars.size(); ++i) {
|
|
double char_width =
|
|
0.6 * act_font_size *
|
|
static_cast<double>(MolDraw2D_detail::char_widths[(int)draw_chars[i]]) / max_width;
|
|
// Absent a proper set of font metrics (we don't know what font we'll be
|
|
// using, for starters) this is something of an empirical bodge.
|
|
if(draw_chars[i] == '+') {
|
|
char_height = 0.6 * act_font_size;
|
|
} else if(draw_chars[i] == '-') {
|
|
char_height = 0.4 * act_font_size;
|
|
} else {
|
|
char_height = 0.8 * act_font_size;
|
|
}
|
|
double cscale = selectScaleFactor(draw_chars[i], draw_modes[i]);
|
|
char_height *= cscale;
|
|
char_width *= cscale;
|
|
Point2D offset(char_width / 2, char_height / 2);
|
|
if(draw_chars[i] == '+' || draw_chars[i] == '-') {
|
|
offset.y /= 2.0;
|
|
}
|
|
Point2D g_centre(char_width / 2, char_height / 2);
|
|
rects.push_back(std::shared_ptr<StringRect>(new StringRect(offset, g_centre, char_width, char_height)));
|
|
rects.back()->trans_.x += running_x;
|
|
// empirical spacing.
|
|
if(draw_modes[i] != TextDrawType::TextDrawNormal) {
|
|
running_x += char_width * 1.05;
|
|
} else {
|
|
running_x += char_width * 1.15;
|
|
}
|
|
}
|
|
for(auto r: rects) {
|
|
r->g_centre_.y = act_font_size - r->g_centre_.y;
|
|
r->offset_.y = act_font_size / 2.0;
|
|
}
|
|
|
|
adjustStringRectsForSuperSubScript(draw_modes, rects);
|
|
|
|
}
|
|
|
|
} // namespace RDKit
|