X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FINTERP_KERNEL%2FInterpolationOptions.cxx;h=540f50c0da66ef5d78946c91b5ff00ed820ef2ef;hb=b832b15337be013a56e0976170e5e235b89fcb03;hp=c7d551f95475966ee7581e6708df8e4c77bd1707;hpb=378cb2ebe08f8f4543ef632b2bd5f77fe180f978;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNEL/InterpolationOptions.cxx b/src/INTERP_KERNEL/InterpolationOptions.cxx old mode 100755 new mode 100644 index c7d551f95..540f50c0d --- a/src/INTERP_KERNEL/InterpolationOptions.cxx +++ b/src/INTERP_KERNEL/InterpolationOptions.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -34,8 +34,6 @@ const double INTERP_KERNEL::InterpolationOptions::DFT_MIN_DOT_BTW_3DSURF_INTERSE const char INTERP_KERNEL::InterpolationOptions::PRECISION_STR[]="Precision"; -const char INTERP_KERNEL::InterpolationOptions::ARC_DETECTION_PRECISION_STR[]="ArcDetectionPrecision"; - const char INTERP_KERNEL::InterpolationOptions::MEDIANE_PLANE_STR[]="MedianPlane"; const char INTERP_KERNEL::InterpolationOptions::BOUNDING_BOX_ADJ_STR[]="BoundingBoxAdjustment"; @@ -94,16 +92,6 @@ void INTERP_KERNEL::InterpolationOptions::init() _splitting_policy=PLANAR_FACE_5; } -double INTERP_KERNEL::InterpolationOptions::getArcDetectionPrecision() const -{ - return INTERP_KERNEL::QUADRATIC_PLANAR::_arc_detection_precision; -} - -void INTERP_KERNEL::InterpolationOptions::setArcDetectionPrecision(double p) -{ - INTERP_KERNEL::QUADRATIC_PLANAR::_arc_detection_precision=p; -} - std::string INTERP_KERNEL::InterpolationOptions::getIntersectionTypeRepr() const { if(_intersection_type==INTERP_KERNEL::Triangulation) @@ -129,11 +117,6 @@ bool INTERP_KERNEL::InterpolationOptions::setOptionDouble(const std::string& key setPrecision(value); return true; } - if(key==ARC_DETECTION_PRECISION_STR) - { - setArcDetectionPrecision(value); - return true; - } else if(key==MEDIANE_PLANE_STR) { setMedianPlane(value); @@ -272,7 +255,7 @@ std::string INTERP_KERNEL::InterpolationOptions::filterInterpolationMethod(const return std::string(meth); } -bool INTERP_KERNEL::InterpolationOptions::setInterpolationOptions(long print_level, +bool INTERP_KERNEL::InterpolationOptions::setInterpolationOptions(int print_level, std::string intersection_type, double precision, double median_plane, @@ -280,7 +263,7 @@ bool INTERP_KERNEL::InterpolationOptions::setInterpolationOptions(long print_lev double bounding_box_adjustment, double bounding_box_adjustment_abs, double max_distance_for_3Dsurf_intersect, - long orientation, + int orientation, bool measure_abs, std::string splitting_policy) { @@ -302,7 +285,6 @@ std::string INTERP_KERNEL::InterpolationOptions::printOptions() const oss << "Print level : " << _print_level << std::endl; oss << "Intersection type : " << getIntersectionTypeRepr() << std::endl; oss << "Precision : " << _precision << std::endl; - oss << "Arc Detection Precision : " << getArcDetectionPrecision() << std::endl; oss << "Median plane : " << _median_plane << std::endl; oss << "Do Rotate status : " << std::boolalpha << _do_rotate << std::endl; oss << "Bounding box adj : " << _bounding_box_adjustment << std::endl;