From f0e9e3b9d5865fd73f8f95288b6d817dd8c99615 Mon Sep 17 00:00:00 2001 From: qu1ck Date: Sun, 22 Jul 2018 17:45:15 -0700 Subject: [PATCH] Extend swig definitions to contain SHAPE_LINE_CHAIN and VECTOR2I --- common/swig/kicad.i | 6 ++++++ common/swig/math.i | 34 ++++++++++++++++++++++++++++++++++ include/math/vector2d.h | 2 -- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 common/swig/math.i diff --git a/common/swig/kicad.i b/common/swig/kicad.i index d41e1b1715..be76cec7f2 100644 --- a/common/swig/kicad.i +++ b/common/swig/kicad.i @@ -135,6 +135,12 @@ typedef long time_t; #include %include +// Contains VECTOR2I +%include math.i + +#include +%include + #include %include diff --git a/common/swig/math.i b/common/swig/math.i new file mode 100644 index 0000000000..a8b9ad389c --- /dev/null +++ b/common/swig/math.i @@ -0,0 +1,34 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * @file math.i + * @brief wrappers for math helper classes + */ + +%ignore VECTOR2::ECOORD_MAX; +%ignore VECTOR2::ECOORD_MIN; + +#include +%include +%template(VECTOR2I) VECTOR2; diff --git a/include/math/vector2d.h b/include/math/vector2d.h index d883b9750d..421d9a9082 100644 --- a/include/math/vector2d.h +++ b/include/math/vector2d.h @@ -249,8 +249,6 @@ public: /// Greater than operator bool operator>( const VECTOR2& aVector ) const; bool operator>=( const VECTOR2& aVector ) const; - - friend std::ostream & operator<< ( std::ostream & stream, const VECTOR2 &vector ); };