Commit c8ffb0e1 authored by Dennis Gläser's avatar Dennis Gläser
Browse files

Merge branch 'feature/move-extract-ctype' into 'master'

[ctype] move ctype traits to geometry

See merge request tools/frackit!159
parents 434bb32f 3b3516b6
install(FILES install(FILES
extractctype.hh
extractdimension.hh extractdimension.hh
id.hh id.hh
idpair.hh idpair.hh
......
...@@ -3,6 +3,7 @@ boundingbox.hh ...@@ -3,6 +3,7 @@ boundingbox.hh
box.hh box.hh
circle.hh circle.hh
CMakeLists.txt CMakeLists.txt
ctype.hh
cylinder.hh cylinder.hh
cylindersurface.hh cylindersurface.hh
direction.hh direction.hh
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
*****************************************************************************/ *****************************************************************************/
/*! /*!
* \file * \file
* \ingroup Common * \ingroup Geometry
* \brief Type traits to extract the coordinate type of geometric objects. * \brief Type traits to extract the coordinate type of geometric objects.
*/ */
#ifndef FRACKIT_COMMON_COORDINATE_TYPE_HH #ifndef FRACKIT_GEOMETRY_COORDINATE_TYPE_HH
#define FRACKIT_COMMON_COORDINATE_TYPE_HH #define FRACKIT_GEOMETRY_COORDINATE_TYPE_HH
#include <utility> #include <utility>
...@@ -106,4 +106,4 @@ struct CoordinateTypeTraits<TopoDS_Solid> ...@@ -106,4 +106,4 @@ struct CoordinateTypeTraits<TopoDS_Solid>
} // end namespace Frackit } // end namespace Frackit
#endif // FRACKIT_COMMON_COORDINATE_TYPE_HH #endif // FRACKIT_GEOMETRY_COORDINATE_TYPE_HH
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx> #include <TopoDS_Face.hxx>
#include <frackit/geometry/ctype.hh>
#include <frackit/geometry/point.hh> #include <frackit/geometry/point.hh>
#include <frackit/occ/breputilities.hh> #include <frackit/occ/breputilities.hh>
#include <frackit/common/extractctype.hh>
#include <frackit/intersection/intersectiontraits.hh> #include <frackit/intersection/intersectiontraits.hh>
#include <frackit/intersection/emptyintersection.hh> #include <frackit/intersection/emptyintersection.hh>
......
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
#include <frackit/geometry/quadrilateral.hh> #include <frackit/geometry/quadrilateral.hh>
#include <frackit/geometry/polygon.hh> #include <frackit/geometry/polygon.hh>
#include <frackit/geometry/cylindersurface.hh> #include <frackit/geometry/cylindersurface.hh>
#include <frackit/geometry/ctype.hh>
#include <frackit/geometryutilities/name.hh> #include <frackit/geometryutilities/name.hh>
#include <frackit/geometryutilities/getboundingbox.hh> #include <frackit/geometryutilities/getboundingbox.hh>
#include <frackit/occ/breputilities.hh> #include <frackit/occ/breputilities.hh>
#include <frackit/common/extractctype.hh>
#include <frackit/precision/defaultepsilon.hh> #include <frackit/precision/defaultepsilon.hh>
#include "intersectiontraits.hh" #include "intersectiontraits.hh"
......
...@@ -32,8 +32,7 @@ ...@@ -32,8 +32,7 @@
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <TopoDS_Face.hxx> #include <TopoDS_Face.hxx>
#include <frackit/common/extractctype.hh> #include <frackit/geometry/ctype.hh>
#include <frackit/geometry/point.hh> #include <frackit/geometry/point.hh>
#include <frackit/geometry/segment.hh> #include <frackit/geometry/segment.hh>
#include <frackit/geometry/plane.hh> #include <frackit/geometry/plane.hh>
......
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
#include <type_traits> #include <type_traits>
#include <frackit/occ/breputilities.hh> #include <frackit/occ/breputilities.hh>
#include <frackit/common/extractctype.hh>
#include <frackit/common/extractdimension.hh> #include <frackit/common/extractdimension.hh>
#include <frackit/precision/defaultepsilon.hh> #include <frackit/precision/defaultepsilon.hh>
#include <frackit/geometry/ctype.hh>
#include <frackit/geometry/geometry.hh> #include <frackit/geometry/geometry.hh>
#include <frackit/geometryutilities/applyongeometry.hh> #include <frackit/geometryutilities/applyongeometry.hh>
......
install(FILES install(FILES
extractctype.hh
id.hh id.hh
math.hh math.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/frackit/python/common) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/frackit/python/common)
...@@ -3,6 +3,7 @@ box.hh ...@@ -3,6 +3,7 @@ box.hh
brepwrapper.hh brepwrapper.hh
brepwrappers.hh brepwrappers.hh
circle.hh circle.hh
ctype.hh
cylinder.hh cylinder.hh
cylindersurface.hh cylindersurface.hh
direction.hh direction.hh
......
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/ *****************************************************************************/
#ifndef FRACKIT_PYTHON_EXTRACT_CTYPE_HH #ifndef FRACKIT_PYTHON_GEOMETRY_CTYPE_HH
#define FRACKIT_PYTHON_EXTRACT_CTYPE_HH #define FRACKIT_PYTHON_GEOMETRY_CTYPE_HH
#include <frackit/common/extractctype.hh> #include <frackit/geometry/ctype.hh>
#include <frackit/python/geometry/brepwrapper.hh> #include <frackit/python/geometry/brepwrapper.hh>
namespace Frackit::Python { namespace Frackit::Python {
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <frackit/geometry/hollowcylinder.hh> #include <frackit/geometry/hollowcylinder.hh>
#include <frackit/geometry/cylindersurface.hh> #include <frackit/geometry/cylindersurface.hh>
#include <frackit/python/geometry/brepwrapper.hh> #include <frackit/python/geometry/brepwrapper.hh>
#include <frackit/python/common/extractctype.hh> #include <frackit/python/geometry/ctype.hh>
#include <frackit/magnitude/magnitude.hh> #include <frackit/magnitude/magnitude.hh>
#include <frackit/magnitude/containedmagnitude.hh> #include <frackit/magnitude/containedmagnitude.hh>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <frackit/geometry/cylindersurface.hh> #include <frackit/geometry/cylindersurface.hh>
#include <frackit/geometry/box.hh> #include <frackit/geometry/box.hh>
#include <frackit/python/geometry/brepwrapper.hh> #include <frackit/python/geometry/brepwrapper.hh>
#include <frackit/python/common/extractctype.hh> #include <frackit/python/geometry/ctype.hh>
#include <frackit/precision/defaultepsilon.hh> #include <frackit/precision/defaultepsilon.hh>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#ifndef FRACKIT_MAKE_UNIFORM_POINT_SAMPLER_HH #ifndef FRACKIT_MAKE_UNIFORM_POINT_SAMPLER_HH
#define FRACKIT_MAKE_UNIFORM_POINT_SAMPLER_HH #define FRACKIT_MAKE_UNIFORM_POINT_SAMPLER_HH
#include <frackit/common/extractctype.hh> #include <frackit/geometry/ctype.hh>
#include <frackit/common/extractdimension.hh> #include <frackit/common/extractdimension.hh>
#include "uniformpointsamplertraits.hh" #include "uniformpointsamplertraits.hh"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment