-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
namespace INTERP_KERNEL
{
- typedef enum { Triangulation, Convex, Geometric2D, PointLocator } IntersectionType;
+ typedef enum { Triangulation, Convex, Geometric2D, PointLocator, Barycentric, BarycentricGeo2D } IntersectionType;
/*!
* \class InterpolationOptions
int _orientation ;
bool _measure_abs;
SplittingPolicy _splitting_policy ;
- bool _P1P0_bary_method; // issue 0020440
-
public:
InterpolationOptions() { init(); }
int getPrintLevel() const { return _print_level; }
void setSplittingPolicy(SplittingPolicy sp) { _splitting_policy=sp; }
std::string getSplittingPolicyRepr() const;
- void setP1P0BaryMethod(bool isP1P0) { _P1P0_bary_method=isP1P0; }
- bool getP1P0BaryMethod() const { return _P1P0_bary_method; }
-
std::string filterInterpolationMethod(const std::string& meth) const;
void init();
double max_distance_for_3Dsurf_intersect,
long orientation,
bool measure_abs,
- std::string splitting_policy,
- bool P1P0_bary_method );
+ std::string splitting_policy);
void copyOptions(const InterpolationOptions & other) { *this = other; }
bool setOptionDouble(const std::string& key, double value);
bool setOptionInt(const std::string& key, int value);
bool setOptionString(const std::string& key, const std::string& value);
std::string printOptions() const;
+ public:
+ static void CheckAndSplitInterpolationMethod(const std::string& method, std::string& srcMeth, std::string& trgMeth);
private:
static const double DFT_MEDIAN_PLANE;
static const double DFT_SURF3D_ADJ_EPS;
static const char CONVEX_INTERSECT2D_STR[];
static const char GEOMETRIC_INTERSECT2D_STR[];
static const char POINTLOCATOR_INTERSECT_STR[];
+ static const char BARYCENTRIC_INTERSECT_STR[];
+ static const char BARYCENTRICGEO2D_INTERSECT_STR[];
static const char PLANAR_SPLIT_FACE_5_STR[];
static const char PLANAR_SPLIT_FACE_6_STR[];
static const char GENERAL_SPLIT_24_STR[];