mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-04 21:54:27 +08:00
* MolDraw2D refactoring - rename setupMoleculeDraw->initMoleculeDraw - track whether or not initDrawing() has been called - centralize calls to initDrawing() and clearDrawing() into initMoleculeDraw() - update svg hashes in tests * update some expected test results * support changing font scale and default scale add reaction test * does not work... this is hard * all tests pass * do something about legends * docs * more tests * more docs * cleanup * going around in circles... hopefully converging * cleanup * Single bond skeleton works. * Simple bond drawing seems to be working. * Initial addition of atom symbols. * Stash of not-quite-working atom symbols prior to major surgery. * Atom symbols seem to be working. Major surgery not required, just inverted Y coords at the outset. * Add classes to atom labels. * Renamed AtomLabel AtomSymbol. * Add highlights. * Fix bug from PR4839. * Molecule note. * Added atom notes. * Added bond notes. * Extract radicals. * Annotation via new DrawAnnotation class. * Add brackets. * Add linknodes. * Add close contacts. * Add attachment points. Fix wavy lines. * Draw molecules in grid. * Tidy. * Fix radicals when font has hit maxFontSize. Make getDrawCoords work. * Draw primitives take atom or draw coords. * Fix legends. * More fixing for tests. DrawMol::setScale now takes font scale as well. * tidy debug writes * Variable fraction of panel for legend. * Better legend positioning. * Fix sub- and super-script spacing. Added spaces to Freetype strings. * Basic reaction drawing. * Reaction highlighting. * Minor tweak to reacctions. * Tweaked reaction DrawMol widths. * Fix atomTags. * Fix catch tests except contours. * Contouring working in catch_tests.cpp. * Fix catch tests. * AtomSymbol and DrawAnnotation into MolDraw2D_detail. * DrawMol and DrawShape into MolDraw2D_detail. * DrawText inot MolDraw2D_detail. * Machete out. * DrawText goes private. * Move some stuff about, such as StringRect to its own header. * Python wrapper compiles (but crashes when Draw imported). * More tidying. Python DrawArrow failing. * Linux changes. * Fixed error in DrawShapeArrow spotted by valgrind. Fixed some warnings from gcc. * Maybe fixed DrawArrow. * Added basic argparse interface. * Added newlines. * Changes in response to review. Non-const args in move constructors and operator=. Added missing classes to MolDraw2D_detail. Deleted move operator= where it had been forgotten. Fixed copyright dates. * Deleted all default c'tors in derived classes. * Changes in response to review: Wedge widths now a proportion of mean bond length in draw coords.. Add padding below legend when positioning it. * Fix tests. * Fix the private/protected mess of the new classes. * Moved doesLineIntersect etc. * Reinstate original alignString for non-FT drawings. * More faffing about with reaction layouts. * Fix font sizes in testGitHub3391. * Fix atom notes fitting inside fat wedges. * Fix molecule annotation font size. * More fixes of rectangle/triangle collision detection. * Test for highlight linewidth multiplier. * Use push_back not emplace_back. * Attempt at better Freetype char spacing. * Option to turn off TEST_ASSERT. Currently off. * Fixed embarrassing maths to do with wedge fatness. * More tidying post-review. * Document highlight_linewidth_multipliers. * Expose baseFontSize to Python. * Changes in response to review. * Allow DrawMolecules molecules to be drawn to different scales. * Fix bond sneaking between C:8 in, for example, reactions. * Fix bad re-factoring. * Fix globbing. * Changes in response to review. * Add invariant check. * Add draw option to fix font size. * suggested changes * Update catch test results. * Fix expected freetype results. * Fix non-freetype drawers. * Fin non-freetype test results. * get the Qt drawer working too * Fix disappearing reaction highlights. * Changes as result of review. * Fixed non-FreeType hash codes for reaction SVGs. Extra comment in catch_tests. * reactant highlighting was clearning properties * Fix for failing contour python test. * fix a non-freetype problem * swig wrappers working * Bump timeouts in test. Co-authored-by: greg landrum <greg.landrum@gmail.com> Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
119 lines
5.0 KiB
OpenEdge ABL
119 lines
5.0 KiB
OpenEdge ABL
/*
|
|
*
|
|
* Copyright (c) 2015, Novartis Institutes for BioMedical Research Inc.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials provided
|
|
* with the distribution.
|
|
* * Neither the name of Novartis Institutes for BioMedical Research Inc.
|
|
* nor the names of its contributors may be used to endorse or promote
|
|
* products derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
%include "boost_tuple.i"
|
|
%include "std_vector.i"
|
|
%include "std_map.i"
|
|
%include "std_pair.i"
|
|
%include "boost_tuple.i"
|
|
%{
|
|
#include <GraphMol/RDKitBase.h>
|
|
#include <GraphMol/MolDraw2D/MolDraw2DHelpers.h>
|
|
#include <GraphMol/MolDraw2D/MolDraw2D.h>
|
|
#include <GraphMol/MolDraw2D/MolDraw2DSVG.h>
|
|
#include <GraphMol/MolDraw2D/MolDraw2DUtils.h>
|
|
#include <map>
|
|
#include <vector>
|
|
#include <utility>
|
|
%}
|
|
|
|
%template(Int_String_Map) std::map< int, std::string >;
|
|
|
|
#ifdef SWIGJAVA
|
|
%template(ColourPalette) std::map< int, RDKit::DrawColour >;
|
|
#endif
|
|
|
|
%template(Int_Double_Map) std::map< int, double >;
|
|
%template(Float_Pair) std::pair<float,float>;
|
|
%template(Float_Pair_Vect) std::vector< std::pair<float,float> >;
|
|
%template(ROMol_Ptr_Vect) std::vector<RDKit::ROMol*>;
|
|
%template(Point2D_Vect) std::vector<RDGeom::Point2D *>;
|
|
|
|
%ignore RDKit::MolDraw2DSVG::MolDraw2DSVG(int,int,std::ostream &);
|
|
%ignore RDKit::MolDraw2DUtils::contourAndDrawGaussians(
|
|
MolDraw2D &, const std::vector<Point2D> &,
|
|
const std::vector<double> &, const std::vector<double> &,
|
|
size_t, std::vector<double> &,
|
|
const ContourParams &);
|
|
%ignore RDKit::MolDraw2DUtils::contourAndDrawGaussians(
|
|
MolDraw2D &, const std::vector<Point2D> &,
|
|
const std::vector<double> &, const std::vector<double> &,
|
|
size_t, ContourParams &);
|
|
%ignore RDKit::MolDraw2DUtils::contourAndDrawGaussians;
|
|
%ignore RDKit::MolDraw2DUtils::contourAndDrawGrid;
|
|
|
|
|
|
%include <GraphMol/MolDraw2D/MolDraw2DHelpers.h>
|
|
%include <GraphMol/MolDraw2D/MolDraw2D.h>
|
|
%include <GraphMol/MolDraw2D/MolDraw2DSVG.h>
|
|
%include <GraphMol/MolDraw2D/MolDraw2DUtils.h>
|
|
|
|
%inline %{
|
|
void ContourAndDrawGaussians(
|
|
RDKit::MolDraw2D &drawer, const std::vector<RDGeom::Point2D *> &p_locs,
|
|
const std::vector<double> &heights, const std::vector<double> &widths,
|
|
size_t nContours, std::vector<double> &levels,
|
|
const RDKit::MolDraw2DUtils::ContourParams &ps = RDKit::MolDraw2DUtils::ContourParams()){
|
|
std::vector<Point2D> locs;
|
|
locs.reserve(p_locs.size());
|
|
for(const auto *p : p_locs){
|
|
locs.push_back(*p);
|
|
}
|
|
contourAndDrawGaussians(drawer,locs,heights,widths,nContours,levels,ps);
|
|
};
|
|
void ContourAndDrawGaussians(
|
|
RDKit::MolDraw2D &drawer, const std::vector<RDGeom::Point2D *> &p_locs,
|
|
const std::vector<double> &heights, const std::vector<double> &widths,
|
|
size_t nContours = 10,
|
|
const RDKit::MolDraw2DUtils::ContourParams &ps = RDKit::MolDraw2DUtils::ContourParams()){
|
|
std::vector<Point2D> locs;
|
|
locs.reserve(p_locs.size());
|
|
for(const auto *p : p_locs){
|
|
locs.push_back(*p);
|
|
}
|
|
contourAndDrawGaussians(drawer,locs,heights,widths,nContours,ps);
|
|
};
|
|
void ContourAndDrawGrid(
|
|
RDKit::MolDraw2D &drawer, const std::vector<double> &p_grid,
|
|
const std::vector<double> &xcoords, const std::vector<double> &ycoords,
|
|
size_t nContours, std::vector<double> &levels,
|
|
const RDKit::MolDraw2DUtils::ContourParams &ps = RDKit::MolDraw2DUtils::ContourParams()){
|
|
contourAndDrawGrid(drawer,p_grid.data(),xcoords,ycoords,nContours,levels,ps);
|
|
};
|
|
void ContourAndDrawGrid(
|
|
RDKit::MolDraw2D &drawer, const std::vector<double> &p_grid,
|
|
const std::vector<double> &xcoords, const std::vector<double> &ycoords,
|
|
size_t nContours=10,
|
|
const RDKit::MolDraw2DUtils::ContourParams &ps = RDKit::MolDraw2DUtils::ContourParams()){
|
|
contourAndDrawGrid(drawer,p_grid.data(),xcoords,ycoords,nContours,ps);
|
|
};
|
|
%}
|