diff --git a/Code/JavaWrappers/Conformer.i b/Code/JavaWrappers/Conformer.i index 82f20ae89..cbe25676c 100644 --- a/Code/JavaWrappers/Conformer.i +++ b/Code/JavaWrappers/Conformer.i @@ -37,6 +37,11 @@ #include %} +// no point in wrapping something that can't be accessed +// getAtomPos() and setAtomPos() are convenient accessors +%ignore RDKit::Conformer::getPositions(); +%ignore RDKit::Conformer::getPositions() const; + %typemap(javacode) RDKit::Conformer %{ public void setSwigCMemOwn(boolean cMemoryOwn) { swigCMemOwn = cMemoryOwn; diff --git a/Code/JavaWrappers/MolDraw2D.i b/Code/JavaWrappers/MolDraw2D.i index 67208dd81..9fe85baca 100644 --- a/Code/JavaWrappers/MolDraw2D.i +++ b/Code/JavaWrappers/MolDraw2D.i @@ -53,13 +53,15 @@ %template(Int_String_Map) std::map< int, std::string >; %template(ColourPalette) std::map< int, RDKit::DrawColour >; +%template(Colour_Vect) std::vector< RDKit::DrawColour >; +%template(MultipleColourPalette) std::map< int, std::vector< RDKit::DrawColour > >; %template(Int_Double_Map) std::map< int, double >; %template(Float_Pair) std::pair; %template(Float_Pair_Vect) std::vector< std::pair >; %template(ROMol_Ptr_Vect) std::vector; -%template(Point2D_Vect) std::vector; %template(ColourPalette_Vect) std::vector< std::map< int, RDKit::DrawColour > >; +%template(Int_Double_Map_Vect) std::vector< std::map< int, double > >; %ignore RDKit::MolDraw2DSVG::MolDraw2DSVG(int,int,std::ostream &); %ignore RDKit::MolDraw2DUtils::contourAndDrawGaussians(