From dfbea1de96d1b6de47eda4606200f0fc7494685f Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 30 Dec 2011 11:45:28 +0000 Subject: [PATCH] + move vec_traits into its own module git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5363 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Mod/Drawing/App/FeatureProjection.cpp | 1 + src/Mod/Drawing/Gui/TaskOrthoViews.cpp | 1 + src/Mod/Part/App/CMakeLists.txt | 1 + src/Mod/Part/App/Makefile.am | 1 + src/Mod/Part/App/Tools.h | 89 ++++++++++++++++++++ src/Mod/Part/App/TopoShape.cpp | 1 + src/Mod/Part/App/TopoShape.h | 43 +--------- src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp | 3 +- src/Mod/Part/App/TopoShapeCompoundPyImp.cpp | 3 +- src/Mod/Part/App/TopoShapeSolidPyImp.cpp | 3 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 16 +--- 11 files changed, 103 insertions(+), 59 deletions(-) create mode 100644 src/Mod/Part/App/Tools.h diff --git a/src/Mod/Drawing/App/FeatureProjection.cpp b/src/Mod/Drawing/App/FeatureProjection.cpp index a0905952c..50a8e088b 100644 --- a/src/Mod/Drawing/App/FeatureProjection.cpp +++ b/src/Mod/Drawing/App/FeatureProjection.cpp @@ -26,6 +26,7 @@ #ifndef _PreComp_ # include # include +# include # include #endif diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp index 4cb50e288..055244a6a 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp @@ -39,6 +39,7 @@ #include #include #include +#include using namespace Gui; using namespace DrawingGui; diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 39d4b18ab..40c81da59 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -230,6 +230,7 @@ SET(Part_SRCS edgecluster.h modelRefine.cpp modelRefine.h + Tools.h ) SET(Part_Scripts diff --git a/src/Mod/Part/App/Makefile.am b/src/Mod/Part/App/Makefile.am index 5a9a45605..91c711564 100644 --- a/src/Mod/Part/App/Makefile.am +++ b/src/Mod/Part/App/Makefile.am @@ -189,6 +189,7 @@ include_HEADERS=\ ProgressIndicator.h \ PropertyGeometryList.h \ PropertyTopoShape.h \ + Tools.h \ TopoShape.h diff --git a/src/Mod/Part/App/Tools.h b/src/Mod/Part/App/Tools.h new file mode 100644 index 000000000..b48ab6ab6 --- /dev/null +++ b/src/Mod/Part/App/Tools.h @@ -0,0 +1,89 @@ +/*************************************************************************** + * Copyright (c) 2011 Werner Mayer * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#ifndef PART_TOOLS_H +#define PART_TOOLS_H + +#include +#include +#include +#include + +namespace Base { +// Specialization for gp_Pnt +template <> +struct vec_traits { + typedef gp_Pnt vec_type; + typedef double float_type; + vec_traits(const vec_type& v) : v(v){} + inline float_type x() { return v.X(); } + inline float_type y() { return v.Y(); } + inline float_type z() { return v.Z(); } +private: + const vec_type& v; +}; +// Specialization for gp_Vec +template <> +struct vec_traits { + typedef gp_Vec vec_type; + typedef double float_type; + vec_traits(const vec_type& v) : v(v){} + inline float_type x() { return v.X(); } + inline float_type y() { return v.Y(); } + inline float_type z() { return v.Z(); } +private: + const vec_type& v; +}; +// Specialization for gp_Dir +template <> +struct vec_traits { + typedef gp_Dir vec_type; + typedef double float_type; + vec_traits(const vec_type& v) : v(v){} + inline float_type x() { return v.X(); } + inline float_type y() { return v.Y(); } + inline float_type z() { return v.Z(); } +private: + const vec_type& v; +}; +// Specialization for gp_XYZ +template <> +struct vec_traits { + typedef gp_XYZ vec_type; + typedef double float_type; + vec_traits(const vec_type& v) : v(v){} + inline float_type x() { return v.X(); } + inline float_type y() { return v.Y(); } + inline float_type z() { return v.Z(); } +private: + const vec_type& v; +}; +} + +namespace Part +{ + +} //namespace Part + + +#endif // PART_TOOLS_H diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index dfe43aee7..f81a04122 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -156,6 +156,7 @@ #include "TopoShapeVertexPy.h" #include "ProgressIndicator.h" #include "modelRefine.h" +#include "Tools.h" using namespace Part; diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index e2855e510..389511d05 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -25,53 +25,14 @@ #define PART_TOPOSHAPE_H #include -#include -#include #include #include #include #include +class gp_Ax1; class gp_Ax2; - -namespace Base { -// Specialization for gp_Pnt -template <> -struct vec_traits { - typedef gp_Pnt vec_type; - typedef double float_type; - vec_traits(const vec_type& v) : v(v){} - inline float_type x() { return v.X(); } - inline float_type y() { return v.Y(); } - inline float_type z() { return v.Z(); } -private: - const vec_type& v; -}; -// Specialization for gp_Vec -template <> -struct vec_traits { - typedef gp_Vec vec_type; - typedef double float_type; - vec_traits(const vec_type& v) : v(v){} - inline float_type x() { return v.X(); } - inline float_type y() { return v.Y(); } - inline float_type z() { return v.Z(); } -private: - const vec_type& v; -}; -// Specialization for gp_Dir -template <> -struct vec_traits { - typedef gp_Dir vec_type; - typedef double float_type; - vec_traits(const vec_type& v) : v(v){} - inline float_type x() { return v.X(); } - inline float_type y() { return v.Y(); } - inline float_type z() { return v.Z(); } -private: - const vec_type& v; -}; -} +class gp_Vec; namespace Part { diff --git a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp index 438e31da2..c329042c8 100644 --- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp @@ -23,9 +23,10 @@ #include "PreCompiled.h" #include +#include #include -#include "Mod/Part/App/TopoShape.h" +#include "TopoShape.h" // inclusion of the generated files (generated out of TopoShapeCompSolidPy.xml) #include "TopoShapeSolidPy.h" diff --git a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp index b8e3a0d5e..489abda5e 100644 --- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp @@ -23,8 +23,9 @@ #include "PreCompiled.h" -#include "Mod/Part/App/TopoShape.h" +#include "TopoShape.h" #include +#include #include // inclusion of the generated files (generated out of TopoShapeCompoundPy.xml) diff --git a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp index ca1a952c3..8af8b1300 100644 --- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp @@ -40,7 +40,8 @@ #include #include -#include "Mod/Part/App/TopoShape.h" +#include "TopoShape.h" +#include "Tools.h" // inclusion of the generated files (generated out of TopoShapeSolidPy.xml) #include "TopoShapeShellPy.h" diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index 0092cf756..4ea927906 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include "DlgPrimitives.h" @@ -143,21 +144,6 @@ DlgPrimitives::~DlgPrimitives() viewer->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), pickCallback,this); } } - -namespace Base { -// Specialization for gp_XYZ -template <> -struct vec_traits { - typedef gp_XYZ vec_type; - typedef double float_type; - vec_traits(const vec_type& v) : v(v){} - inline float_type x() { return v.X(); } - inline float_type y() { return v.Y(); } - inline float_type z() { return v.Z(); } -private: - const vec_type& v; -}; -} QString DlgPrimitives::toPlacement() const {