Update Adaptor2d_Curve2d.cxx

CMakeLists.txt

@@ -820,6 +820,12 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
 endif()
 
+# ExpToCasExe
+if (EMSCRIPTEN)
+  list (REMOVE_ITEM BUILD_TOOLKITS TKExpress)
+  list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+endif()
+
 # bison
 if (BUILD_YACCLEX)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")

adm/MODULES

@@ -3,6 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
 ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade
+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
 Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
-DETools TKExpress ExpToCasExe

adm/cmake/draco.cmake

@@ -3,6 +3,10 @@
 
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
+if (NOT DEFINED INSTALL_DRACO)
+  set (INSTALL_DRACO OFF CACHE BOOL "${INSTALL_DRACO_DESCR}")
+endif()
+
 if (NOT DEFINED 3RDPARTY_DRACO_DIR)
   set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
 endif()
@@ -11,24 +15,14 @@ if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
   set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
 endif()
 
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY)
-  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library")
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY OR NOT 3RDPARTY_DRACO_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library"  FORCE)
 endif()
 
 if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
   set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
 endif()
 
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "" CACHE FILEPATH "Draco debug library")
-  endif()
-  
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "" CACHE PATH "The directory containing Draco debug library")
-  endif()
-endif()
-
 if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
   if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
     FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
@@ -38,19 +32,20 @@ if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
   endif()
 endif()
 
-# header
-if (NOT 3RDPARTY_DRACO_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  set (HEADER_NAMES draco)
+if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+  set (DRACO_INCLUDE_PATH "${3RDPARTY_DRACO_DIR}/include")
+  set (DRACO_LIBRARY_PATH "${3RDPARTY_DRACO_DIR}/lib")
+endif()
 
-  # set 3RDPARTY_DRACO_INCLUDE_DIR as notfound, otherwise find_path can't assign a new value to 3RDPARTY_DRACO_INCLUDE_DIR
-  set (3RDPARTY_DRACO_INCLUDE_DIR "3RDPARTY_DRACO_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing headers of the Draco" FORCE)
+if (NOT 3RDPARTY_DRACO_INCLUDE_DIR)
+  if (DRACO_INCLUDE_PATH AND EXISTS "${DRACO_INCLUDE_PATH}")
+    set (3RDPARTY_DRACO_INCLUDE_DIR "${DRACO_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of DRACO" FORCE)
+  endif()
+endif()
 
-  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_DRACO_DIR}
-                                                 PATH_SUFFIXES "include"
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
-                                                 NO_DEFAULT_PATH)
+if (NOT 3RDPARTY_DRACO_LIBRARY_DIR)
+  if (DRACO_LIBRARY_PATH AND EXISTS "${DRACO_LIBRARY_PATH}")
+    set (3RDPARTY_DRACO_LIBRARY_DIR "${DRACO_LIBRARY_PATH}" CACHE FILEPATH "The directory containing DRACO library" FORCE)
   endif()
 endif()
 
@@ -62,11 +57,11 @@ endif()
 
 if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
   if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
     set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
 
     find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
+                                         PATHS "${3RDPARTY_DRACO_LIBRARY_DIR}"
                                          PATH_SUFFIXES lib
                                          CMAKE_FIND_ROOT_PATH_BOTH
                                          NO_DEFAULT_PATH)
@@ -75,19 +70,27 @@ if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
       set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
     endif()
   endif()
+endif()
 
-  if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
+if (3RDPARTY_DRACO_LIBRARY_DIR AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+else()
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_DRACO_LIBRARY_DIR)
+endif()
 
-    find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES libd
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
-    endif()
+if (INSTALL_DRACO)
+  get_filename_component(3RDPARTY_DRACO_LIBRARY_REALPATH ${3RDPARTY_DRACO_LIBRARY} REALPATH)
+  if (SINGLE_GENERATOR)
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+  else()
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR_LIB}")
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR_LIB}i")
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR_LIB}d")
   endif()
 endif()

adm/cmake/occt_toolkit.cmake

@@ -70,16 +70,6 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
     OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
     list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
 
-    # remove old general version of FlexLexer
-    if (EXISTS ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
-      message (STATUS "Info: remove old FLEX header file: ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h")
-      file(REMOVE ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
-    endif()
-    # install copy of FlexLexer.h locally to allow further building without flex
-    if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-      configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
-    endif()
-
     # bison files
     OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
     list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
@@ -117,11 +107,21 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
             endif()
           endforeach()
 
+          if (EXISTS ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
+            message (STATUS "Info: remove old FLEX header file: ${FLEX_BISON_TARGET_DIR}/FlexLexer.h")
+            file(REMOVE ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
+          endif()
+
           file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
           foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
             string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
             if (CXX_FLEX_LANGUAGE_FOUND)
               set (FLEX_OUTPUT_FILE_EXT "cxx")
+
+              # install copy of FlexLexer.h locally to allow further building without flex
+              if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+                configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${FLEX_BISON_TARGET_DIR}/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
+              endif()
             endif()
           endforeach()
           set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
@@ -284,15 +284,9 @@ else()
     else()
       set (aReleasePdbConf)
     endif()
-    if (BUILD_SHARED_LIBS)
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
              CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
              DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-    else()
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
-             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
-             DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
-    endif()
   endif()
 
   if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
@@ -376,10 +370,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
             add_definitions (-DHAVE_GLES2)
           endif()
 
-          if ("${CURRENT_CSF}" STREQUAL "${CSF_Draco}")
-            set (CURRENT_CSF "")
-            set (USED_DRACO 1)
-          endif()
           set (LIBRARY_FROM_CACHE 0)
           separate_arguments (CURRENT_CSF)
           foreach (CSF_LIBRARY ${CURRENT_CSF})
@@ -407,7 +397,7 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
             endforeach()
           endforeach()
 
-          if (NOT ${LIBRARY_FROM_CACHE} AND NOT "${CURRENT_CSF}" STREQUAL "")
+          if (NOT ${LIBRARY_FROM_CACHE})
             # prepare a list from a string with whitespaces
             separate_arguments (CURRENT_CSF)
             list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
@@ -418,28 +408,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
   endif()
 endforeach()
 
-if (USE_DRACO)
-  if (USED_DRACO)
-    set (USED_LIB_RELEASE ${3RDPARTY_DRACO_LIBRARY})
-    if (WIN32)
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY_DEBUG})
-    else()
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY})
-    endif()
-    set (USED_LIB_CONF)
-    if (EXISTS ${USED_LIB_DEBUG})
-      set (USED_LIB_CONF "$<$<CONFIG:DEBUG>:${USED_LIB_DEBUG}>;${USED_LIB_CONF}")
-    endif()
-    if (EXISTS ${USED_LIB_RELEASE})
-      set (USED_LIB_CONF "$<$<CONFIG:RELEASE>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-      set (USED_LIB_CONF "$<$<CONFIG:RELWITHDEBINFO>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-    endif()
-    if (DEFINED USED_LIB_CONF)
-      set_property (TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_LIBRARIES "${USED_LIB_CONF}")
-    endif()
-  endif()
-endif()
-
 if (APPLE)
   list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
   if (NOT ${IS_X11_FOUND} EQUAL -1)

adm/cmake/vardescr.cmake

@@ -116,7 +116,6 @@ endmacro()
 
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_DETools              "DETools")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")

adm/scripts/android_build.bat

@@ -33,7 +33,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 
 rem Optional 3rd-party libraries to enable
 set "USE_FREETYPE=ON"
@@ -167,7 +166,6 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="OFF" ^
  -D BUILD_MODULE_Draw:BOOL="OFF" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
  -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^

adm/scripts/android_custom.bat.template

@@ -27,7 +27,6 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
-rem set "BUILD_MODULE_DETools=OFF"
 
 rem Optional 3rd-party libraries to enable
 rem set "USE_RAPIDJSON=ON"

adm/scripts/cmake_custom.bat.template

@@ -33,7 +33,6 @@ rem set BUILD_PATCH=
 
 rem set BUILD_MODULE_ApplicationFramework=ON
 rem set BUILD_MODULE_DataExchange=ON
-rem set BUILD_MODULE_DETools=OFF
 rem set BUILD_MODULE_Draw=ON
 rem set BUILD_MODULE_ModelingAlgorithms=ON
 rem set BUILD_MODULE_ModelingData=ON

adm/scripts/cmake_custom.sh.template

@@ -26,7 +26,6 @@ FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
 
 #BUILD_MODULE_ApplicationFramework=ON
 #BUILD_MODULE_DataExchange=ON
-#BUILD_MODULE_DETools=OFF
 #BUILD_MODULE_Draw=ON
 #BUILD_MODULE_ModelingAlgorithms=ON
 #BUILD_MODULE_ModelingData=ON

adm/scripts/cmake_gen.bat

@@ -28,7 +28,6 @@ set BUILD_FORCE_RelWithDebInfo=OFF
 
 set BUILD_MODULE_ApplicationFramework=ON
 set BUILD_MODULE_DataExchange=ON
-set BUILD_MODULE_DETools=OFF
 set BUILD_MODULE_Draw=ON
 set BUILD_MODULE_ModelingAlgorithms=ON
 set BUILD_MODULE_ModelingData=ON
@@ -63,7 +62,6 @@ cmake -G "%arch_compile%" ^
   -D BUILD_LIBRARY_TYPE:STRING=%BUILD_LIBRARY_TYPE% ^
   -D BUILD_MODULE_ApplicationFramework:BOOL=%BUILD_MODULE_ApplicationFramework% ^
   -D BUILD_MODULE_DataExchange:BOOL=%BUILD_MODULE_DataExchange% ^
-  -D BUILD_MODULE_DETools:BOOL=%BUILD_MODULE_DETools% ^
   -D BUILD_MODULE_Draw:BOOL=%BUILD_MODULE_Draw% ^
   -D BUILD_MODULE_FoundationClasses:BOOL=ON ^
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^

adm/scripts/cmake_gen.sh

@@ -31,7 +31,6 @@ BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
 
 BUILD_MODULE_ApplicationFramework=ON
 BUILD_MODULE_DataExchange=ON
-BUILD_MODULE_DETools=OFF
 BUILD_MODULE_Draw=ON
 BUILD_MODULE_ModelingAlgorithms=ON
 BUILD_MODULE_ModelingData=ON
@@ -64,7 +63,6 @@ cmake -G "Unix Makefiles" \
   -D BUILD_LIBRARY_TYPE:STRING=$BUILD_LIBRARY_TYPE \
   -D BUILD_MODULE_ApplicationFramework:BOOL=$BUILD_MODULE_ApplicationFramework \
   -D BUILD_MODULE_DataExchange:BOOL=$BUILD_MODULE_DataExchange \
-  -D BUILD_MODULE_DETools:BOOL=$BUILD_MODULE_DETools \
   -D BUILD_MODULE_Draw:BOOL=$BUILD_MODULE_Draw \
   -D BUILD_MODULE_FoundationClasses:BOOL=ON \
   -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \

adm/scripts/ios_build.sh

@@ -34,7 +34,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 
 export USE_FREETYPE=ON
 export USE_FREEIMAGE=OFF
@@ -149,7 +148,6 @@ function buildArch {
   -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
   -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
   -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
   -D BUILD_MODULE_Draw:BOOL="OFF" \
   -D BUILD_DOC_Overview:BOOL="OFF" \
     "$aCasSrc" 2>&1 | tee -a "$aLogFile"

adm/scripts/ios_custom.sh.template

@@ -20,7 +20,6 @@ export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF
 
 #export USE_RAPIDJSON=ON
 #export USE_DRACO=ON

adm/scripts/macos_build.sh

@@ -34,7 +34,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 export BUILD_Draw=ON
 
 export USE_FREETYPE=ON
@@ -146,7 +145,6 @@ function buildArch {
   -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
   -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
   -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
   -D BUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \
   -D BUILD_DOC_Overview:BOOL="OFF" \
     "$aCasSrc" 2>&1 | tee -a "$aLogFile"

adm/scripts/macos_custom.sh.template

@@ -19,7 +19,6 @@ export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF
 #export BUILD_Draw=ON
 
 #export USE_RAPIDJSON=ON

adm/scripts/mingw_build.bat

@@ -32,7 +32,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 set "BUILD_Draw=ON"
 
 rem Optional 3rd-party libraries to enable
@@ -156,7 +155,6 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
  -D 3RDPARTY_TCL_DIR:PATH="%aTclTk%" ^
  -D 3RDPARTY_TCL_INCLUDE_DIR:FILEPATH="%aTclTk%/include" ^

adm/scripts/mingw_custom.bat.template

@@ -22,7 +22,6 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
-rem set "BUILD_DETools=OFF"
 rem set "BUILD_Draw=ON"
 
 rem set "USE_RAPIDJSON=ON"

adm/scripts/wasm_build.bat

@@ -32,7 +32,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 set "BUILD_Draw=OFF"
 
 rem Optional 3rd-party libraries to enable
@@ -176,7 +175,6 @@ if ["%toCMake%"] == ["1"] (
  -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
  -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
  -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
  -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
  -D BUILD_DOC_Overview:BOOL="OFF" ^
  -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^

adm/scripts/wasm_build.sh

@@ -20,7 +20,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 
 if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then
   . "${aScriptDir}/wasm_custom.sh"
@@ -75,7 +74,6 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
--DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 
@@ -94,7 +92,6 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
--DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
 

adm/scripts/wasm_custom.bat.template

@@ -23,7 +23,6 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
-rem set "BUILD_DETools=OFF"
 
 rem set "USE_RAPIDJSON=ON"
 rem set "USE_DRACO=ON"

adm/scripts/wasm_custom.sh.template

@@ -14,4 +14,3 @@ export EMSDK_ROOT="$aSrcRoot/../emsdk"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF

dox/FILES_HTML.txt

@@ -45,7 +45,6 @@ user_guides/visualization/visualization.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
-user_guides/de_wrapper/de_wrapper.md
 user_guides/ocaf/ocaf.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/inspector/inspector.md

dox/FILES_PDF.txt

@@ -20,7 +20,6 @@ user_guides/vis/vis.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
-user_guides/de_wrapper/de_wrapper.md
 user_guides/inspector/inspector.md
 user_guides/draw_test_harness/draw_test_harness.md
 

dox/user_guides/de_wrapper/de_wrapper.md

@@ -1,413 +0,0 @@
-Data Exchange Wrapper (DE_Wrapper)  {#occt_user_guides__de_wrapper}
-============================
-
-@tableofcontents
-
-@section occt_de_wrapper_1 Introduction
-
-This guide explains how to use the **Data Exchange Wrapper** (DE Wrapper).
-It provides basic directions on setup, usage and file creation via DE_Wrapper.
-
-The Data Exchange Wrapper (DE Wrapper) module allows reading and writing supported CAD formats to shape objects or special XDE documents, setting up the transfer process for all CAD files.
-
-It is also possible to add support for new CAD formats by prototyping existing tools.
-
-The DE Wrapper component requires @ref occt_user_guides__xde "XDE" toolkit for operation.
-
-This guide mainly explains how to convert CAD files to Open CASCADE Technology (OCCT) shapes and vice versa.
-This guide principally deals with the following OCCT classes:
-  * The Provider class, which loads CAD files and translates their contents to OCCT shapes or XDE documents, or translates OCCT shapes or XDE documents to CAD entities and then writes those entities to a CAD file.
-  * The Configuration class, which contains all information for the transfer process, such as the units, tolerance, and all internal information for the OCC readers or writers.
-  * The wrapper class, which contains all loaded configuration objects with own CAD format, reads or writes CAD files in the format derived from file extension or contents and saves or loads configuration settings for loaded configuration objects.
-
-@section occt_de_wrapper_2 Supported CAD formats
-
-| CAD format | Extensions | RW support | Thread Safety | Presentation | Package |
-| :--------- | :--------- | :--------- | :----------- | :----------- | :------ |
-| STEP | .stp, .step .stepz | RW | No | BRep, Mesh | STEPCAFControl |
-| XCAF | .xbf | RW | Yes | BRep, Mesh | DEXCAFCascade |
-| BREP | .brep | RW | Yes | BRep, Mesh | DEBRepCascade |
-| IGES | .igs, .iges | RW | No | BRep | IGESCAFControl |
-| OBJ | .obj | RW | Yes | Mesh | RWObj |
-| STL | .stl | RW | Yes | Mesh | RWStl |
-| PLY | .ply | W | Yes | Mesh | RWPly |
-| GLTF | .glTF .glb | RW | Yes | Mesh | RWGltf |
-| VRML | .wrl .vrml | RW | Yes | Mesh | Vrml |
-
-**Note** :
-  * The format names in the first column match the FormatName values used for configuration nodes.
-  * The VendorName for all listed CAD formats is "OCC".
-
-@section occt_de_wrapper_3 DE Session Configuration
-
-Any providers can have their own read/write parameters. The transfer process is set up using DE configuration nodes, which hold all relevant parameters. There are two ways to change the parameter values: directly from code or by an external resource file/string.
-The session is a global or static DE_Wrapper object that stores registered DE configuration nodes and wraps DE commands to work with them. It has some configuration parameters of its own and also keeps track of loaded nodes and specilal global parameters.
-
-@subsection occt_de_wrapper_3_1 Getting a DE session. Code sample
-
-Working with a DE session requires a DE_Wrapper object to be loaded or created first.
-
-Getting the global DE_Wrapping object:
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-~~~~
-Creating a local DE_Wrapper:
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = new DE_Wrapper();
-~~~~
-It is recommended to create a local one-time copy to work with the session, if no global changes are intended.
-~~~~{.cpp}
-Handle(DE_Wrapper) aOneTimeSession = aSession->Copy();
-~~~~
-@subsection occt_de_wrapper_3_2 Configuration resource
-
-Configuration resource is an external file or string of the following format:
-~~~~{.cpp}
-global.priority.STEP :   OCC DTK
-global.general.length.unit :     1
-provider.STEP.OCC.read.precision.val :   0.0001
-~~~~
-
-@subsubsection occt_de_wrapper_3_2_1 Configuration resource: graph of scopes
-   * **global.** is a scope of global parameters
-     *  **priority.** is a scope of priority to use vendors with their providers.
-     *  **general.** is a scope of global configuration parameter values
-     *  <strong>"..."</strong> is an internal configuration with any internal scopes
-     *  <strong>". : "</strong> is a separator of key-value
-     *  __...__ parameter value, can't contain new line symbols.
-   * **provider.** is a scope of configuration providers
-     *  **STEP.** is a scope of CAD format to configure
-     *  **OCC.** is a scope of a vendor or provider
-     *  <strong>"..."</strong> is an internal configuration with any internal scopes
-     *  <strong>". : "</strong> is a separator of key-value
-     *  <strong>"..."</strong> parameter value, can't contain new line symbols.
-
-@subsubsection occt_de_wrapper_3_2_2 Loading configuration resources. Configuring DE Session
-
-The resource should be loaded after the registration of all providers that should be configured. The resource only impacts registered parameters. To configure a new registered provider it is necessary to load the resource again. Parameters not present in the resource will remain unchanged.
-
-There are two ways to check what parameters are available:
-* C++: Open ConfigureNode file and check the InternalParameter field. Each parameter will be described with a comment. To check the global parameters, use the DE_Wrapper class public methods.
-* Resource: Register all available Nodes to the session, then save the configuration and view all existing parameters.
-
-There are two options for loading a resource: recursive and global parameters only. Recursive is the default option to configure all global parameters (units, priority, enable status) and all registered providers. Non-recursive configures only global parameters and ignores all provider settings. This option is the best for updating provider priority.
-
-@subsubsection occt_de_wrapper_3_2_3 Loading configuration resources. Code sample
-
-Configuring using a resource string:
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aString =
-    "global.priority.STEP :   OCC DTK\n"
-    "global.general.length.unit : 1\n"
-    "provider.STEP.OCC.read.precision.val : 0.\n";
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Load(aString, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-~~~~
-Configuring using a resource file:
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "";
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Load(aPathToFile, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-~~~~
-@subsubsection occt_de_wrapper_3_2_4 Loading configuration resources. DRAW sample
-
-Configuring using a resource string:
-~~~~{.cpp}
-set conf "
-global.priority.STEP :   OCC
-global.general.length.unit :     1
-provider.STEP.OCC.read.iges.bspline.continuity :         1
-provider.STEP.OCC.read.precision.mode :  0
-provider.STEP.OCC.read.precision.val :   0.0001
-"
-LoadConfiguration ${conf} -recursive on
-~~~~
-
-Configuring using a resource file:
-~~~~{.cpp}
-set pathToFile ""
-LoadConfiguration ${pathToFile} -recursive on
-~~~~
-
-@subsubsection occt_de_wrapper_3_2_5 Saving configuration resources. Dump of configuration DE Session
-
-Saving the configuration of a DE Session involves dumping all parameters of registered providers.
-If a parameter did not change during the session, its value remains as default.
-
-There are two ways to save a resource: recursive and global parameters only. Recursive is the way to dump all registered provider information. Non-recursive dumps only global parameters, for example, save priority of vendors or the length unit.
-
-It is possible to filter what vendors or providers to save by providing the correct name of the vendor or provider.
-
-@subsubsection occt_de_wrapper_3_2_6 Saving configuration resources. Code sample
-
-Dump to resource string. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TColStd_ListOfAsciiString aFormats;
-  TColStd_ListOfAsciiString aVendors;
-  aFormats.Appends("STEP");
-  aVendors.Appends("OCC");
-  Standard_Boolean aIsRecursive = Standard_True;
-  TCollection_AsciiString aConf = aSession->aConf->Save(aIsRecursive, aFormats, aVendors);
-~~~~
-Configure using a resource file. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "";
-  TColStd_ListOfAsciiString aFormats;
-  TColStd_ListOfAsciiString aVendors;
-  aFormats.Appends("STEP");
-  aVendors.Appends("OCC");
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Save(aPathToFile, aIsRecursive, aFormats,aVendors))
-  {
-    Message::SendFail() << "Error: configuration is not saved";
-  }
-~~~~
-@subsubsection occt_de_wrapper_3_2_7 Saving configuration resources. DRAW sample
-
-Dump configuration to string. If no list of vendors is passed or it is empty, all vendors are saved. If no providers list is passed or it is empty, all providers of valid vendors are saved.
-~~~~{.cpp}
-set vendors "OCC"
-set format "STEP"
-set dump_conf [DumpConfiguration -recursive on -format ${format} -vendor ${vendors}]
-~~~~
-
-Dump configuration to file. If no vendors list are set as an argument or it is empty, saves all vendors. If no providers list as argument or it is empty, saves all providers of valid vendors:
-~~~~{.cpp}
-set vendors "OCC"
-set format "STEP"
-set pathToFile ""
-DumpConfiguration -path ${pathToFile} -recursive on -format ${format} -vendor ${vendors}
-~~~~
-
-@subsection occt_de_wrapper_3_3 Registering providers
-
-To transfer a CAD file using DE Wrapper, it is necessary to register a CAD provider.
-The provider contains internal and global parameters that have default values in the creation stage.
-All registered providers are set to the map with information about its vendor and kept as smart handles. Therefore, it is possible to change the values via handle from external code.
-
-@subsubsection occt_de_wrapper_3_3_1 Registering providers. Code sample
-
-It is nesessary to register only one ConfigurationNode for all needed formats.
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-Handle(DE_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
-aSession->Bind(aNode);
-~~~~
-@subsubsection occt_de_wrapper_3_3_2 Registering providers. DRAW Sample
-
-Use DRAW with all providers registered by the following command:
-~~~~{.cpp}
-pload XDE
-~~~~
-
-@subsubsection occt_de_wrapper_3_3_3 Realtime initialization. Code sample
-
-It is possible to change a paramater from code using a smart pointer.
-
-~~~~{.cpp}
-// global variable
-static Handle(STEPCAFControl_ConfigurationNode) THE_STEP_NODE;
-
-static Handle(DE_ConfigurationNode) RegisterStepNode()
-{
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  if (!THE_STEP_NODE.IsNull())
-  {
-    return THE_STEP_NODE;
-  }
-
-  THE_STEP_NODE = new STEPCAFControl_ConfigurationNode();
-  aSession->Bind(THE_STEP_NODE);
-  return THE_STEP_NODE;
-}
-
-// Change parameter value
-THE_STEP_NODE->InternalParameters.ReadRelationship = false;
-THE_STEP_NODE->InternalParameters.ReadName = false;
-THE_STEP_NODE->InternalParameters.ReadProps = false;
-~~~~
-
-@subsection occt_de_wrapper_3_4 Priority of Vendors
-
-DE session is able to work with several vendors with the same supported CAD format. To choose the preffered vendor for each format, use a special priority list.
-
-If the high priority vendor's provider is not supported, a transfer operation is needed (write/read), then the next vendor will be chosen.
-
-@subsubsection occt_de_wrapper_3_4_1 Priority of Vendors. Code sample
-
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aFormat = "STEP";
-  TColStd_ListOfAsciiString aVendors;
-  aVendors.Appends("OCC"); // high priority
-  aVendors.Appends("DTK");
-  // Flag to disable not choosen vendors, in this case configuration is possible
-  // otherwise, lower their priority and continue to check ability to transfer
-  Standard_Boolean aToDisable = Standard_True;
-  aSession->ChangePriority(aFormat, aVendors, aToDisable);
-~~~~
-
-@subsubsection occt_de_wrapper_3_4_2 Priority of Vendors. DRAW Sample
-
-It is recommended to disable recursion and update only global parameters.
-~~~~{.cpp}
-set conf "
-global.priority.STEP :   OCC DTK
-"
-LoadConfiguration ${conf} -recursive off
-~~~~
-
-@section occt_de_wrapper_4 Transfer of CAD files
-
-To transfer from a CAD file to OCC or from OCC to a CAD file, it is necessary to use a configured DE_Wrapper object. It can be local, one-time or global. Global configuration of DE_Wrapper propagates to all nodes via transfer. There are two options for transferring: using OCC shape or XCAF document. It is possible to work only with real path to/from the file. Streaming is not supported (yet).
-
-The format of input/output file is automatically determined by its extension or contents.
-
-@subsection occt_de_wrapper_4_1 Transfer of CAD files. Code samples
-
-Reading STEP file to Shape.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShRes;
-  if (!aSession->Read(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-Writing Shape to STEP file.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShFrom = ...;
-  if (!aSession->Write(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't write file";
-  }
-~~~~
-
-Reading STEP file into XCAF document.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  Handle(TDocStd_Document) aDoc = ...;
-  if (!aSession->Read(aPathToFile, aDoc))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-Writing XCAF document into STEP.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  Handle(TDocStd_Document) aDoc = ...;
-  if (!aSession->Write(aPathToFile, aDoc))
-  {
-    Message::SendFail() << "Error: Can't write file";
-  }
-~~~~
-
-@subsection occt_de_wrapper_4_2 Transfer of CAD files. DRAW samples
-
-Reading a STEP file into a Shape.
-~~~~{.cpp}
-set fileName "sample.stp"
-readfile shape ${fileName}
-~~~~
-
-Writing a Shape into STEP.
-~~~~{.cpp}
-set fileName "sample.stp"
-writefile shape ${fileName}
-~~~~
-
-Reading STEP into XCAF document.
-~~~~{.cpp}
-set fileName "sample.stp"
-ReadFile D ${fileName}
-~~~~
-
-Writing XCAF document into STEP.
-~~~~{.cpp}
-set fileName "sample.stp"
-WriteFile D ${fileName}
-~~~~
-
-@subsection occt_de_wrapper_4_3 Transfer using DE Provider. Code sample
-
-It is possible to read and write CAD files directly from a special provider.
-
-~~~~{.cpp}
-// Creating or getting node
-Handle(STEPCAFControl_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
-// Creationg an one-time provider
-Handle(DE_Provider) aProvider = aNode->BuildProvider();
-// Setting configuration with all parameters
-aProvider->SetNode(aNode);
-if (!aProvider->Read(...))
-{
-  Message::SendFail() << "Error: Can't read STEP file";
-}
-if (!aProvider->Write(...))
-{
-  Message::SendFail() << "Error: Can't write STEP file";
-}
-~~~~
-
-@subsection occt_de_wrapper_4_4 Temporary configuration via transfer
-
-It is possible to change the configuration of only one transfer operation. To avoid changing parameters in a session, one-time clone of the session can be created and used for transfer. This way is recommended for use in multithreaded mode.
-
-@subsubsection occt_de_wrapper_4_4_1 Temporary configuration via transfer. Code sample
-
-Code sample to configure via transfer.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper()->Copy();
-  TCollection_AsciiString aString =
-    "global.priority.STEP :   OCC DTK\n"
-    "global.general.length.unit : 1\n"
-    "provider.STEP.OCC.read.precision.val : 0.\n";
-  if (!aSession->Load(aString, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShRes;
-  if (!aSession->Read(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-@subsubsection occt_de_wrapper_4_4_2 Temporary configuration via transfer. DRAW sample
-
-Code sample to configure via transfer within DRAW command.
-~~~~{.cpp}
-set fileName "sample.stp"
-readfile S5 $filename -conf "global.general.length.unit : 1000 "
-~~~~
-
-Code sample to configure via transfer as variable.
-~~~~{.cpp}
-set fileName "sample.stp"
-set conf "
-global.priority.STEP :   OCC
-global.general.length.unit :     1
-provider.STEP.OCC.read.iges.bspline.continuity :         1
-provider.STEP.OCC.read.precision.mode :  0
-provider.STEP.OCC.read.precision.val :   0.0001
-"
-readfile S5 $filename -conf ${conf}
-~~~~

dox/user_guides/user_guides.md

@@ -13,7 +13,6 @@ OCCT User Guides are organized by OCCT modules:
 * @subpage occt_user_guides__iges "IGES Translator"
 * @subpage occt_user_guides__step "STEP Translator"
 * @subpage occt_user_guides__xde "Extended Data Exchange (XDE)"
-* @subpage occt_user_guides__de_wrapper "Data Exchange Wrapper (DE Wrapper)"
 * @subpage occt_user_guides__ocaf "Open CASCADE Application Framework (OCAF)"
 * @subpage occt_user_guides__test_harness "DRAW Test Harness"
 * @subpage occt_user_guides__inspector "Inspector"

src/AIS/AIS_AnimationAxisRotation.cxx

@@ -1,51 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <AIS_AnimationAxisRotation.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationAxisRotation, AIS_BaseAnimationObject)
-
-//=============================================================================
-//function : Constructor
-//purpose  :
-//=============================================================================
-AIS_AnimationAxisRotation::AIS_AnimationAxisRotation (const TCollection_AsciiString& theAnimationName,
-                                                      const Handle(AIS_InteractiveContext)& theContext,
-                                                      const Handle(AIS_InteractiveObject)& theObject,
-                                                      const gp_Ax1& theAxis,
-                                                      const Standard_Real theAngleStart,
-                                                      const Standard_Real theAngleEnd)
-: AIS_BaseAnimationObject (theAnimationName, theContext, theObject),
-  myRotAxis    (theAxis),
-  myAngleStart (theAngleStart),
-  myAngleEnd   (theAngleEnd)
-{
-  //
-}
-
-//=============================================================================
-//function : update
-//purpose  :
-//=============================================================================
-void AIS_AnimationAxisRotation::update (const AIS_AnimationProgress& theProgress)
-{
-  if (myObject.IsNull())
-  {
-    return;
-  }
-
-  gp_Trsf aTrsf;
-  Standard_Real aCurrentAngle = (1.0 - theProgress.LocalNormalized) * myAngleStart + theProgress.LocalNormalized * myAngleEnd;
-  aTrsf.SetRotation (myRotAxis, aCurrentAngle);
-  updateTrsf (aTrsf);
-}

src/AIS/AIS_AnimationAxisRotation.hxx

@@ -1,53 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_AnimationAxisRotation_HeaderFile
-#define _AIS_AnimationAxisRotation_HeaderFile
-
-#include <AIS_BaseAnimationObject.hxx>
-#include <gp_TrsfNLerp.hxx>
-
-//! Animation defining object transformation.
-class AIS_AnimationAxisRotation : public AIS_BaseAnimationObject
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_AnimationAxisRotation, AIS_BaseAnimationObject)
-public:
-
-  //! Constructor with initialization.
-  //! @param[in] theAnimationName animation identifier
-  //! @param[in] theContext       interactive context where object have been displayed
-  //! @param[in] theObject        object to apply rotation
-  //! @param[in] theAxis          rotation axis
-  //! @param[in] theAngleStart    rotation angle at the start of animation
-  //! @param[in] theAngleEnd      rotation angle at the end   of animation
-  Standard_EXPORT AIS_AnimationAxisRotation (const TCollection_AsciiString& theAnimationName,
-                                             const Handle(AIS_InteractiveContext)& theContext,
-                                             const Handle(AIS_InteractiveObject)& theObject,
-                                             const gp_Ax1& theAxis,
-                                             const Standard_Real theAngleStart,
-                                             const Standard_Real theAngleEnd);
-
-protected:
-
-  //! Update the progress.
-  Standard_EXPORT virtual void update (const AIS_AnimationProgress& theProgress) Standard_OVERRIDE;
-
-private:
-
-  gp_Ax1         myRotAxis;     //!< rotation axis
-  Standard_Real  myAngleStart;  //!< start angle for rotation
-  Standard_Real  myAngleEnd;    //!< end angle for rotation
-
-};
-
-#endif // _AIS_AnimationAxisRotation_HeaderFile

src/AIS/AIS_AnimationObject.cxx

@@ -14,7 +14,10 @@
 
 #include <AIS_AnimationObject.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_BaseAnimationObject)
+#include <AIS_InteractiveContext.hxx>
+#include <V3d_View.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_Animation)
 
 //=============================================================================
 //function : Constructor
@@ -25,7 +28,9 @@ AIS_AnimationObject::AIS_AnimationObject (const TCollection_AsciiString& theAnim
                                           const Handle(AIS_InteractiveObject)&  theObject,
                                           const gp_Trsf& theTrsfStart,
                                           const gp_Trsf& theTrsfEnd)
-: AIS_BaseAnimationObject (theAnimationName, theContext, theObject),
+: AIS_Animation (theAnimationName),
+  myContext  (theContext),
+  myObject   (theObject),
   myTrsfLerp (theTrsfStart, theTrsfEnd)
 {
   //
@@ -44,5 +49,52 @@ void AIS_AnimationObject::update (const AIS_AnimationProgress& theProgress)
 
   gp_Trsf aTrsf;
   myTrsfLerp.Interpolate (theProgress.LocalNormalized, aTrsf);
-  updateTrsf (aTrsf);
+  if (!myContext.IsNull())
+  {
+    myContext->SetLocation (myObject, aTrsf);
+    invalidateViewer();
+  }
+  else
+  {
+    myObject->SetLocalTransformation (aTrsf);
+  }
+}
+
+//=============================================================================
+//function : invalidateViewer
+//purpose  :
+//=============================================================================
+void AIS_AnimationObject::invalidateViewer()
+{
+  if (myContext.IsNull())
+  {
+    return;
+  }
+
+  const Standard_Boolean isImmediate = myContext->CurrentViewer()->ZLayerSettings (myObject->ZLayer()).IsImmediate();
+  if (!isImmediate)
+  {
+    myContext->CurrentViewer()->Invalidate();
+    return;
+  }
+
+  // Invalidate immediate view only if it is going out of z-fit range.
+  // This might be sub-optimal performing this for each animated objects in case of many animated objects.
+  for (V3d_ListOfView::Iterator aDefViewIter = myContext->CurrentViewer()->DefinedViewIterator();
+       aDefViewIter.More(); aDefViewIter.Next())
+  {
+    const Handle(V3d_View)& aView = aDefViewIter.Value();
+    const Bnd_Box aMinMaxBox  = aView->View()->MinMaxValues (Standard_False);
+    const Bnd_Box aGraphicBox = aView->View()->MinMaxValues (Standard_True);
+    Standard_Real aZNear = 0.0;
+    Standard_Real aZFar  = 0.0;
+    if (aView->Camera()->ZFitAll (aDefViewIter.Value()->AutoZFitScaleFactor(), aMinMaxBox, aGraphicBox, aZNear, aZFar))
+    {
+      if (aZNear < aView->Camera()->ZNear()
+       || aZFar  > aView->Camera()->ZFar())
+      {
+        aDefViewIter.Value()->Invalidate();
+      }
+    }
+  }
 }

src/AIS/AIS_AnimationObject.hxx

@@ -15,23 +15,24 @@
 #ifndef _AIS_AnimationObject_HeaderFile
 #define _AIS_AnimationObject_HeaderFile
 
-#include <AIS_BaseAnimationObject.hxx>
+#include <AIS_Animation.hxx>
+#include <AIS_InteractiveContext.hxx>
 #include <gp_TrsfNLerp.hxx>
 
 //! Animation defining object transformation.
-class AIS_AnimationObject : public AIS_BaseAnimationObject
+class AIS_AnimationObject : public AIS_Animation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_BaseAnimationObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_Animation)
 public:
 
   //! Constructor with initialization.
   //! Note that start/end transformations specify exactly local transformation of the object,
   //! not the transformation to be applied to existing local transformation.
-  //! @param[in] theAnimationName animation identifier
-  //! @param[in] theContext       interactive context where object have been displayed
-  //! @param[in] theObject        object to apply local transformation
-  //! @param[in] theTrsfStart     local transformation at the start of animation (e.g. theObject->LocalTransformation())
-  //! @param[in] theTrsfEnd       local transformation at the end   of animation
+  //! @param theAnimationName animation identifier
+  //! @param theContext       interactive context where object have been displayed
+  //! @param theObject        object to apply local transformation
+  //! @param theTrsfStart     local transformation at the start of animation (e.g. theObject->LocalTransformation())
+  //! @param theTrsfEnd       local transformation at the end   of animation
   Standard_EXPORT AIS_AnimationObject (const TCollection_AsciiString& theAnimationName,
                                        const Handle(AIS_InteractiveContext)& theContext,
                                        const Handle(AIS_InteractiveObject)&  theObject,
@@ -43,10 +44,17 @@ protected:
   //! Update the progress.
   Standard_EXPORT virtual void update (const AIS_AnimationProgress& theProgress) Standard_OVERRIDE;
 
-private:
+  //! Invalidate the viewer for proper update.
+  Standard_EXPORT void invalidateViewer();
 
-  gp_TrsfNLerp  myTrsfLerp; //!< interpolation tool
+protected:
+
+  Handle(AIS_InteractiveContext) myContext;   //!< context where object is displayed
+  Handle(AIS_InteractiveObject)  myObject;    //!< presentation object to set location
+  gp_TrsfNLerp                   myTrsfLerp;  //!< interpolation tool
 
 };
 
+DEFINE_STANDARD_HANDLE(AIS_AnimationObject, AIS_Animation)
+
 #endif // _AIS_AnimationObject_HeaderFile

src/AIS/AIS_BaseAnimationObject.cxx

@@ -1,88 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <AIS_BaseAnimationObject.hxx>
-
-#include <V3d_View.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(AIS_BaseAnimationObject, AIS_Animation)
-
-//=============================================================================
-//function : Constructor
-//purpose  :
-//=============================================================================
-AIS_BaseAnimationObject::AIS_BaseAnimationObject (const TCollection_AsciiString& theAnimationName,
-                                                  const Handle(AIS_InteractiveContext)& theContext,
-                                                  const Handle(AIS_InteractiveObject)&  theObject)
-: AIS_Animation (theAnimationName),
-  myContext  (theContext),
-  myObject   (theObject)
-{
-  //
-}
-
-//=============================================================================
-//function : updateTrsf
-//purpose  :
-//=============================================================================
-void AIS_BaseAnimationObject::updateTrsf (const gp_Trsf& theTrsf)
-{
-  if (!myContext.IsNull())
-  {
-    myContext->SetLocation (myObject, theTrsf);
-    invalidateViewer();
-  }
-  else
-  {
-    myObject->SetLocalTransformation (theTrsf);
-  }
-}
-
-//=============================================================================
-//function : invalidateViewer
-//purpose  :
-//=============================================================================
-void AIS_BaseAnimationObject::invalidateViewer()
-{
-  if (myContext.IsNull())
-  {
-    return;
-  }
-
-  const Standard_Boolean isImmediate = myContext->CurrentViewer()->ZLayerSettings (myObject->ZLayer()).IsImmediate();
-  if (!isImmediate)
-  {
-    myContext->CurrentViewer()->Invalidate();
-    return;
-  }
-
-  // Invalidate immediate view only if it is going out of z-fit range.
-  // This might be sub-optimal performing this for each animated objects in case of many animated objects.
-  for (V3d_ListOfView::Iterator aDefViewIter = myContext->CurrentViewer()->DefinedViewIterator();
-       aDefViewIter.More(); aDefViewIter.Next())
-  {
-    const Handle(V3d_View)& aView = aDefViewIter.Value();
-    const Bnd_Box aMinMaxBox  = aView->View()->MinMaxValues (Standard_False);
-    const Bnd_Box aGraphicBox = aView->View()->MinMaxValues (Standard_True);
-    Standard_Real aZNear = 0.0;
-    Standard_Real aZFar  = 0.0;
-    if (aView->Camera()->ZFitAll (aDefViewIter.Value()->AutoZFitScaleFactor(), aMinMaxBox, aGraphicBox, aZNear, aZFar))
-    {
-      if (aZNear < aView->Camera()->ZNear()
-       || aZFar  > aView->Camera()->ZFar())
-      {
-        aDefViewIter.Value()->Invalidate();
-      }
-    }
-  }
-}

src/AIS/AIS_BaseAnimationObject.hxx

@@ -1,49 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_BaseAnimationObject_HeaderFile
-#define _AIS_BaseAnimationObject_HeaderFile
-
-#include <AIS_Animation.hxx>
-#include <AIS_InteractiveContext.hxx>
-
-//! Animation defining object transformation.
-class AIS_BaseAnimationObject : public AIS_Animation
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_BaseAnimationObject, AIS_Animation)
-protected:
-
-  //! Constructor with initialization.
-  //! @param[in] theAnimationName animation identifier
-  //! @param[in] theContext       interactive context where object have been displayed
-  //! @param[in] theObject        object to apply local transformation
-  Standard_EXPORT AIS_BaseAnimationObject (const TCollection_AsciiString& theAnimationName,
-                                           const Handle(AIS_InteractiveContext)& theContext,
-                                           const Handle(AIS_InteractiveObject)&  theObject);
-
-  //! Update the transformation.
-  Standard_EXPORT void updateTrsf (const gp_Trsf& theTrsf);
-
-private:
-
-  //! Invalidate the viewer for proper update.
-  Standard_EXPORT void invalidateViewer();
-
-protected:
-
-  Handle(AIS_InteractiveContext) myContext;   //!< context where object is displayed
-  Handle(AIS_InteractiveObject)  myObject;    //!< presentation object to set location
-
-};
-
-#endif // _AIS_BaseAnimationObject_HeaderFile

src/AIS/AIS_C0RegularityFilter.cxx

@@ -56,7 +56,7 @@ AIS_C0RegularityFilter::AIS_C0RegularityFilter(const TopoDS_Shape& aShape)
       }
     }
     if (Ok) {
-      const TopoDS_Shape& curEdge = SubShapes.FindKey( i );
+      TopoDS_Shape curEdge = SubShapes.FindKey( i );
       myMapOfEdges.Add(curEdge);
     }
   }

src/AIS/AIS_InteractiveContext.cxx

@@ -945,7 +945,7 @@ void AIS_InteractiveContext::Redisplay (const AIS_KindOfInteractive theKOI,
   Standard_Boolean isRedisplayed = Standard_False;
   for (AIS_DataMapIteratorOfDataMapOfIOStatus anObjIter (myObjects); anObjIter.More(); anObjIter.Next())
   {
-    const Handle(AIS_InteractiveObject)& anObj = anObjIter.Key();
+    Handle(AIS_InteractiveObject) anObj = anObjIter.Key();
     if (anObj->Type() != theKOI)
     {
       continue;
@@ -1155,7 +1155,7 @@ void AIS_InteractiveContext::SetDisplayMode(const Standard_Integer theMode,
       continue;
     }
 
-    const Handle(AIS_GlobalStatus)& aStatus = anObjIter.Value();
+    Handle(AIS_GlobalStatus) aStatus = anObjIter.Value();
     aStatus->SetDisplayMode (theMode);
 
     if (anObj->DisplayStatus() == PrsMgr_DisplayStatus_Displayed)
@@ -2251,7 +2251,7 @@ Bnd_Box AIS_InteractiveContext::BoundingBoxOfSelection (const Handle(V3d_View)&
 
   for (AIS_MapIteratorOfMapOfObjectOwners anIter (anObjectOwnerMap); anIter.More(); anIter.Next())
   {
-    const Handle(SelectMgr_SelectableObject)& anObject = anIter.Key();
+    const Handle(SelectMgr_SelectableObject) anObject = anIter.Key();
     Bnd_Box aTmpBox = anObject->BndBoxOfSelected (anIter.ChangeValue());
     aBndSelected.Add (aTmpBox);
   }
@@ -3228,30 +3228,6 @@ void AIS_InteractiveContext::ClearSelected (const Standard_Boolean theToUpdateVi
   }
 }
 
-//=======================================================================
-//function : isDetected
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_InteractiveContext::isDetected (const Handle(AIS_InteractiveObject)& theObject)
-{
-  for (Standard_Integer aDetIter = myDetectedSeq.Lower(); aDetIter <= myDetectedSeq.Upper(); aDetIter++)
-  {
-    Handle(SelectMgr_EntityOwner) aPicked = MainSelector()->Picked(myDetectedSeq(aDetIter));
-    Handle(AIS_InteractiveObject) anObj;
-    if (!aPicked.IsNull())
-    {
-      anObj = Handle(AIS_InteractiveObject)::DownCast(aPicked->Selectable());
-    }
-
-    if (!anObj.IsNull()
-      && anObj == theObject)
-    {
-      return Standard_True;
-    }
-  }
-  return Standard_False;
-}
-
 //=======================================================================
 //function : SetSelected
 //purpose  : Sets the whole object as selected and highlights it with selection color
@@ -3312,8 +3288,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
   }
 
   // added to avoid untimely viewer update...
-  const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
-  mySelection->ClearAndSelect (anOwner, myFilters, isDetected (anObj));
+  mySelection->ClearAndSelect (anOwner);
 
   if (myAutoHilight)
   {
@@ -3375,7 +3350,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
     unhighlightSelected();
   }
 
-  mySelection->ClearAndSelect (theOwner, myFilters, isDetected (anObject));
+  mySelection->ClearAndSelect (theOwner);
   if (myAutoHilight)
   {
     Handle(Prs3d_Drawer) aCustomStyle;
@@ -3426,17 +3401,16 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
     return;
   }
 
-  if (!myFilters->IsOk (theOwner) && !theOwner->IsSelected())
+  if (!myFilters->IsOk(theOwner) && !theOwner->IsSelected())
   {
     return;
   }
 
-  AIS_SelectionScheme aSelScheme = theOwner->IsSelected() ? AIS_SelectionScheme_Remove : AIS_SelectionScheme_Add;
-  const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable());
-  mySelection->Select (theOwner, myFilters, aSelScheme, isDetected (anObj));
+  mySelection->Select (theOwner);
 
   if (myAutoHilight)
   {
+    const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable());
     Handle(AIS_GlobalStatus)* aStatusPtr = myObjects.ChangeSeek (anObj);
     if (!aStatusPtr)
     {
@@ -3495,8 +3469,7 @@ Standard_Boolean AIS_InteractiveContext::SetSelectedState (const Handle(SelectMg
   }
   else
   {
-    const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast(theEntity->Selectable());
-    const AIS_SelectStatus aSelStatus = mySelection->Select (theEntity, myFilters, AIS_SelectionScheme_Remove, isDetected (anObj));
+    const AIS_SelectStatus aSelStatus = mySelection->Select (theEntity);
     theEntity->SetSelected (false);
     return aSelStatus == AIS_SS_Removed;
   }

src/AIS/AIS_InteractiveContext.hxx

@@ -1302,9 +1302,6 @@ protected: //! @name internal methods
   Standard_EXPORT AIS_StatusOfDetection moveTo (const Handle(V3d_View)& theView,
                                                 const Standard_Boolean  theToRedrawOnUpdate);
 
-  //! Returns True if the object is detected.
-  Standard_EXPORT Standard_Boolean isDetected (const Handle(AIS_InteractiveObject)& theObject);
-
   //! Helper function to unhighlight all entity owners currently highlighted with seleciton color.
   Standard_EXPORT void unselectOwners (const Handle(AIS_InteractiveObject)& theObject);
 

src/AIS/AIS_Manipulator.cxx

@@ -1116,23 +1116,18 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
                                         const Standard_Integer theMode)
 {
   //Check mode
-  const AIS_ManipulatorMode aMode = (AIS_ManipulatorMode) theMode;
+  AIS_ManipulatorMode aMode = (AIS_ManipulatorMode) theMode;
   if (aMode == AIS_MM_None)
   {
     return;
   }
   Handle(SelectMgr_EntityOwner) anOwner;
-
-  // Sensitivity calculation for manipulator parts allows to avoid
-  // overlapping of sensitive areas when size of manipulator is small.
-  // Sensitivity is calculated relative to the default size of the manipulator (100.0f).
-  const Standard_ShortReal aSensitivityCoef = myAxes[0].Size() / 100.0f;
-  const Standard_Integer aHighSensitivity = Max (Min (RealToInt (aSensitivityCoef * 15), 15), 3); // clamp sensitivity within range [3, 15]
-  const Standard_Integer aLowSensitivity  = Max (Min (RealToInt (aSensitivityCoef * 10), 10), 2); // clamp sensitivity within range [2, 10]
-
-  switch (aMode)
+  if (aMode == AIS_MM_None)
   {
-  case AIS_MM_Translation:
+    anOwner = new SelectMgr_EntityOwner (this, 5);
+  }
+
+  if (aMode == AIS_MM_Translation || aMode == AIS_MM_None)
   {
     for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
     {
@@ -1141,21 +1136,23 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
         continue;
       }
       const Axis& anAxis = myAxes[anIt];
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_Translation, 9);
-
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner (this, anIt, AIS_MM_Translation, 9);
+      }
       // define sensitivity by line
-      Handle(Select3D_SensitiveSegment) aLine = new Select3D_SensitiveSegment(anOwner, gp::Origin(), anAxis.TranslatorTipPosition());
-      aLine->SetSensitivityFactor (aHighSensitivity);
+      Handle(Select3D_SensitiveSegment) aLine = new Select3D_SensitiveSegment (anOwner, gp::Origin(), anAxis.TranslatorTipPosition());
+      aLine->SetSensitivityFactor (15);
       theSelection->Add (aLine);
 
       // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitivePrimitiveArray) aTri = new Select3D_SensitivePrimitiveArray(anOwner);
+      Handle(Select3D_SensitivePrimitiveArray) aTri = new Select3D_SensitivePrimitiveArray (anOwner);
       aTri->InitTriangulation (anAxis.TriangleArray()->Attributes(), anAxis.TriangleArray()->Indices(), TopLoc_Location());
       theSelection->Add (aTri);
     }
-    break;
   }
-  case AIS_MM_Rotation:
+
+  if (aMode == AIS_MM_Rotation || aMode == AIS_MM_None)
   {
     for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
     {
@@ -1164,20 +1161,22 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
         continue;
       }
       const Axis& anAxis = myAxes[anIt];
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_Rotation, 9);
-
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner (this, anIt, AIS_MM_Rotation, 9);
+      }
       // define sensitivity by circle
-      const gp_Circ aGeomCircle (gp_Ax2(gp::Origin(), anAxis.ReferenceAxis().Direction()), anAxis.RotatorDiskRadius());
-      Handle(Select3D_SensitiveCircle) aCircle = new ManipSensCircle(anOwner, aGeomCircle);
-      aCircle->SetSensitivityFactor (aLowSensitivity);
-      theSelection->Add(aCircle);
+      const gp_Circ aGeomCircle (gp_Ax2 (gp::Origin(), anAxis.ReferenceAxis().Direction()), anAxis.RotatorDiskRadius());
+      Handle(Select3D_SensitiveCircle) aCircle = new ManipSensCircle (anOwner, aGeomCircle);
+      aCircle->SetSensitivityFactor (15);
+      theSelection->Add (aCircle);
       // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new ManipSensTriangulation(anOwner, myAxes[anIt].RotatorDisk().Triangulation(), anAxis.ReferenceAxis().Direction());
+      Handle(Select3D_SensitiveTriangulation) aTri = new ManipSensTriangulation (anOwner, myAxes[anIt].RotatorDisk().Triangulation(), anAxis.ReferenceAxis().Direction());
       theSelection->Add (aTri);
     }
-    break;
   }
-  case AIS_MM_Scaling:
+
+  if (aMode == AIS_MM_Scaling || aMode == AIS_MM_None)
   {
     for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
     {
@@ -1185,19 +1184,21 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
       {
         continue;
       }
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_Scaling, 9);
-
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner (this, anIt, AIS_MM_Scaling, 9);
+      }
       // define sensitivity by point
-      Handle(Select3D_SensitivePoint) aPnt = new Select3D_SensitivePoint(anOwner, myAxes[anIt].ScalerCubePosition());
-      aPnt->SetSensitivityFactor (aHighSensitivity);
+      Handle(Select3D_SensitivePoint) aPnt = new Select3D_SensitivePoint (anOwner, myAxes[anIt].ScalerCubePosition());
+      aPnt->SetSensitivityFactor (15);
       theSelection->Add (aPnt);
       // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].ScalerCube().Triangulation(), TopLoc_Location(), Standard_True);
+      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation (anOwner, myAxes[anIt].ScalerCube().Triangulation(), TopLoc_Location(), Standard_True);
       theSelection->Add (aTri);
     }
-    break;
   }
-  case AIS_MM_TranslationPlane:
+
+  if (aMode == AIS_MM_TranslationPlane || aMode == AIS_MM_None)
   {
     for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
     {
@@ -1205,33 +1206,28 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
       {
         continue;
       }
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_TranslationPlane, 9);
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_TranslationPlane, 9);
+      }
 
       // define sensitivity by two crossed lines
-      Standard_Real aSensitivityOffset = ZoomPersistence() ? aHighSensitivity * (0.5 + M_SQRT2) : 0.0;
-      gp_Pnt aP1 = myAxes[((anIt + 1) % 3)].TranslatorTipPosition().Translated (myAxes[((anIt + 2) % 3)].ReferenceAxis().Direction().XYZ() * aSensitivityOffset);
-      gp_Pnt aP2 = myAxes[((anIt + 2) % 3)].TranslatorTipPosition().Translated (myAxes[((anIt + 1) % 3)].ReferenceAxis().Direction().XYZ() * aSensitivityOffset);
+      gp_Pnt aP1, aP2;
+      aP1 = myAxes[((anIt + 1) % 3)].TranslatorTipPosition();
+      aP2 = myAxes[((anIt + 2) % 3)].TranslatorTipPosition();
       gp_XYZ aMidP = (aP1.XYZ() + aP2.XYZ()) / 2.0;
-      gp_XYZ anOrig = aMidP.Normalized().Multiplied (aSensitivityOffset);
 
       Handle(Select3D_SensitiveSegment) aLine1 = new Select3D_SensitiveSegment(anOwner, aP1, aP2);
-      aLine1->SetSensitivityFactor(aLowSensitivity);
-      theSelection->Add (aLine1);
-      Handle(Select3D_SensitiveSegment) aLine2 = new Select3D_SensitiveSegment(anOwner, anOrig, aMidP);
-      aLine2->SetSensitivityFactor (aLowSensitivity);
-      theSelection->Add (aLine2);
+      aLine1->SetSensitivityFactor(10);
+      theSelection->Add(aLine1);
+      Handle(Select3D_SensitiveSegment) aLine2 = new Select3D_SensitiveSegment(anOwner, gp::Origin(), aMidP);
+      aLine2->SetSensitivityFactor(10);
+      theSelection->Add(aLine2);
 
       // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].DraggerSector().Triangulation(), TopLoc_Location(), Standard_True); 
-      theSelection->Add (aTri);
+      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].DraggerSector().Triangulation(), TopLoc_Location(), Standard_True);
+      theSelection->Add(aTri);
     }
-    break;
-  }
-  default:
-  {
-    anOwner = new SelectMgr_EntityOwner(this, 5);
-    break;
-  }
   }
 }
 

src/AIS/AIS_Selection.cxx

@@ -55,38 +55,24 @@ void AIS_Selection::Clear()
 //function : Select
 //purpose  :
 //=======================================================================
-AIS_SelectStatus AIS_Selection::Select (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                        const Handle(SelectMgr_Filter)& theFilter,
-                                        const AIS_SelectionScheme theSelScheme,
-                                        const Standard_Boolean theIsDetected)
+AIS_SelectStatus AIS_Selection::Select (const Handle(SelectMgr_EntityOwner)& theObject)
 {
-  if (theOwner.IsNull()
-  || !theOwner->HasSelectable())
+  if (theObject.IsNull()
+  || !theObject->HasSelectable())
   {
     return AIS_SS_NotDone;
   }
 
-  const Standard_Boolean isDetected = theIsDetected
-                                   && (theFilter.IsNull() || theFilter->IsOk (theOwner));
-
-  const Standard_Boolean wasSelected = theOwner->IsSelected();
-  const Standard_Boolean toSelect = theOwner->Select (theSelScheme, isDetected);
-
-  if (toSelect && !wasSelected)
+  if (!myResultMap.IsBound (theObject))
   {
     AIS_NListOfEntityOwner::Iterator aListIter;
-    myresult.Append  (theOwner, aListIter);
-    myResultMap.Bind (theOwner, aListIter);
-    theOwner->SetSelected (Standard_True);
+    myresult.Append  (theObject, aListIter);
+    myResultMap.Bind (theObject, aListIter);
+    theObject->SetSelected (Standard_True);
     return AIS_SS_Added;
   }
 
-  if (!toSelect && !wasSelected)
-  {
-    return AIS_SS_NotDone;
-  }
-
-  AIS_NListOfEntityOwner::Iterator aListIter = myResultMap.Find (theOwner);
+  AIS_NListOfEntityOwner::Iterator aListIter = myResultMap.Find (theObject);
   if (myIterator == aListIter)
   {
     if (myIterator.More())
@@ -102,14 +88,14 @@ AIS_SelectStatus AIS_Selection::Select (const Handle(SelectMgr_EntityOwner)& the
   // In the mode of advanced mesh selection only one owner is created for all selection modes.
   // It is necessary to check the current detected entity
   // and remove the owner from map only if the detected entity is the same as previous selected (IsForcedHilight call)
-  if (theOwner->IsForcedHilight())
+  if (theObject->IsForcedHilight())
   {
     return AIS_SS_Added;
   }
 
   myresult.Remove (aListIter);
-  myResultMap.UnBind (theOwner);
-  theOwner->SetSelected (Standard_False);
+  myResultMap.UnBind (theObject);
+  theObject->SetSelected (Standard_False);
 
   // update list iterator for next object in <myresult> list if any
   if (aListIter.More())
@@ -156,39 +142,86 @@ void AIS_Selection::SelectOwners (const AIS_NArray1OfEntityOwner& thePickedOwner
                                   const Standard_Boolean theToAllowSelOverlap,
                                   const Handle(SelectMgr_Filter)& theFilter)
 {
-  (void)theToAllowSelOverlap;
-
-  if (theSelScheme == AIS_SelectionScheme_ReplaceExtra
-   && thePickedOwners.Size() == myresult.Size())
+  (void )theToAllowSelOverlap;
+  switch (theSelScheme)
   {
-    // If picked owners is equivalent to the selected then just clear selected.
-    Standard_Boolean isTheSame = Standard_True;
-    for (AIS_NArray1OfEntityOwner::Iterator aPickedIter (thePickedOwners); aPickedIter.More(); aPickedIter.Next())
+    case AIS_SelectionScheme_UNKNOWN:
     {
-      if (!myResultMap.IsBound (aPickedIter.Value()))
+      return;
+    }
+    case AIS_SelectionScheme_ReplaceExtra:
+    {
+      // If picked owners is equivalent to the selected then just clear selected
+      // Else go to AIS_SelectionScheme_Replace
+      if (thePickedOwners.Size() == myresult.Size())
       {
-        isTheSame = Standard_False;
-        break;
+        Standard_Boolean isTheSame = Standard_True;
+        for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+        {
+          if (!myResultMap.IsBound (aSelIter.Value()))
+          {
+            isTheSame = Standard_False;
+            break;
+          }
+        }
+        if (isTheSame)
+        {
+          Clear();
+          return;
+        }
       }
     }
-    if (isTheSame)
+    Standard_FALLTHROUGH
+    case AIS_SelectionScheme_Replace:
     {
-       Clear();
-       return;
+      Clear();
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        appendOwner (aSelIter.Value(), theFilter);
+      }
+
+      return;
     }
-  }
+    case AIS_SelectionScheme_Add:
+    {
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        appendOwner (aSelIter.Value(), theFilter);
+      }
+      return;
+    }
+    case AIS_SelectionScheme_Remove:
+    {
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        if (myResultMap.IsBound (aSelIter.Value()))
+        {
+          Select (aSelIter.Value());
+        }
+      }
+      return;
+    }
+    case AIS_SelectionScheme_XOR:
+    {
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        const Handle(SelectMgr_EntityOwner)& anOwner = aSelIter.Value();
+        if (anOwner.IsNull()
+        || !anOwner->HasSelectable()
+        || !theFilter->IsOk (anOwner))
+        {
+          continue;
+        }
 
-  if (theSelScheme == AIS_SelectionScheme_Replace
-   || theSelScheme == AIS_SelectionScheme_ReplaceExtra
-   || theSelScheme == AIS_SelectionScheme_Clear)
-  {
-    Clear();
-  }
-
-  for (AIS_NArray1OfEntityOwner::Iterator aPickedIter (thePickedOwners); aPickedIter.More(); aPickedIter.Next())
-  {
-    const Handle(SelectMgr_EntityOwner)& anOwner = aPickedIter.Value();
-    Select (anOwner, theFilter, theSelScheme, true);
+        Select (anOwner);
+      }
+      return;
+    }
+    case AIS_SelectionScheme_Clear:
+    {
+      Clear();
+      return;
+    }
   }
 }
 

src/AIS/AIS_Selection.hxx

@@ -34,36 +34,23 @@ public:
 
   //! creates a new selection.
   Standard_EXPORT AIS_Selection();
-
+  
   //! removes all the object of the selection.
   Standard_EXPORT virtual void Clear();
-
+  
   //! if the object is not yet in the selection, it will be added.
   //! if the object is already in the selection, it will be removed.
-  //! @param[in] theOwner element to change selection state
-  //! @param[in] theFilter context filter
-  //! @param[in] theSelScheme selection scheme
-  //! @param[in] theIsDetected flag of object detection
-  //! @return result of selection
-  Standard_EXPORT virtual AIS_SelectStatus Select (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                   const Handle(SelectMgr_Filter)& theFilter,
-                                                   const AIS_SelectionScheme theSelScheme,
-                                                   const Standard_Boolean theIsDetected);
-
+  Standard_EXPORT virtual AIS_SelectStatus Select (const Handle(SelectMgr_EntityOwner)& theObject);
+  
   //! the object is always add int the selection.
   //! faster when the number of objects selected is great.
   Standard_EXPORT virtual AIS_SelectStatus AddSelect (const Handle(SelectMgr_EntityOwner)& theObject);
 
   //! clears the selection and adds the object in the selection.
-  //! @param[in] theObject element to change selection state
-  //! @param[in] theFilter context filter
-  //! @param[in] theIsDetected flag of object detection
-  virtual void ClearAndSelect (const Handle(SelectMgr_EntityOwner)& theObject,
-                               const Handle(SelectMgr_Filter)& theFilter,
-                               const Standard_Boolean theIsDetected)
+  virtual void ClearAndSelect (const Handle(SelectMgr_EntityOwner)& theObject)
   {
     Clear();
-    Select (theObject, theFilter, AIS_SelectionScheme_Add, theIsDetected);
+    Select (theObject);
   }
 
   //! checks if the object is in the selection.

src/AIS/FILES

@@ -2,8 +2,6 @@ AIS.hxx
 AIS_Animation.cxx
 AIS_Animation.hxx
 AIS_AnimationTimer.hxx
-AIS_AnimationAxisRotation.cxx
-AIS_AnimationAxisRotation.hxx
 AIS_AnimationCamera.cxx
 AIS_AnimationCamera.hxx
 AIS_AnimationObject.cxx
@@ -14,8 +12,6 @@ AIS_Axis.cxx
 AIS_Axis.hxx
 AIS_BadEdgeFilter.cxx
 AIS_BadEdgeFilter.hxx
-AIS_BaseAnimationObject.cxx
-AIS_BaseAnimationObject.hxx
 AIS_C0RegularityFilter.cxx
 AIS_C0RegularityFilter.hxx
 AIS_CameraFrustum.cxx

src/Adaptor2d/Adaptor2d_Curve2d.cxx

@@ -13,7 +13,7 @@
 //
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
-
+// branch2
 
 #include <Adaptor2d_Curve2d.hxx>
 #include <Geom2d_BezierCurve.hxx>

src/Adaptor3d/Adaptor3d_Curve.cxx

@@ -13,7 +13,7 @@
 //
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
-
+// branch2
 #include <Adaptor3d_Curve.hxx>
 
 #include <Geom_BezierCurve.hxx>

src/AdvApp2Var/AdvApp2Var_SysBase.cxx

@@ -911,9 +911,10 @@ int macrmsg_(const char *,//crout,
     /* Parameter adjustments */
   ct -= ct_len;
   (void )ct; // unused
-  (void )xt; // unused
-  (void )it; // unused
 
+  --xt;
+  --it;
+  
   /* Function Body */
   mamdlng_(cln, 3L);
   
@@ -1788,7 +1789,7 @@ int maoverf_(integer *nbentr,
     /* Loop. The upper limit is the integer value of the logarithm of base 2
      */
     /* of NBENTR/NLONGR. */
-    i__1 = (integer) (std::log((real) (*nbentr) / (float)63.) / std::log((float)2.))
+    i__1 = (integer) (log((real) (*nbentr) / (float)63.) / log((float)2.))
       ;
     for (ibid = 1; ibid <= i__1; ++ibid) {
       

src/Approx/Approx_CurveOnSurface.cxx

@@ -556,7 +556,7 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
 //function : isIsoLine
 //purpose  :
 //=============================================================================
-Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                                                   Standard_Boolean&                theIsU,
                                                   Standard_Real&                   theParam,
                                                   Standard_Boolean&                theIsForward) const
@@ -638,7 +638,7 @@ Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d
 //function : buildC3dOnIsoLine
 //purpose  :
 //=============================================================================
-Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                                                           const Standard_Boolean           theIsU,
                                                           const Standard_Real              theParam,
                                                           const Standard_Boolean           theIsForward)

src/Approx/Approx_CurveOnSurface.hxx

@@ -85,7 +85,7 @@ protected:
   //! @param theParam     Line parameter.
   //! @param theIsForward Flag indicating forward parameterization on a isoline.
   //! @return Standard_True when 2d curve is a line and Standard_False otherwise.
-  Standard_Boolean isIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+  Standard_Boolean isIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                              Standard_Boolean&                theIsU,
                              Standard_Real&                   theParam,
                              Standard_Boolean&                theIsForward) const;
@@ -97,7 +97,7 @@ protected:
   //! @param theParam Line parameter.
   //! @param theIsForward Flag indicating forward parameterization on a isoline.
   //! @return Standard_True when 3d curve is built and Standard_False otherwise.
-  Standard_Boolean buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+  Standard_Boolean buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                                      const Standard_Boolean           theIsU,
                                      const Standard_Real              theParam,
                                      const Standard_Boolean           theIsForward);

src/BOPAlgo/BOPAlgo_BuilderSolid.cxx

@@ -733,7 +733,7 @@ void MakeInternalShells(const TopTools_IndexedMapOfShape& theMF,
   //
   aNbF = theMF.Extent();
   for (i = 1; i <= aNbF; ++i) {
-    const TopoDS_Shape& aF = theMF(i);
+    TopoDS_Shape aF = theMF(i);
     TopExp::MapShapesAndAncestors(aF, 
         TopAbs_EDGE, TopAbs_FACE, 
         aMEF);

src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx

@@ -62,7 +62,6 @@
 #include <IntTools_SequenceOfCurves.hxx>
 #include <IntTools_SequenceOfPntOn2Faces.hxx>
 #include <IntTools_Tools.hxx>
-#include <NCollection_IncAllocator.hxx>
 #include <NCollection_Vector.hxx>
 #include <Precision.hxx>
 #include <TColStd_ListOfInteger.hxx>
@@ -579,12 +578,14 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
   Standard_Integer i, nF1, nF2, aNbC, aNbP, j;
   Standard_Integer nV1, nV2;
   Standard_Real aT1, aT2;
-  Handle(NCollection_BaseAllocator) aAllocator = new NCollection_IncAllocator;
+  Handle(NCollection_BaseAllocator) aAllocator;
   BOPDS_ListIteratorOfListOfPaveBlock aItLPB;
   TopoDS_Edge aES;
   Handle(BOPDS_PaveBlock) aPBOut;
   //
   //-----------------------------------------------------scope f
+  aAllocator=
+    NCollection_BaseAllocator::CommonBaseAllocator();
   //
   TColStd_ListOfInteger aLSE(aAllocator), aLBV(aAllocator);
   TColStd_MapOfInteger aMVOnIn(100, aAllocator), aMVCommon(100, aAllocator),
@@ -606,23 +607,13 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
   // Map of PaveBlocks with the faces to which it has to be added
   BOPAlgo_DataMapOfPaveBlockListOfInteger aPBFacesMap;
   //
-  // The vector aFFToRecheck contains indices of potentially problematic Face-Face intersections
-  NCollection_Vector<Standard_Integer> aFFToRecheck;
-  // aNbFF may be increased while processing this loop, because it is necessary to recheck 
-  // some of Face-Face intersections to avoid missing section edges
-  // aNbFF will be increased to the number of potentially problematic Face-Face intersections
-  const Standard_Integer aNbFFPrev = aNbFF;
-  for (i = 0; i < aNbFF; ++i, aPS.Next()) 
-  {
+  for (i=0; i<aNbFF; ++i, aPS.Next()) {
     if (UserBreak(aPS))
     {
       return;
     }
-    // after passing through all of Face-Face intersections it is necessary to return
-    // to potentially problematic Face-Face intersections and process them one more time
-    const Standard_Integer aCurInd = i < aNbFFPrev ? i : aFFToRecheck[i - aNbFFPrev];
     //
-    BOPDS_InterfFF& aFF=aFFs(aCurInd);
+    BOPDS_InterfFF& aFF=aFFs(i);
     aFF.Indices(nF1, nF2);
     //
     BOPDS_VectorOfPoint& aVP=aFF.ChangePoints();
@@ -745,9 +736,6 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
       }
     }
 
-    // Added additional check of Face-Face intersection to avoid missing section edges
-    // because of sequence of Face-Face interference processing 
-    Standard_Boolean isToRecheck = aNbC > 0 && i < aNbFFPrev;
     //
     // 3. Make section edges
     for (j=0; j<aNbC; ++j) {
@@ -761,11 +749,6 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
       aLPB.Clear();
       aPB1->Update(aLPB, Standard_False);
       //
-      if (aLPB.Extent() != 0)
-      {
-        isToRecheck = false;
-      }
-
       aItLPB.Initialize(aLPB);
       for (; aItLPB.More(); aItLPB.Next()) {
         Handle(BOPDS_PaveBlock)& aPB=aItLPB.ChangeValue();
@@ -867,7 +850,7 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
             if (aMPBAdd.Add(aPBOut))
             {
               // Add edge for processing as the section edge
-              PreparePostTreatFF(aCurInd, j, aPBOut, aMSCPB, aMVI, aLPBC);
+              PreparePostTreatFF(i, j, aPBOut, aMSCPB, aMVI, aLPBC);
             }
           }
           continue;
@@ -886,7 +869,7 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
         //
         // Keep info for post treatment 
         BOPDS_CoupleOfPaveBlocks aCPB;
-        aCPB.SetIndexInterf(aCurInd);
+        aCPB.SetIndexInterf(i);
         aCPB.SetIndex(j);
         aCPB.SetPaveBlock1(aPB);
         //
@@ -898,17 +881,12 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
         aMVTol.UnBind(nV2);
 
         // Add existing pave blocks for post treatment
-        ProcessExistingPaveBlocks (aCurInd, j, nF1, nF2, aES, aMPBOnIn, aPBTree,
+        ProcessExistingPaveBlocks (i, j, nF1, nF2, aES, aMPBOnIn, aPBTree,
                                    aMSCPB, aMVI, aLPBC, aPBFacesMap, aMPBAdd);
       }
       //
       aLPBC.RemoveFirst();
     }//for (j=0; j<aNbC; ++j) {
-    if (isToRecheck)
-    {
-      aFFToRecheck.Append(aCurInd);
-      ++aNbFF;
-    }
     //
     //back to previous tolerance values for unused vertices
     //and forget about SD groups of such vertices
@@ -932,7 +910,7 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
         aDMVLV.UnBind(nV1);
     }
     //
-    ProcessExistingPaveBlocks(aCurInd, nF1, nF2, aMPBOnIn, aPBTree, aDMBV, aMSCPB, aMVI, aPBFacesMap, aMPBAdd);
+    ProcessExistingPaveBlocks(i, nF1, nF2, aMPBOnIn, aPBTree, aDMBV, aMSCPB, aMVI, aPBFacesMap, aMPBAdd);
   }//for (i=0; i<aNbFF; ++i) {
 
   // Remove "micro" section edges

src/BOPAlgo/BOPAlgo_ShellSplitter.cxx

@@ -248,178 +248,167 @@ void BOPAlgo_ShellSplitter::SplitBlock(BOPTools_ConnexityBlock& aCB)
   //
   // Build the shells
   aItF.Initialize (aLFConnected);
-  for (i = 1; aItF.More() && !bAllFacesTaken; aItF.Next(), ++i)
-  {
+  for (i = 1; aItF.More() && !bAllFacesTaken; aItF.Next(), ++i) {
     const TopoDS_Shape& aFF = aItF.Value();
     if (!AddedFacesMap.Add(aFF)) {
       continue;
     }
     //
     // make a new shell
-    TopoDS_Shell aShell;
-    aBB.MakeShell(aShell);
-    aBB.Add(aShell, aFF);
-
-    aMEFP.Clear();
-    TopExp::MapShapesAndAncestors(aShell, TopAbs_EDGE, TopAbs_FACE, aMEFP);
+    TopoDS_Shell aShellStart;
+    aBB.MakeShell(aShellStart);
+    aBB.Add(aShellStart, aFF);
     //
-    // loop on faces added to Shell; 
-    // add their neighbor faces to Shell and so on
-    aItS.Initialize(aShell);
-    for (; aItS.More(); aItS.Next()) {
-      const TopoDS_Face& aF = (*(TopoDS_Face*)(&aItS.Value()));
-      Standard_Boolean isBoundary = aBoundaryFaces.Contains (aF);
+    TopTools_ListOfShape aLShells;
+    aLShells.Append(aShellStart);
+    //
+    TopTools_ListIteratorOfListOfShape aItLShells(aLShells);
+    for (; aItLShells.More(); aItLShells.Next()) {
+      TopoDS_Shell& aShell = TopoDS::Shell(aItLShells.ChangeValue());
       //
-      // loop on edges of aF; find a good neighbor face of aF by aE
-      aExp.Init(aF, TopAbs_EDGE);
-      for (; aExp.More(); aExp.Next()) {
-        const TopoDS_Edge& aE = (*(TopoDS_Edge*)(&aExp.Current()));
+      aMEFP.Clear();
+      TopExp::MapShapesAndAncestors(aShell, TopAbs_EDGE, TopAbs_FACE, aMEFP);
+      //
+      // loop on faces added to Shell; 
+      // add their neighbor faces to Shell and so on
+      aItS.Initialize(aShell);
+      for (; aItS.More(); aItS.Next()) {
+        const TopoDS_Face& aF = (*(TopoDS_Face*)(&aItS.Value()));
+        Standard_Boolean isBoundary = aBoundaryFaces.Contains (aF);
         //
-        // proceed only free edges in this shell
-        if (aMEFP.Contains(aE)) {
-          const TopTools_ListOfShape& aLFP = aMEFP.FindFromKey(aE);
-          aNbFP = aLFP.Extent();
-          if (aNbFP > 1) {
+        // loop on edges of aF; find a good neighbor face of aF by aE
+        aExp.Init(aF, TopAbs_EDGE);
+        for (; aExp.More(); aExp.Next()) {
+          const TopoDS_Edge& aE = (*(TopoDS_Edge*)(&aExp.Current()));
+          //
+          // proceed only free edges in this shell
+          if (aMEFP.Contains(aE)) {
+            const TopTools_ListOfShape& aLFP = aMEFP.FindFromKey(aE);
+            aNbFP = aLFP.Extent();
+            if (aNbFP > 1) {
+              continue;
+            }
+          }
+          // avoid processing of internal edges
+          anOr = aE.Orientation();
+          if (anOr == TopAbs_INTERNAL) {
             continue;
           }
-        }
-        // avoid processing of internal edges
-        anOr = aE.Orientation();
-        if (anOr == TopAbs_INTERNAL) {
-          continue;
-        }
-        // avoid processing of degenerated edges
-        if (BRep_Tool::Degenerated(aE)) {
-          continue;
-        }
-        //
-        // candidate faces list
-        const TopTools_ListOfShape& aLF = aEFMap.FindFromKey(aE);
-        aNbLF = aLF.Extent();
-        if (!aNbLF) {
-          continue;
-        }
-        //
-        // prepare for selecting the next face
-        // take only not-processed faces as a candidates
-        BOPTools_ListOfCoupleOfShape aLCSOff;
-        //
-        Standard_Integer aNbWaysInside = 0;
-        TopoDS_Face aSelF;
-        TopTools_ListIteratorOfListOfShape aItLF(aLF);
-        for (; aItLF.More(); aItLF.Next()) {
-          const TopoDS_Face& aFL = (*(TopoDS_Face*)(&aItLF.Value()));
-          if (aF.IsSame(aFL) || AddedFacesMap.Contains(aFL)) {
+          // avoid processing of degenerated edges
+          if (BRep_Tool::Degenerated(aE)) {
             continue;
           }
           //
-          // find current edge in the face
-          if (!BOPTools_AlgoTools::GetEdgeOff(aE, aFL, aEL)) {
+          // candidate faces list
+          const TopTools_ListOfShape& aLF = aEFMap.FindFromKey(aE);
+          aNbLF = aLF.Extent();
+          if (!aNbLF) {
             continue;
           }
           //
-          if (isBoundary && !aBoundaryFaces.Contains (aFL))
+          // prepare for selecting the next face
+          // take only not-processed faces as a candidates
+          BOPTools_ListOfCoupleOfShape aLCSOff;
+          //
+          Standard_Integer aNbWaysInside = 0;
+          TopoDS_Face aSelF;
+          TopTools_ListIteratorOfListOfShape aItLF(aLF);
+          for (; aItLF.More(); aItLF.Next()) {
+            const TopoDS_Face& aFL = (*(TopoDS_Face*)(&aItLF.Value()));
+            if (aF.IsSame(aFL) || AddedFacesMap.Contains(aFL)) {
+              continue;
+            }
+            //
+            // find current edge in the face
+            if (!BOPTools_AlgoTools::GetEdgeOff(aE, aFL, aEL)) {
+              continue;
+            }
+            //
+            if (isBoundary && !aBoundaryFaces.Contains (aFL))
+            {
+              ++aNbWaysInside;
+              aSelF = aFL;
+            }
+            aCSOff.SetShape1(aEL);
+            aCSOff.SetShape2(aFL);
+            aLCSOff.Append(aCSOff);
+          }//for (; aItLF.More(); aItLF.Next()) { 
+          //
+          aNbOff = aLCSOff.Extent();
+          if (!aNbOff){
+            continue;
+          }
+          //
+          // among all the adjacent faces chose one with the minimal
+          // angle to the current one
+          if (!isBoundary || aNbWaysInside != 1)
           {
-            ++aNbWaysInside;
-            aSelF = aFL;
+            if (aNbOff == 1) {
+              aSelF = (*(TopoDS_Face*)(&aLCSOff.First().Shape2()));
+            }
+            else if (aNbOff > 1) {
+              BOPTools_AlgoTools::GetFaceOff(aE, aF, aLCSOff, aSelF, aContext);
+            }
           }
-          aCSOff.SetShape1(aEL);
-          aCSOff.SetShape2(aFL);
-          aLCSOff.Append(aCSOff);
-        }//for (; aItLF.More(); aItLF.Next()) { 
-        //
-        aNbOff = aLCSOff.Extent();
-        if (!aNbOff){
-          continue;
-        }
-        //
-        // among all the adjacent faces chose one with the minimal
-        // angle to the current one
-        if (!isBoundary || aNbWaysInside != 1)
-        {
-          if (aNbOff == 1) {
-            aSelF = (*(TopoDS_Face*)(&aLCSOff.First().Shape2()));
+          //
+          if (!aSelF.IsNull() && AddedFacesMap.Add(aSelF)) {
+            aBB.Add(aShell, aSelF);
+            TopExp::MapShapesAndAncestors(aSelF, TopAbs_EDGE, TopAbs_FACE, aMEFP);
           }
-          else if (aNbOff > 1) {
-            BOPTools_AlgoTools::GetFaceOff(aE, aF, aLCSOff, aSelF, aContext);
-          }
-        }
-        //
-        if (!aSelF.IsNull() && AddedFacesMap.Add(aSelF)) {
-          aBB.Add(aShell, aSelF);
-          TopExp::MapShapesAndAncestors(aSelF, TopAbs_EDGE, TopAbs_FACE, aMEFP);
-        }
-      } // for (; aExp.More(); aExp.Next()) {
-    } // for (; aItS.More(); aItS.Next()) {
-    //
-    // split the shell on multi-connected edges
-    TopTools_ListOfShape aLShSp;
-    RefineShell(aShell, aMEFP, aLShSp);
-    //
-    // collect the not closed shells for further processing
-    TopTools_ListOfShape aLShNC;
-    //
-    TopTools_ListIteratorOfListOfShape aItLShSp(aLShSp);
-    for (; aItLShSp.More(); aItLShSp.Next()) {
-      TopoDS_Shell& aShSp = *((TopoDS_Shell*)&aItLShSp.Value());
+        } // for (; aExp.More(); aExp.Next()) {
+      } // for (; aItS.More(); aItS.Next()) {
       //
-      if (BRep_Tool::IsClosed(aShSp)) {
-        aShSp.Closed(Standard_True);
-        myLoops.Append(aShSp);
+      // split the shell on multi-connected edges
+      TopTools_ListOfShape aLShSp;
+      RefineShell(aShell, aMEFP, aLShSp);
+      //
+      // collect the not closed shells for further processing
+      TopTools_ListOfShape aLShNC;
+      //
+      TopTools_ListIteratorOfListOfShape aItLShSp(aLShSp);
+      for (; aItLShSp.More(); aItLShSp.Next()) {
+        TopoDS_Shell& aShSp = *((TopoDS_Shell*)&aItLShSp.Value());
+        //
+        if (BRep_Tool::IsClosed(aShSp)) {
+          aShSp.Closed(Standard_True);
+          myLoops.Append(aShSp);
+        }
+        else {
+          aLShNC.Append(aShSp);
+        }
       }
-      else {
-        aLShNC.Append(aShSp);
+      //
+      bAllFacesTaken = (AddedFacesMap.Extent() == aNbShapes);
+      if (bAllFacesTaken) {
+        break;
       }
-    }
-    //
-    bAllFacesTaken = (AddedFacesMap.Extent() == aNbShapes);
-    if (bAllFacesTaken) {
-      break;
-    }
-    //
-    if (aLShSp.Extent() == 1) {
-      // not further processing of not closed shells is needed,
-      // as it will not bring any new results
-      continue;
-    }
-    //
-    
-    // remove th faces of not closed shells from the map of processed faces
-    // and try to rebuild the shells using all not processed faces,
-    // because faces of one shell might be needed for building the other
-    TopTools_ListIteratorOfListOfShape aItLShNC(aLShNC);
-    for (; aItLShNC.More(); aItLShNC.Next()) 
-    {
-      TopoDS_Iterator aItNC(aItLShNC.Value());
-      for (; aItNC.More(); aItNC.Next()) 
-      {
-        AddedFacesMap.Remove(aItNC.Value());
+      //
+      if (aLShSp.Extent() == 1) {
+        // not further processing of not closed shells is needed,
+        // as it will not bring any new results
+        continue;
+      }
+      //
+      Standard_Integer aNbShNC = aLShNC.Extent();
+      if (aNbShNC == 1) {
+        // try to complete the shell with other faces
+        aLShells.Append(aLShNC);
+      }
+      else if (aNbShNC > 1) {
+        // remove th faces of not closed shells from the map of processed faces
+        // and try to rebuild the shells using all not processed faces,
+        // because faces of one shell might be needed for building the other
+        TopTools_ListIteratorOfListOfShape aItLShNC(aLShNC);
+        for (; aItLShNC.More(); aItLShNC.Next()) {
+          TopoDS_Iterator aItNC(aItLShNC.Value());
+          for (; aItNC.More(); aItNC.Next()) {
+            AddedFacesMap.Remove(aItNC.Value());
+          }
+        }
       }
     }
   } // for (; aItF.More(); aItF.Next()) {
 }
-
-//=======================================================================
-//function : FindShape
-//purpose  : 
-//=======================================================================
-TopoDS_Shape FindShape (const TopoDS_Shape& theShapeToFind,
-                        const TopoDS_Shape& theShape)
-{
-  TopoDS_Shape aRes;
-  TopExp_Explorer anExp(theShape, theShapeToFind.ShapeType());
-  for (; anExp.More(); anExp.Next())
-  {
-    const TopoDS_Shape& aShape = anExp.Current();
-    if (aShape.IsSame(theShapeToFind))
-    {
-      aRes = aShape;
-      break;
-    }
-  }
-  return aRes;
-}
-
 //=======================================================================
 //function : RefineShell
 //purpose  : 
@@ -445,21 +434,6 @@ void RefineShell(TopoDS_Shell& theShell,
       aMEStop.Add(aE);
       continue;
     }
-
-    if (aLF.Extent() == 2)
-    {
-      const TopoDS_Face& aF1 = TopoDS::Face(aLF.First());
-      const TopoDS_Face& aF2 = TopoDS::Face(aLF.Last());
-
-      TopoDS_Shape aE1 = FindShape(aE, aF1);
-      TopoDS_Shape aE2 = FindShape(aE, aF2);
-
-      if (aE1.Orientation() == aE2.Orientation())
-      {
-        aMEStop.Add(aE);
-        continue;
-      }
-    }
     //
     // check for internal edges - count faces, in which the edge
     // is internal, twice

src/BOPAlgo/BOPAlgo_WireSplitter_1.cxx

@@ -512,6 +512,7 @@ void Path (const GeomAdaptor_Surface& aGAS,
     Standard_Integer aNbWaysInside = 0;
     BOPAlgo_EdgeInfo *pOnlyWayIn = NULL;
 
+    Standard_Integer aCurIndexE = 0;
     anIt.Initialize(aLEInfo);
     for (; anIt.More(); anIt.Next()) {
       BOPAlgo_EdgeInfo& anEI=anIt.ChangeValue();
@@ -520,6 +521,7 @@ void Path (const GeomAdaptor_Surface& aGAS,
       anIsNotPassed=!anEI.Passed();
       //
       if (anIsOut && anIsNotPassed) {
+        aCurIndexE++;
         //
         // Is there one way to go out of the vertex 
         // we have to use it only.

src/BOPTest/BOPTest_BOPCommands.cxx

@@ -667,7 +667,7 @@ Standard_Integer bopcurves (Draw_Interpretor& di,
     for (Standard_Integer i=1; i<=aNbCurves; i++) {
       const IntTools_Curve& anIC=aSCs(i);
 
-      const Handle (Geom_Curve)&  aC3D = anIC.Curve();
+      Handle (Geom_Curve)  aC3D = anIC.Curve();
 
       if (aC3D.IsNull()) {
         di << " has Null 3d curve# " << i << "\n";
@@ -682,8 +682,8 @@ Standard_Integer bopcurves (Draw_Interpretor& di,
       DrawTrSurf::Set(nameC, aC3D);
       di << nameC << " ";
       //
-      const Handle(Geom2d_Curve)& aPC1 = anIC.FirstCurve2d();
-      const Handle(Geom2d_Curve)& aPC2 = anIC.SecondCurve2d();
+      Handle(Geom2d_Curve) aPC1 = anIC.FirstCurve2d();
+      Handle(Geom2d_Curve) aPC2 = anIC.SecondCurve2d();
       //
       if (!aPC1.IsNull() || !aPC2.IsNull()) {
         di << "(";

src/BOPTools/BOPTools_AlgoTools3D.cxx

@@ -736,7 +736,7 @@ void Add(const TopoDS_Shape& aS,
     return;
   }
   //
-  const TopoDS_Shape& aSx = aS;
+  TopoDS_Shape aSx = aS;
   //
   anIndex=myShapes.FindIndex(aSx);
   if (!anIndex) {

src/BOPTools/BOPTools_AlgoTools_2.cxx

@@ -112,7 +112,7 @@ void BOPTools_AlgoTools::MakeSectEdge(const IntTools_Curve& aIC,
                                       const Standard_Real  aP2,
                                       TopoDS_Edge& aNewEdge)
 {
-  const Handle(Geom_Curve)& aC=aIC.Curve ();
+  Handle(Geom_Curve) aC=aIC.Curve ();
   
   BRepBuilderAPI_MakeEdge aMakeEdge(aC, aV1, aV2, aP1, aP2);
   

src/BOPTools/BOPTools_PairSelector.hxx

@@ -60,7 +60,7 @@ public: //! @name public interfaces
   //! Clears the indices
   void Clear()
   {
-    myPairs.clear();
+    myPairs.Clear();
   }
 
   //! Sorts the indices

src/BRepAlgo/BRepAlgo.cxx

@@ -383,7 +383,7 @@ TopoDS_Edge  BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire)
   BRepTools_WireExplorer wexp(theWire);
 
   for (; wexp.More(); wexp.Next()) {
-    const TopoDS_Edge& anEdge = wexp.Current();
+    TopoDS_Edge anEdge = wexp.Current();
     Standard_Real fpar, lpar;
     Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, fpar, lpar);
 
@@ -392,7 +392,7 @@ TopoDS_Edge  BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire)
 
     GeomAdaptor_Curve  aGACurve(aCurve);
     GeomAbs_CurveType  aType       = aGACurve.GetType();
-    const Handle(Geom_Curve)& aBasisCurve = aGACurve.Curve();
+    Handle(Geom_Curve) aBasisCurve = aGACurve.Curve();
     Standard_Boolean   isFwd       = (wexp.Orientation() != TopAbs_REVERSED);
 
     if (aBasisCurve->IsPeriodic()) {

src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx

@@ -401,9 +401,12 @@ void BRepAlgo_FaceRestrictor::PerformWithCorrection()
   //---------------------------------------------------------
   // Classification of wires ones compared to the others.
   //---------------------------------------------------------
+  Standard_Integer j,i = 1;
+
   for (it.Initialize(wires) ; it.More(); it.Next()) {
     TopoDS_Wire& W1  = TopoDS::Wire(it.Value());
-    TopTools_ListIteratorOfListOfShape it2(wires);
+    TopTools_ListIteratorOfListOfShape it2(wires);  
+    j = 1;    
 
     if (IsClosed(W1)) {
       TopoDS_Shape aLocalShape = myFace.EmptyCopied();
@@ -419,8 +422,10 @@ void BRepAlgo_FaceRestrictor::PerformWithCorrection()
           Store (W2,W1,keyIsIn,keyContains);
         } 
         it2.Next();
+        j++;
       }
     }
+    i++;
   }
   TopTools_ListOfShape WireExt;
   

src/BRepAlgo/BRepAlgo_Loop.cxx

@@ -42,14 +42,12 @@
 #include <TopTools_SequenceOfShape.hxx>
 
 #include <stdio.h>
-//#define OCCT_DEBUG_ALGO
-//#define DRAW
 #ifdef DRAW
 #include <DBRep.hxx>
 #pragma comment(lib,"TKDraw")
 #endif
 #ifdef OCCT_DEBUG_ALGO
-Standard_Boolean AffichLoop  = Standard_True;
+Standard_Boolean AffichLoop  = Standard_False;
 Standard_Integer NbLoops     = 0;
 Standard_Integer NbWires     = 1;
 static char* name = new char[100];
@@ -60,8 +58,7 @@ static char* name = new char[100];
 //purpose  : 
 //=======================================================================
 
-BRepAlgo_Loop::BRepAlgo_Loop():
-  myTolConf (0.001)
+BRepAlgo_Loop::BRepAlgo_Loop()
 {
 }
 
@@ -188,6 +185,7 @@ static TopoDS_Vertex  UpdateClosedEdge(const TopoDS_Edge&         E,
   Standard_Boolean OnStart = 0, OnEnd = 0;
   //// modified by jgv, 13.04.04 for OCC5634 ////
   TopExp::Vertices (E,V1,V2);
+  //Standard_Real    Tol = Precision::Confusion();
   Standard_Real    Tol = BRep_Tool::Tolerance( V1 );
   ///////////////////////////////////////////////
   
@@ -284,7 +282,7 @@ static void RemovePendingEdges(TopTools_IndexedDataMapOfShapeListOfShape& MVE)
 //purpose  : 
 //=======================================================================
 
-static Standard_Boolean  SamePnt2d(const TopoDS_Vertex&  V,
+static Standard_Boolean  SamePnt2d(TopoDS_Vertex  V,
 				   TopoDS_Edge&   E1,
 				   TopoDS_Edge&   E2,
 				   TopoDS_Face&   F)
@@ -429,12 +427,13 @@ static void StoreInMVE (const TopoDS_Face&                  F,
 			TopoDS_Edge&                  E,
 			TopTools_IndexedDataMapOfShapeListOfShape& MVE,
 			Standard_Boolean&                   YaCouture,
-			TopTools_DataMapOfShapeShape& VerticesForSubstitute,
-            const Standard_Real theTolConf)
+			TopTools_DataMapOfShapeShape& VerticesForSubstitute )
 {      
   TopoDS_Vertex V1, V2, V;
   TopTools_ListOfShape Empty;
   
+  Standard_Real Tol = 0.001; //5.e-05; //5.e-07;
+//  gp_Pnt P1, P2, P;
   gp_Pnt P1, P;
   BRep_Builder BB;
   for (Standard_Integer iV = 1; iV <= MVE.Extent(); iV++)
@@ -450,7 +449,7 @@ static void StoreInMVE (const TopoDS_Face&                  F,
 	{
 	  V1 = TopoDS::Vertex( itl.Value() );
 	  P1 = BRep_Tool::Pnt( V1 );
-	  if (P.IsEqual( P1, theTolConf ) && !V.IsSame(V1))
+	  if (P.IsEqual( P1, Tol ) && !V.IsSame(V1))
 	    {
 	      V.Orientation( V1.Orientation() );
 	      if (VerticesForSubstitute.IsBound( V1 ))
@@ -575,7 +574,7 @@ void BRepAlgo_Loop::Perform()
         TopoDS_Edge& E = TopoDS::Edge(itl1.Value());
         if (!Emap.Add(E))
           continue;
-        StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute, myTolConf);
+        StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute);
       }
     }
   }
@@ -587,7 +586,7 @@ void BRepAlgo_Loop::Perform()
   for (itl.Initialize(myConstEdges); itl.More(); itl.Next()) {
     TopoDS_Edge& E = TopoDS::Edge(itl.Value());
     if (DejaVu.Add(E))
-      StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute, myTolConf);
+      StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute);
   }
 
 #ifdef DRAW
@@ -627,42 +626,42 @@ void BRepAlgo_Loop::Perform()
     //--------------------------------
     RemovePendingEdges(MVE);
 
-    if (MVE.Extent() == 0) break;
+    if (MVE.Extent() == 0) break; 
     //--------------------------------
     // Start edge.
     //--------------------------------
     EF = CE = TopoDS::Edge(MVE(1).First());
-    TopExp::Vertices(CE, V1, V2);
+    TopExp::Vertices(CE,V1,V2);
     //--------------------------------
     // VF vertex start of new wire
     //--------------------------------
-    if (CE.Orientation() == TopAbs_FORWARD) { CV = VF = V1; }
-    else { CV = VF = V2; }
+    if (CE.Orientation() == TopAbs_FORWARD) { CV = VF = V1;}
+    else                                    { CV = VF = V2;}
     if (!MVE.Contains(CV)) continue;
     TopTools_ListOfShape& aListEdges = MVE.ChangeFromKey(CV);
-    for (itl.Initialize(aListEdges); itl.More(); itl.Next()) {
+    for ( itl.Initialize(aListEdges); itl.More(); itl.Next()) {
       if (itl.Value().IsEqual(CE)) {
-        aListEdges.Remove(itl);
-        break;
+	aListEdges.Remove(itl);
+	break;
       }
     }
-    End = Standard_False;
-
+    End  = Standard_False;
+    
     while (!End) {
       //-------------------------------
       // Construction of a wire.
       //-------------------------------
-      TopExp::Vertices(CE, V1, V2);
+      TopExp::Vertices(CE,V1,V2);
       if (!CV.IsSame(V1)) CV = V1; else CV = V2;
 
-      B.Add(NW, CE);
+      B.Add (NW,CE);
       UsedEdges.Add(CE);
 
       if (!MVE.Contains(CV) || MVE.FindFromKey(CV).IsEmpty()) {
         End = Standard_True;
       }
       else {
-        End = !SelectEdge(myFace, CE, CV, NE, MVE.ChangeFromKey(CV));
+        End = !SelectEdge(myFace,CE,CV,NE,MVE.ChangeFromKey(CV));
         if (!End) {
           CE = NE;
           if (MVE.FindFromKey(CV).IsEmpty())
@@ -673,41 +672,35 @@ void BRepAlgo_Loop::Perform()
     //--------------------------------------------------
     // Add new wire to the set of wires
     //------------------------------------------------
+    Standard_Real Tol = 0.001; //5.e-05; //5.e-07;
+    TopExp_Explorer explo( NW, TopAbs_VERTEX );
+    for (; explo.More(); explo.Next())
+      {
+      const TopoDS_Vertex& aV = TopoDS::Vertex( explo.Current() );
+      Handle(BRep_TVertex)& TV = *((Handle(BRep_TVertex)*) &(aV).TShape());
+      TV->Tolerance( Tol );
+      TV->Modified( Standard_True );
+      }
+    for (explo.Init( NW, TopAbs_EDGE ); explo.More(); explo.Next())
+      {
+      const TopoDS_Edge& aE = TopoDS::Edge( explo.Current() );
+      Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*) &(aE).TShape());
+      TE->Tolerance( Tol );
+      TE->Modified( Standard_True );
+      }
 
-    if (VF.IsSame(CV))
+    if (VF.IsSame(CV) && SamePnt2d(VF,EF,CE,myFace))
     {
-      if (SamePnt2d(VF, EF, CE, myFace))
-      {
-        NW.Closed(Standard_True);
-        myNewWires.Append(NW);
-      }
-      else if(BRep_Tool::Tolerance(VF) < myTolConf)
-      {
-        BRep_Builder aBB;
-        aBB.UpdateVertex(VF, myTolConf);
-        if (SamePnt2d(VF, EF, CE, myFace))
-        {
-          NW.Closed(Standard_True);
-          myNewWires.Append(NW);
-        }
-#ifdef OCCT_DEBUG_ALGO
-        else
-        {
-          std::cout << "BRepAlgo_Loop: Open Wire" << std::endl;
-          if (AffichLoop)
-            std::cout << "OpenWire is : NW_" << NbLoops << "_" << NbWires << std::endl;
-        }
-#endif
-      }
+      NW.Closed (Standard_True);
+      myNewWires.Append (NW);
     }
 #ifdef OCCT_DEBUG_ALGO
     else {
-      std::cout << "BRepAlgo_Loop: Open Wire" << std::endl;
+      std::cout <<"BRepAlgo_Loop: Open Wire"<<std::endl;
       if (AffichLoop)
-        std::cout << "OpenWire is : NW_" << NbLoops << "_" << NbWires << std::endl;
-    }
+        std::cout << "OpenWire is : NW_"<<NbLoops<<"_"<<NbWires<<std::endl;
+      }
 #endif
-
 #ifdef DRAW
     if (AffichLoop) {
       sprintf(name,"NW_%d_%d",NbLoops,NbWires++);	
@@ -784,6 +777,8 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
       VF = TopoDS::Vertex(aLocalV);
       aLocalV = VCEI.Oriented(TopAbs_REVERSED); 
       VL = TopoDS::Vertex(aLocalV);
+//      VF = TopoDS::Vertex(VCEI.Oriented(TopAbs_FORWARD));
+//      VL = TopoDS::Vertex(VCEI.Oriented(TopAbs_REVERSED)); 
     }
     SV.Prepend(VF);
     SV.Append(VL);
@@ -818,9 +813,13 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
       B.Add  (NewEdge,aLocalEdge);
       aLocalEdge = V2.Oriented(TopAbs_REVERSED);
       B.Add  (TopoDS::Edge(NewEdge),aLocalEdge);
+//      B.Add  (NewEdge,V1.Oriented(TopAbs_FORWARD));
+//      B.Add  (NewEdge,V2.Oriented(TopAbs_REVERSED));
       if (V1.IsSame(VF)) 
 	U1 = f;
       else 
+//	U1=BRep_Tool::Parameter
+//	  (TopoDS::Vertex(V1.Oriented(TopAbs_INTERNAL)),WE);
 	{
 	  TopoDS_Shape aLocalV = V1.Oriented(TopAbs_INTERNAL);
 	  U1=BRep_Tool::Parameter(TopoDS::Vertex(aLocalV),WE);
@@ -831,6 +830,8 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
 	{
 	  TopoDS_Shape aLocalV = V2.Oriented(TopAbs_INTERNAL);
 	  U2=BRep_Tool::Parameter(TopoDS::Vertex(aLocalV),WE);
+//	U2=BRep_Tool::Parameter
+//	  (TopoDS::Vertex(V2.Oriented(TopAbs_INTERNAL)),WE);
 	}
       B.Range (TopoDS::Edge(NewEdge),U1,U2);
 #ifdef DRAW

src/BRepAlgo/BRepAlgo_Loop.hxx

@@ -86,17 +86,8 @@ public:
   
   Standard_EXPORT void VerticesForSubstitute (TopTools_DataMapOfShapeShape& VerVerMap);
 
-  //! Set maximal tolerance used for comparing distaces between vertices. 
-  void SetTolConf(const Standard_Real theTolConf)
-  {
-    myTolConf = theTolConf;
-  }
 
-  //! Get maximal tolerance used for comparing distaces between vertices. 
-  Standard_Real GetTolConf() const
-  {
-    return myTolConf;
-  }
+
 
 protected:
 
@@ -117,7 +108,6 @@ private:
   TopTools_DataMapOfShapeListOfShape myCutEdges;
   TopTools_DataMapOfShapeShape myVerticesForSubstitute;
   BRepAlgo_Image myImageVV;
-  Standard_Real myTolConf;
 
 
 };

src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx

@@ -34,8 +34,6 @@ public:
 
   DEFINE_STANDARD_ALLOC
 
-  //! Returns a shape built by the shape construction algorithm.
-  //! Does not check if the shape is built.
   Standard_EXPORT virtual const TopoDS_Shape& Shape() Standard_OVERRIDE;
 
   // Provide access to methods of protected base class BOPAlgo_Options

src/BRepBlend/BRepBlend_CSWalking.hxx

@@ -51,7 +51,7 @@ public:
   
   Standard_EXPORT BRepBlend_CSWalking(const Handle(Adaptor3d_Curve)& Curv, const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain);
   
-  Standard_EXPORT void Perform (Blend_CSFunction& F, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_CSFunction& F, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
   
   Standard_EXPORT Standard_Boolean Complete (Blend_CSFunction& F, const Standard_Real Pmin);
   
@@ -80,7 +80,7 @@ private:
   Handle(Adaptor3d_Surface) surf;
   Handle(Adaptor3d_Curve) curv;
   Handle(Adaptor3d_TopolTool) domain;
-  Standard_Real tolpoint3d;
+  Standard_Real tolesp;
   Standard_Real tolgui;
   Standard_Real pasmax;
   Standard_Real fleche;

src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx

@@ -173,7 +173,7 @@ BRepBlend_RstRstLineBuilder::BRepBlend_RstRstLineBuilder
  done(Standard_False), sol(1, 2), surf1(Surf1),
  domain1(Domain1), surf2(Surf2),
  domain2(Domain2), rst1(Rst1), rst2(Rst2),
- tolpoint3d(0.0), tolgui(0.0), pasmax(0.0),
+ tolesp(0.0), tolgui(0.0), pasmax(0.0),
  fleche(0.0), param(0.0), rebrou(Standard_False),
  iscomplete(Standard_False), comptra(Standard_False), sens(0.0),
  decrochdeb(Blend_NoDecroch), decrochfin(Blend_NoDecroch)
@@ -193,9 +193,9 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
 					  const Standard_Real     Pdep,
 					  const Standard_Real     Pmax,
 					  const Standard_Real     MaxStep,
-            const Standard_Real     Tol3d,
 					  const Standard_Real     TolGuide,
 					  const math_Vector&      ParDep,
+					  const Standard_Real     Tolesp,
 					  const Standard_Real     Fleche,
 					  const Standard_Boolean  Appro) 
 {
@@ -203,7 +203,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
   iscomplete = Standard_False;
   comptra    = Standard_False;
   line       = new BRepBlend_Line();
-  tolpoint3d   = Tol3d;
+  tolesp     = Abs(Tolesp);
   tolgui     = Abs(TolGuide);
   fleche     = Abs(Fleche);
   rebrou     = Standard_False;
@@ -225,7 +225,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
     TopAbs_State siturst1, siturst2;
     Blend_DecrochStatus decroch;
     math_Vector tolerance(1, 2), infbound(1, 2), supbound(1, 2);
-    Func.GetTolerance(tolerance, tolpoint3d);
+    Func.GetTolerance(tolerance, tolesp);
     Func.GetBounds(infbound, supbound);
     math_FunctionSetRoot rsnld(Func, tolerance, 30);
     
@@ -258,9 +258,9 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
   U = previousP.ParameterOnC1();
   V = previousP.ParameterOnC2();
   BRepBlend_Extremity ptf1 (previousP.PointOnC1(),
-			    U, previousP.Parameter(),tolpoint3d);
+			    U, previousP.Parameter(),tolesp);
   BRepBlend_Extremity ptf2 (previousP.PointOnC2(),
-			    V, previousP.Parameter(),tolpoint3d);
+			    V, previousP.Parameter(),tolesp);
   if (!previousP.IsTangencyPoint()) {
     ptf1.SetTangent(previousP.TangentOnC1());
     ptf2.SetTangent(previousP.TangentOnC2());
@@ -291,7 +291,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
  const Standard_Real     Pdep,
  const Standard_Real     Pmax,
  const math_Vector&      ParDep,
- const Standard_Real     Tol3d,
+ const Standard_Real     Tolesp,
  const Standard_Real     TolGuide,
  const Standard_Boolean  RecRst1,
  const Standard_Boolean  RecP1,
@@ -304,7 +304,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
   iscomplete = Standard_False;
   comptra    = Standard_False;
   line       = new BRepBlend_Line();
-  tolpoint3d   = Tol3d;
+  tolesp     = Abs(Tolesp);
   tolgui     = Abs(TolGuide);
   rebrou     = Standard_False;
   
@@ -327,7 +327,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
   wp1   = wp2 = wrst1 = wrst2 = Pmax;
   param = Pdep;
   Func.Set(param);
-  Func.GetTolerance(tolerance, tolpoint3d);
+  Func.GetTolerance(tolerance, tolesp);
   Func.GetBounds(infbound, supbound);
 
   math_FunctionSetRoot rsnld(Func, tolerance, 30);
@@ -573,7 +573,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 
   //IntSurf_Transition Tline, Tarc;
 
-  Func.GetTolerance(tolerance, tolpoint3d);
+  Func.GetTolerance(tolerance, tolesp);
   Func.GetBounds(infbound, supbound);
 
   math_FunctionSetRoot rsnld(Func, tolerance, 30);
@@ -595,14 +595,14 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
     if (rsnld.IsDone()) {
       rsnld.Root(sol);
       Blend_Point bp1;
-      if(BBPP(param, Func, sol, tolpoint3d, bp1)){
+      if(BBPP(param, Func, sol, tolesp, bp1)){
 	Standard_Real dw = 1.e-10;
 	Func.Set(param + dw);
 	rsnld.Perform(Func, parinit, infbound, supbound);
 	if (rsnld.IsDone()) {
 	  rsnld.Root(sol);
 	  Blend_Point bp2;
-	  if(BBPP(param + dw, Func, sol, tolpoint3d, bp2)){
+	  if(BBPP(param + dw, Func, sol, tolesp, bp2)){
 	    tracederiv(Func, bp1, bp2);
 	  }
 	}
@@ -854,7 +854,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 	  Arrive = Standard_True;
 	  Extrst1.SetValue(previousP.PointOnC1(),
 			   previousP.ParameterOnC1(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2);
 	  // Show that end is on Bound.
 	}
@@ -873,10 +873,10 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 	if (Abs(stepw) < tolgui) {
 	  Extrst1.SetValue(previousP.PointOnC1(),
 			   previousP.ParameterOnC1(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  Extrst2.SetValue(previousP.PointOnC2(),
 			   previousP.ParameterOnC2(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  Arrive = Standard_True;
 #ifdef OCCT_DEBUG
 	  if (line->NbPoints()>=2) {
@@ -913,7 +913,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 	  Arrive = Standard_True;
 	  Extrst1.SetValue(previousP.PointOnC1(),
 			   previousP.ParameterOnC1(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2);
 	  // Indicate that end is on Bound.
 	}
@@ -993,10 +993,10 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 #endif
 	Extrst1.SetValue(previousP.PointOnC1(),
 			 previousP.ParameterOnC1(),
-			 previousP.Parameter(), tolpoint3d);
+			 previousP.Parameter(), tolesp);
 	Extrst2.SetValue(previousP.PointOnC2(),
 			 previousP.ParameterOnC2(),
-			 previousP.Parameter(), tolpoint3d);
+			 previousP.Parameter(), tolesp);
 	Arrive = Standard_True;
       }
       break;
@@ -1029,7 +1029,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
 						       Handle(Adaptor3d_HVertex)& Vtx) 
 {
   math_Vector toler(1, 3), infb(1, 3), supb(1, 3);
-  Finv.GetTolerance(toler, tolpoint3d);
+  Finv.GetTolerance(toler, tolesp);
   Finv.GetBounds(infb, supb);
   Solinv(1) = param;
   Solinv(2) = sol(2);
@@ -1049,7 +1049,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
 
   // It is necessary to check if the function value meets the
   // second restriction
-  if (Finv.IsSolution(Solinv, tolpoint3d)) {
+  if (Finv.IsSolution(Solinv, tolesp)) {
     Standard_Real w = Solinv(2);
     if(w < rst2->FirstParameter() - toler(2)||
        w > rst2->LastParameter() + toler(2)){
@@ -1079,7 +1079,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
 
     math_Vector infbound(1, 2), supbound(1, 2);
     math_Vector parinit(1, 2), tolerance(1, 2);
-    Func.GetTolerance(tolerance, tolpoint3d);
+    Func.GetTolerance(tolerance, tolesp);
     Func.GetBounds(infbound, supbound);
 
     math_FunctionSetRoot rsnld2(Func, tolerance, 30);
@@ -1112,7 +1112,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
 						       Handle(Adaptor3d_HVertex)& Vtx) 
 {
   math_Vector toler(1, 3), infb(1, 3), supb(1, 3);
-  Finv.GetTolerance(toler, tolpoint3d);
+  Finv.GetTolerance(toler, tolesp);
   Finv.GetBounds(infb, supb);
   Solinv(1) = param;
   Solinv(2) = sol(1);
@@ -1130,7 +1130,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
   rsnld.Root(Solinv);
 
   // It is necessary to check the value of the function
-  if (Finv.IsSolution(Solinv, tolpoint3d)) {
+  if (Finv.IsSolution(Solinv, tolesp)) {
     Standard_Real w = Solinv(2);
     if(w < rst1->FirstParameter() - toler(2)||
        w > rst1->LastParameter() + toler(2)){
@@ -1159,7 +1159,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
    
     math_Vector infbound(1, 2), supbound(1, 2);
     math_Vector parinit(1,2), tolerance(1,2);
-    Func.GetTolerance(tolerance, tolpoint3d);
+    Func.GetTolerance(tolerance, tolesp);
     Func.GetBounds(infbound, supbound);
 
     math_FunctionSetRoot rsnld2(Func, tolerance, 30);
@@ -1199,7 +1199,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
 
   FinvP.Set(thepoint);
   math_Vector toler(1,2), infb(1, 2), supb(1, 2);
-  FinvP.GetTolerance(toler, tolpoint3d);
+  FinvP.GetTolerance(toler, tolesp);
   FinvP.GetBounds(infb, supb);
   Solinv(1) = param;
   Solinv(2) = sol(2);
@@ -1214,7 +1214,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
   }
   rsnld.Root(Solinv);
   
-  if(FinvP.IsSolution(Solinv, tolpoint3d)){
+  if(FinvP.IsSolution(Solinv, tolesp)){
     gp_Pnt2d p2drst2  = rst2->Value(Solinv(2));
     TopAbs_State situ = domain2->Classify(p2drst2, toler(2), 0);
     if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
@@ -1267,7 +1267,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&
 
   FinvP.Set(thepoint);
   math_Vector toler(1,2), infb(1, 2), supb(1, 2);
-  FinvP.GetTolerance(toler, tolpoint3d);
+  FinvP.GetTolerance(toler, tolesp);
   FinvP.GetBounds(infb, supb);
   Solinv(1) = param;
   Solinv(2) = sol(1);
@@ -1282,7 +1282,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&
   }
   rsnld.Root(Solinv);
   
-  if(FinvP.IsSolution(Solinv, tolpoint3d)){
+  if(FinvP.IsSolution(Solinv, tolesp)){
     gp_Pnt2d p2drst1  = rst1->Value(Solinv(2));
     TopAbs_State situ = domain1->Classify(p2drst1, toler(2), 0);
     if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
@@ -1378,7 +1378,7 @@ void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
   if (OnFirst) {
     Extrem.SetValue(previousP.PointOnC1(),
 		    sol(1),
-		    previousP.Parameter(), tolpoint3d);
+		    previousP.Parameter(), tolesp);
     if (!previousP.IsTangencyPoint()) 
       Extrem.SetTangent(previousP.TangentOnC1());
     Iter = domain1;
@@ -1386,7 +1386,7 @@ void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
   else {
     Extrem.SetValue(previousP.PointOnC2(),
 		    sol(2),
-		    previousP.Parameter(), tolpoint3d);
+		    previousP.Parameter(), tolesp);
     if (!previousP.IsTangencyPoint()) 
       Extrem.SetTangent(previousP.TangentOnC1());
     Iter = domain2;
@@ -1453,13 +1453,12 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
   Norme = Corde.SquareMagnitude();
   if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
 
-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d) {
+  if (Norme <= tolesp * tolesp) {
     // it can be necessary to force the same point
     return Blend_SamePoints;
   }
   if(!prevpointistangent){
-    if (prevNorme <= toler3d * toler3d) {
+    if (prevNorme <= tolesp * tolesp) {
       return Blend_SamePoints;
     }
     Cosi = sens * Corde * prevTg;
@@ -1531,13 +1530,12 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
   Norme = Corde.SquareMagnitude();
   if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
 
-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d){
+  if (Norme <= tolesp * tolesp){
     // it can be necessary to force the same point
     return Blend_SamePoints;
   }
   if (!prevpointistangent) {
-    if (prevNorme <= toler3d * toler3d) {
+    if (prevNorme <= tolesp * tolesp) {
       return Blend_SamePoints;
     }
     Cosi = sens * Corde * prevTg;
@@ -1599,7 +1597,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func,
   IntSurf_TypeTrans trarst1 = IntSurf_Undecided, trarst2 = IntSurf_Undecided;
   Blend_Point curpoint;
 
-  if (Func.IsSolution(sol, tolpoint3d)) {
+  if (Func.IsSolution(sol, tolesp)) {
     Standard_Boolean curpointistangent = Func.IsTangencyPoint();
     ptrst1   = Func.PointOnRst1();
     ptrst2   = Func.PointOnRst2();
@@ -1646,7 +1644,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func,
       Standard_Real testra = tg2drst1.Dot(tg2drstref);
       TopAbs_Orientation Or = domain1->Orientation(rst1);
 
-      if (Abs(testra) > tolpoint3d) {
+      if (Abs(testra) > tolesp) {
 	if (testra < 0.) {
           trarst1 = ConvOrToTra(TopAbs::Reverse(Or));
 	}
@@ -1658,7 +1656,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func,
 	testra = tg2drst2.Dot(tg2drstref);
 
 	Or = domain2->Orientation(rst2);
-	if (Abs(testra) > tolpoint3d) {
+	if (Abs(testra) > tolesp) {
 	  if (testra < 0.) {
 	    trarst2 = ConvOrToTra(TopAbs::Reverse(Or));
 	  }
@@ -1707,7 +1705,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::CheckInside(Blend_RstRstFunction&
 {
 //  Standard_Boolean inside = Standard_True;
   math_Vector tolerance(1, 2);
-  Func.GetTolerance(tolerance, tolpoint3d);
+  Func.GetTolerance(tolerance, tolesp);
 
   //face pcurve 1.
   Standard_Real v = sol(1);

src/BRepBlend/BRepBlend_RstRstLineBuilder.hxx

@@ -72,9 +72,9 @@ public:
   
   Standard_EXPORT BRepBlend_RstRstLineBuilder(const Handle(Adaptor3d_Surface)& Surf1, const Handle(Adaptor2d_Curve2d)& Rst1, const Handle(Adaptor3d_TopolTool)& Domain1, const Handle(Adaptor3d_Surface)& Surf2, const Handle(Adaptor2d_Curve2d)& Rst2, const Handle(Adaptor3d_TopolTool)& Domain2);
   
-  Standard_EXPORT void Perform (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
   
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real& Psol, math_Vector& ParSol);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real& Psol, math_Vector& ParSol);
   
   Standard_EXPORT Standard_Boolean Complete (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pmin);
   
@@ -134,7 +134,7 @@ private:
   Handle(Adaptor3d_TopolTool) domain2;
   Handle(Adaptor2d_Curve2d) rst1;
   Handle(Adaptor2d_Curve2d) rst2;
-  Standard_Real tolpoint3d;
+  Standard_Real tolesp;
   Standard_Real tolgui;
   Standard_Real pasmax;
   Standard_Real fleche;

src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx

@@ -210,7 +210,7 @@ BRepBlend_SurfRstLineBuilder::BRepBlend_SurfRstLineBuilder
  const Handle(Adaptor3d_TopolTool)& Domain2):
  done(Standard_False), sol(1, 3), surf1(Surf1),
  domain1(Domain1), surf2(Surf2), rst(Rst),
- domain2(Domain2), tolpoint3d(0.0), tolpoint2d(0.0), tolgui(0.0),
+ domain2(Domain2), tolesp(0.0), tolgui(0.0),
  pasmax(0.0), fleche(0.0), param(0.0),
  rebrou(Standard_False), iscomplete(Standard_False),
  comptra(Standard_False), sens(0.0),
@@ -230,10 +230,9 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
 					   const Standard_Real     Pdep,
 					   const Standard_Real     Pmax,
 					   const Standard_Real     MaxStep,
-             const Standard_Real     Tol3d,
-             const Standard_Real     Tol2d,
 					   const Standard_Real     TolGuide,
 					   const math_Vector&      ParDep,
+					   const Standard_Real     Tolesp,
 					   const Standard_Real     Fleche,
 					   const Standard_Boolean  Appro) 
 {
@@ -241,8 +240,7 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
   iscomplete = Standard_False;
   comptra = Standard_False;
   line = new BRepBlend_Line();
-  tolpoint3d = Tol3d;
-  tolpoint2d = Tol2d;
+  tolesp = Abs(Tolesp);
   tolgui = Abs(TolGuide);
   fleche = Abs(Fleche);
   rebrou = Standard_False;
@@ -264,7 +262,7 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
     TopAbs_State siturst,situs;
     Standard_Boolean decroch;
     math_Vector tolerance(1,3),infbound(1,3),supbound(1,3);
-    Func.GetTolerance(tolerance,tolpoint3d);
+    Func.GetTolerance(tolerance,tolesp);
     Func.GetBounds(infbound,supbound);
     math_FunctionSetRoot rsnld(Func,tolerance,30);
     
@@ -298,9 +296,9 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
 //  W = previousP.ParameterOnC();
   
   BRepBlend_Extremity ptf1(previousP.PointOnS(),
-			   U,V,previousP.Parameter(),tolpoint3d);
+			   U,V,previousP.Parameter(),tolesp);
   BRepBlend_Extremity ptf2(previousP.PointOnC(),
-			   U,V,previousP.Parameter(),tolpoint3d);
+			   U,V,previousP.Parameter(),tolesp);
   if (!previousP.IsTangencyPoint()) {
     ptf1.SetTangent(previousP.TangentOnS());
     ptf2.SetTangent(previousP.TangentOnC());
@@ -329,8 +327,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
  const Standard_Real     Pdep,
  const Standard_Real     Pmax,
  const math_Vector&      ParDep,
- const Standard_Real     Tol3d,
- const Standard_Real     Tol2d,
+ const Standard_Real     Tolesp,
  const Standard_Real     TolGuide,
  const Standard_Boolean  RecRst,
  const Standard_Boolean  RecP,
@@ -342,8 +339,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
   iscomplete = Standard_False;
   comptra = Standard_False;
   line = new BRepBlend_Line();
-  tolpoint3d = Tol3d;
-  tolpoint2d = Tol2d;
+  tolesp = Abs(Tolesp);
   tolgui = Abs(TolGuide);
   rebrou = Standard_False;
   
@@ -366,7 +362,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
   wp = wrst = ws = Pmax;
   param = Pdep;
   Func.Set(param);
-  Func.GetTolerance(tolerance,tolpoint3d);
+  Func.GetTolerance(tolerance,tolesp);
   Func.GetBounds(infbound,supbound);
 
   math_FunctionSetRoot rsnld(Func,tolerance,30);
@@ -540,7 +536,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 
   //IntSurf_Transition Tline,Tarc;
 
-  Func.GetTolerance(tolerance,tolpoint3d);
+  Func.GetTolerance(tolerance,tolesp);
   Func.GetBounds(infbound,supbound);
 
   math_FunctionSetRoot rsnld(Func,tolerance,30);
@@ -562,14 +558,14 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
     if (rsnld.IsDone()) {
       rsnld.Root(sol);
       Blend_Point bp1;
-      if(BBPP(param,Func,sol,tolpoint3d,bp1)){
+      if(BBPP(param,Func,sol,tolesp,bp1)){
 	Standard_Real dw = 1.e-10;
 	Func.Set(param+dw);
 	rsnld.Perform(Func,parinit,infbound,supbound);
 	if (rsnld.IsDone()) {
 	  rsnld.Root(sol);
 	  Blend_Point bp2;
-	  if(BBPP(param+dw,Func,sol,tolpoint3d,bp2)){
+	  if(BBPP(param+dw,Func,sol,tolesp,bp2)){
 	    tracederiv(Func,bp1,bp2);
 	  }
 	}
@@ -750,7 +746,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	  Arrive = Standard_True;
 	  Exts.SetValue(previousP.PointOnS(),
 			sol(1),sol(2),
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	  MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
 	  // Indicate end on Bound.
 	}
@@ -769,10 +765,10 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	if (Abs(stepw) < tolgui) {
 	  previousP.ParametersOnS(U,V);
 	  Exts.SetValue(previousP.PointOnS(),U,V,
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	  Extrst.SetValue(previousP.PointOnC(),
 			  previousP.ParameterOnC(),
-			  previousP.Parameter(),tolpoint3d);
+			  previousP.Parameter(),tolesp);
 	  Arrive = Standard_True;
 	  if (line->NbPoints()>=2) {
 	    // Indicate that one stops during the processing
@@ -808,7 +804,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	if (param == Bound) {
 	  Arrive = Standard_True;
 	  Exts.SetValue(previousP.PointOnS(),sol(1),sol(2),
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	  MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
 	  // Indicate end on Bound.
 	}
@@ -854,7 +850,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	  line->Prepend(previousP);
 	}
 	Exts.SetValue(previousP.PointOnS(),sol(1),sol(2),
-		      previousP.Parameter(),tolpoint3d);
+		      previousP.Parameter(),tolesp);
 	MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
 	Arrive = Standard_True;
       }
@@ -887,10 +883,10 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 #endif
 	previousP.ParametersOnS(U,V);
 	Exts.SetValue(previousP.PointOnS(),U,V,
-		      previousP.Parameter(),tolpoint3d);
+		      previousP.Parameter(),tolesp);
 	Extrst.SetValue(previousP.PointOnC(),
 			previousP.ParameterOnC(),
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	Arrive = Standard_True;
       }
       break;
@@ -945,10 +941,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
   FinvC.Set(Arc);
   
   math_Vector toler(1,3),infb(1,3),supb(1,3);
-  // use reduced Tol argument value to pass testcase
-  // blend complex A6 with scale factor of model 0.1 (base scale = 1000)
-  // So, here we using 1.0e-5 rather than 1.0e-4 of tolerance of point in 3d
-  FinvC.GetTolerance(toler,0.1 * tolpoint3d);
+  FinvC.GetTolerance(toler,tolesp);
   FinvC.GetBounds(infb,supb);
   Solinv(1) = param;
   Solinv(2) = sol(3);
@@ -965,7 +958,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
   else {
       // It is necessary to check the value of the function
     rsnld.Root(Solinv);
-    recadre = FinvC.IsSolution(Solinv,tolpoint3d);
+    recadre = FinvC.IsSolution(Solinv,tolesp);
   }
 
   // In case of fail, it is checked if another arc 
@@ -988,7 +981,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
     Arc = domain1->Value();
     FinvC.Set(Arc);
   
-    FinvC.GetTolerance(toler,tolpoint3d);
+    FinvC.GetTolerance(toler,tolesp);
     FinvC.GetBounds(infb,supb);
 
     Solinv(3) = pmin;
@@ -1004,7 +997,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
     else {
       // It is necessary to check the value of the function
       aRsnld.Root(Solinv);
-      recadre = FinvC.IsSolution(Solinv,tolpoint3d);
+      recadre = FinvC.IsSolution(Solinv,tolesp);
     }
   }  
 
@@ -1048,7 +1041,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
 						       Handle(Adaptor3d_HVertex)& Vtx) 
 {
   math_Vector toler(1,4),infb(1,4),supb(1,4);
-  Finv.GetTolerance(toler,tolpoint3d);
+  Finv.GetTolerance(toler,tolesp);
   Finv.GetBounds(infb,supb);
   Solinv(1) = sol(3);
   Solinv(2) = param;
@@ -1065,9 +1058,9 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
   }
   rsnld.Root(Solinv);
   
-  if(Finv.IsSolution(Solinv,tolpoint3d)){
+  if(Finv.IsSolution(Solinv,tolesp)){
     gp_Pnt2d p2d(Solinv(3),Solinv(4));
-    TopAbs_State situ = domain1->Classify(p2d,tolpoint2d,0);
+    TopAbs_State situ = domain1->Classify(p2d,Min(toler(3),toler(4)),0);
     if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
       return Standard_False;
     }
@@ -1093,7 +1086,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
 
     math_Vector infbound(1,3),supbound(1,3);
     math_Vector parinit(1,3),tolerance(1,3);
-    Func.GetTolerance(tolerance,tolpoint3d);
+    Func.GetTolerance(tolerance,tolesp);
     Func.GetBounds(infbound,supbound);
 
     math_FunctionSetRoot rsnld2(Func,tolerance,30);
@@ -1133,7 +1126,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfPointFuncInv&
 
   FinvP.Set(thepoint);
   math_Vector toler(1,3),infb(1,3),supb(1,3);
-  FinvP.GetTolerance(toler,tolpoint3d);
+  FinvP.GetTolerance(toler,tolesp);
   FinvP.GetBounds(infb,supb);
   Solinv(1) = param;
   Solinv(2) = sol(1);
@@ -1149,9 +1142,9 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfPointFuncInv&
   }
   rsnld.Root(Solinv);
   
-  if(FinvP.IsSolution(Solinv,tolpoint3d)){
+  if(FinvP.IsSolution(Solinv,tolesp)){
     gp_Pnt2d p2d(Solinv(2),Solinv(3));
-    TopAbs_State situ = domain1->Classify(p2d,tolpoint2d,0);
+    TopAbs_State situ = domain1->Classify(p2d,Min(toler(2),toler(3)),0);
     if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
       return Standard_False;
     }
@@ -1244,7 +1237,7 @@ void BRepBlend_SurfRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
   if (OnFirst) {
     Extrem.SetValue(previousP.PointOnS(),
 		    sol(1),sol(2),
-		    previousP.Parameter(),tolpoint3d);
+		    previousP.Parameter(),tolesp);
     if (!previousP.IsTangencyPoint()) 
       Extrem.SetTangent(previousP.TangentOnS());
     Iter = domain1;
@@ -1252,7 +1245,7 @@ void BRepBlend_SurfRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
   else {
     Extrem.SetValue(previousP.PointOnC(),
 		    sol(3),
-		    previousP.Parameter(),tolpoint3d);
+		    previousP.Parameter(),tolesp);
     if (!previousP.IsTangencyPoint()) 
       Extrem.SetTangent(previousP.TangentOnC());    
     Iter = domain2;
@@ -1319,13 +1312,12 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
 //  if(!curpointistangent) curNorme = Tgsurf.SquareMagnitude();
   if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
 
-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d){
+  if (Norme <= tolesp*tolesp){
     // it can be necessary to force same point
     return Blend_SamePoints;
   }
   if(!prevpointistangent){
-    if(prevNorme <= toler3d * toler3d) {
+    if(prevNorme <= tolesp*tolesp) {
       return Blend_SamePoints;
     }
     Cosi = sens*Corde*prevTg;
@@ -1396,13 +1388,12 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
 //  if(!curpointistangent) curNorme = Tgsurf.SquareMagnitude();
   if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude();
 
-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d){
+  if (Norme <= tolesp*tolesp){
     // it can be necessary to force same point
     return Blend_SamePoints;
   }
   if(!prevpointistangent){
-    if(prevNorme <= toler3d * toler3d) {
+    if(prevNorme <= tolesp*tolesp) {
       return Blend_SamePoints;
     }
     Cosi = sens*Corde*prevTg;
@@ -1464,7 +1455,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::TestArret(Blend_SurfRstFunction& Func
   IntSurf_TypeTrans tras = IntSurf_Undecided, trarst = IntSurf_Undecided;
   Blend_Point curpoint;
 
-  if (Func.IsSolution(sol,tolpoint3d)) {
+  if (Func.IsSolution(sol,tolesp)) {
     Standard_Boolean curpointistangent = Func.IsTangencyPoint();
     pts = Func.PointOnS();
     ptrst = Func.PointOnRst();
@@ -1508,7 +1499,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::TestArret(Blend_SurfRstFunction& Func
       Func.Decroch(sol,nors,tgsecs);
       nors.Normalize();
       Standard_Real testra = tgsecs.Dot(nors.Crossed(tgs));
-      if (Abs(testra) > tolpoint3d) {
+      if (Abs(testra) > tolesp) {
 	if (testra < 0.) {
 	  tras = IntSurf_In;
 	}
@@ -1567,7 +1558,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::CheckInside(Blend_SurfRstFunction
 							   Standard_Boolean&      Decroch)
 {
   math_Vector tolerance(1,3);
-  Func.GetTolerance(tolerance,tolpoint3d);
+  Func.GetTolerance(tolerance,tolesp);
   //face pcurve.
   Standard_Real w = sol(3);
   if(w < rst->FirstParameter() - tolerance(3)||
@@ -1582,7 +1573,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::CheckInside(Blend_SurfRstFunction
 
   //face surface
   gp_Pnt2d p2d(sol(1),sol(2));
-  SituOnS = domain1->Classify(p2d,tolpoint2d,0);
+  SituOnS = domain1->Classify(p2d,Min(tolerance(1),tolerance(2)),0);
 
   //lost contact
   gp_Vec tgs,nors;

src/BRepBlend/BRepBlend_SurfRstLineBuilder.hxx

@@ -71,9 +71,9 @@ public:
   
   Standard_EXPORT BRepBlend_SurfRstLineBuilder(const Handle(Adaptor3d_Surface)& Surf1, const Handle(Adaptor3d_TopolTool)& Domain1, const Handle(Adaptor3d_Surface)& Surf2, const Handle(Adaptor2d_Curve2d)& Rst, const Handle(Adaptor3d_TopolTool)& Domain2);
   
-  Standard_EXPORT void Perform (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
   
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real& Psol, math_Vector& ParSol);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real& Psol, math_Vector& ParSol);
   
   Standard_EXPORT Standard_Boolean Complete (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pmin);
   
@@ -128,8 +128,7 @@ private:
   Handle(Adaptor3d_Surface) surf2;
   Handle(Adaptor2d_Curve2d) rst;
   Handle(Adaptor3d_TopolTool) domain2;
-  Standard_Real tolpoint3d;
-  Standard_Real tolpoint2d;
+  Standard_Real tolesp;
   Standard_Real tolgui;
   Standard_Real pasmax;
   Standard_Real fleche;

src/BRepBlend/BRepBlend_Walking.hxx

@@ -58,11 +58,11 @@ public:
   //! To define singular points computed before walking.
   Standard_EXPORT void AddSingularPoint (const Blend_Point& P);
   
-  Standard_EXPORT void Perform (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
   
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, const Standard_Real Pdep, math_Vector& ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, TopAbs_State& Pos1, TopAbs_State& Pos2);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, const Standard_Real Pdep, math_Vector& ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, TopAbs_State& Pos1, TopAbs_State& Pos2);
   
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real& Psol, math_Vector& ParSol);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real& Psol, math_Vector& ParSol);
   
   Standard_EXPORT Standard_Boolean Continu (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real P);
   
@@ -131,7 +131,7 @@ private:
   Standard_Boolean ToCorrectOnRst1;
   Standard_Boolean ToCorrectOnRst2;
   Standard_Real CorrectedParam;
-  Standard_Real tolpoint3d;
+  Standard_Real tolesp;
   Standard_Real tolgui;
   Standard_Real pasmax;
   Standard_Real fleche;

src/BRepBndLib/BRepBndLib.cxx

@@ -47,7 +47,7 @@
 //
 static Standard_Boolean CanUseEdges(const Adaptor3d_Surface& BS);
 //
-static void FindExactUVBounds(const TopoDS_Face& F, 
+static void FindExactUVBounds(const TopoDS_Face F, 
                               Standard_Real& umin, Standard_Real& umax, 
                               Standard_Real& vmin, Standard_Real& vmax,
                               const Standard_Real Tol, 
@@ -127,14 +127,6 @@ void BRepBndLib::Add(const TopoDS_Shape& S, Bnd_Box& B, Standard_Boolean useTria
   for (ex.Init(S,TopAbs_EDGE,TopAbs_FACE); ex.More(); ex.Next())
   {
     const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
- 
-    if (!useTriangulation && BRep_Tool::IsGeometric(E))
-    {
-      BC.Initialize(E);
-      BndLib_Add3dCurve::Add(BC, BRep_Tool::Tolerance(E), B);
-      continue;
-    }
-
     Handle(Poly_Polygon3D) P3d = BRep_Tool::Polygon3D(E, l);
     if (!P3d.IsNull() && P3d->NbNodes() > 0)
     {
@@ -151,7 +143,7 @@ void BRepBndLib::Add(const TopoDS_Shape& S, Bnd_Box& B, Standard_Boolean useTria
     else
     {
       BRep_Tool::PolygonOnTriangulation(E, Poly, T, l);
-      if (!Poly.IsNull() && !T.IsNull() && T->NbNodes() > 0)
+      if (useTriangulation && !Poly.IsNull() && !T.IsNull() && T->NbNodes() > 0)
       {
         const TColStd_Array1OfInteger& Indices = Poly->Nodes();
         nbNodes = Indices.Length();
@@ -460,7 +452,7 @@ Standard_Boolean CanUseEdges(const Adaptor3d_Surface& BS)
 //function : FindExactUVBounds
 //purpose  : 
 //=======================================================================
-void FindExactUVBounds(const TopoDS_Face& FF, 
+void FindExactUVBounds(const TopoDS_Face FF, 
                        Standard_Real& umin, Standard_Real& umax, 
                        Standard_Real& vmin, Standard_Real& vmax,
                        const Standard_Real Tol, 

src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx

@@ -58,7 +58,7 @@ static void BuildBack (const TopTools_DataMapOfShapeListOfShape& M1,
 //=======================================================================
 
 static void  Replace (      TopTools_ListOfShape& L,
-		      const TopoDS_Shape&          Old,
+		      const TopoDS_Shape          Old,
 		      const TopTools_ListOfShape& New)
 {
   //-----------------------------------
@@ -150,7 +150,7 @@ static void Update (   TopTools_DataMapOfShapeListOfShape& Mod,
     if (!LIG.IsEmpty()) {
       if (ModBack.IsBound(S)) {
 	// Generation de modif  => generation du shape initial
-	const TopoDS_Shape& IS = ModBack(S);
+	TopoDS_Shape IS = ModBack(S);
 	StoreImage (Gen,IS,GenBack,LIG);
       }
       else {

src/BRepBuilderAPI/BRepBuilderAPI_MakeShapeOnMesh.cxx

@@ -237,7 +237,7 @@ void BRepBuilderAPI_MakeShapeOnMesh::Build(const Message_ProgressRange& theRange
     gp_Pln aPln(myMesh->Node(anIdx[0]), aNorm);
 
     BRepBuilderAPI_MakeFace aFaceMaker(aPln, aWire);
-    const TopoDS_Face& aFace = aFaceMaker.Face();
+    const TopoDS_Face aFace = aFaceMaker.Face();
 
     aBB.Add(aResult, aFace);
   }

src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx

@@ -374,7 +374,7 @@ TopoDS_Edge BRepBuilderAPI_Sewing::SameParameterEdge(const TopoDS_Shape& edge,
   for (Standard_Integer i = 1; i <= seqEdges.Length(); i++) {
 
     // Retrieve candidate section
-    const TopoDS_Shape& oedge2 = seqEdges(i);
+    TopoDS_Shape oedge2 = seqEdges(i);
 
     if (mySewing) {
 
@@ -1393,7 +1393,7 @@ void BRepBuilderAPI_Sewing::AnalysisNearestEdges(const TopTools_SequenceOfShape&
   // (they have other nearest edges belonging to the work face)
   for(Standard_Integer k = 1; k<= seqNotCandidate.Length(); k++) {
     Standard_Integer index1 = seqNotCandidate.Value(k);
-    const TopoDS_Shape& edge = sequenceSec.Value(index1);
+    TopoDS_Shape edge = sequenceSec.Value(index1);
     TopTools_SequenceOfShape tmpSeq;
     tmpSeq.Append(edge);
     for(Standard_Integer kk = 1; kk <= seqIndCandidate.Length();kk++) 
@@ -2928,7 +2928,7 @@ void BRepBuilderAPI_Sewing::VerticesAssembling(const Message_ProgressRange& theP
     for (i = 1; i <= myBoundFaces.Extent(); i++) {
       TopoDS_Shape bound = myBoundFaces.FindKey(i);
       for (TopoDS_Iterator itv(bound,Standard_False); itv.More(); itv.Next()) {
-	const TopoDS_Shape& node = itv.Value();
+	TopoDS_Shape node = itv.Value();
 	if (myNodeSections.IsBound(node))
 	  myNodeSections(node).Append(bound);
 	else {
@@ -2991,7 +2991,7 @@ static void replaceNMVertices(const TopoDS_Edge& theEdge,
       theReShape->Replace(aSeqNMVert.Value(i),theV2);
       continue;
     }
-    const TopoDS_Shape& aV = aSeqNMVert.Value(i);
+    TopoDS_Shape aV = aSeqNMVert.Value(i);
     Standard_Integer j =1;
     for( ; j <= aEdParams.Length();j++) {
       Standard_Real apar2 = aEdParams.Value(j);
@@ -3508,7 +3508,7 @@ Standard_Boolean BRepBuilderAPI_Sewing::MergedNearestEdges(const TopoDS_Shape& e
   TopTools_MapOfShape mapEdges;
   mapEdges.Add(edge);
   for (Standard_Integer i = 1; i <= mapVert1.Extent(); i++) {
-    const TopoDS_Shape& node1 = mapVert1.FindKey(i);
+    TopoDS_Shape node1 = mapVert1.FindKey(i);
     if (!myNodeSections.IsBound(node1)) continue;
     TopTools_ListIteratorOfListOfShape ilsec(myNodeSections(node1));
     for (; ilsec.More(); ilsec.Next()) {
@@ -4453,7 +4453,7 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
       if (jdist < 0.0) {
         // Bind new cutting node (end vertex only)
         seqDist.SetValue(indexMin,disProj);
-        const TopoDS_Shape& cvertex = seqVert.Value(indexMin);
+        TopoDS_Shape cvertex = seqVert.Value(indexMin);
         NodeCuttingVertex.Add(node,cvertex);
       }
       else {

src/BRepCheck/BRepCheck_Face.cxx

@@ -625,7 +625,7 @@ static Standard_Boolean Intersect(const TopoDS_Wire& wir1,
     MapW1.Add( exp1.Current() );
   for (exp2.Init( wir2, TopAbs_VERTEX ); exp2.More(); exp2.Next())
     {
-      const TopoDS_Shape& V = exp2.Current();
+      TopoDS_Shape V = exp2.Current();
       if (MapW1.Contains( V ))
 	CommonVertices.Append( V );
     }

src/BRepClass/BRepClass_Intersector.cxx

@@ -248,6 +248,7 @@ void CheckSkip(Geom2dInt_GInter& theInter,
   {
     return;
   }
+  const TopoDS_Edge anEl = theE.NextEdge(); // the next edge
   if (!(BRep_Tool::Tolerance(aVl) > theMaxTol) || theE.NextEdge().IsNull())
   {
     return;

src/BRepClass3d/BRepClass3d_SClassifier.cxx

@@ -46,7 +46,7 @@ static
 
 //gets transition of line <L> passing through/near the edge <e> of faces <f1>, <f2>. <param> is
 // a parameter on the edge where the minimum distance between <l> and <e> was found
-static Standard_Integer GetTransi(const TopoDS_Face& f1, const TopoDS_Face& f2, const TopoDS_Edge& e,
+static Standard_Integer GetTransi(const TopoDS_Face& f1, const TopoDS_Face& f2, const TopoDS_Edge e,
                      Standard_Real param, const gp_Lin& L, IntCurveSurface_TransitionOnCurve& trans);
 
 static Standard_Boolean GetNormalOnFaceBound(const TopoDS_Edge& E, const TopoDS_Face& F, Standard_Real param, gp_Dir& OutDir);
@@ -607,7 +607,7 @@ static Standard_Boolean GetNormalOnFaceBound(const TopoDS_Edge& E,
 //=======================================================================
 static Standard_Integer GetTransi(const TopoDS_Face& f1,
                                   const TopoDS_Face& f2,
-                                  const TopoDS_Edge& e,
+                                  const TopoDS_Edge e,
                                   const Standard_Real param,
                                   const gp_Lin& L,
                                   IntCurveSurface_TransitionOnCurve& trans)

src/BRepExtrema/BRepExtrema_DistShapeShape.cxx

@@ -65,8 +65,8 @@ namespace
     }
   }
 
-  inline Standard_Real DistanceInitiale(const TopoDS_Vertex& V1,
-                                        const TopoDS_Vertex& V2)
+  inline Standard_Real DistanceInitiale(const TopoDS_Vertex V1,
+                                        const TopoDS_Vertex V2)
   {
     return (BRep_Tool::Pnt(V1).Distance(BRep_Tool::Pnt(V2)));
   }

src/BRepExtrema/BRepExtrema_DistanceSS.cxx

@@ -468,14 +468,7 @@ static void PERFORM_C0(const TopoDS_Edge& S1, const TopoDS_Edge& S2,
               if (fabs(Dstmin - sqrt(Ext.SquareDistance(ii))) < Eps)
               {
                 Pt = Ext.Point(ii);
-                // Pt - point on the curve pCurvOther/Eother, but
-                // if iE == 0 -> Eother correspond to edge S2
-                // and to edge S1 in the opposite case.
-                // Therefore we should search Pt through previous solution points on Other curve (edge):
-                // if iE == 0 - on edge S2, namely through SeqSol2,
-                // else       - on edge S1, namely through SeqSol1.
-                const bool triSolutionResult = (iE == 0) ? TRI_SOLUTION(SeqSol2, Pt) : TRI_SOLUTION(SeqSol1, Pt);
-                if (triSolutionResult)
+                if (TRI_SOLUTION(SeqSol2, Pt))
                 {
                   // Check if the parameter does not correspond to a vertex
                   const Standard_Real t = Ext.Parameter(ii);
@@ -876,19 +869,9 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Edge& theS1,
 
   if (!seqSol1.IsEmpty() && !seqSol2.IsEmpty())
   {
-    BRepExtrema_SeqOfSolution::iterator anIt1 = seqSol1.begin();
-    BRepExtrema_SeqOfSolution::iterator anIt2 = seqSol2.begin();
-    for (; anIt1 != seqSol1.end() && anIt2 != seqSol2.end(); anIt1++, anIt2++)
-    {
-      gp_Pnt Pt1 = anIt1->Point();
-      gp_Pnt Pt2 = anIt2->Point();
-      if (TRI_SOLUTION(theSeqSolShape1, Pt1) || TRI_SOLUTION(theSeqSolShape2, Pt2))
-      {
-        theSeqSolShape1.Append(*anIt1);
-        theSeqSolShape2.Append(*anIt2);
-        myModif = Standard_True;
-      }
-    }
+    theSeqSolShape1.Append(seqSol1);
+    theSeqSolShape2.Append(seqSol2);
+    myModif = Standard_True;
   }
 }
 

src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx

@@ -43,8 +43,6 @@ BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool()
 //=======================================================================
 BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
                                                               const Standard_Integer theNbSamples1,
-                                                              const BVH_Array3d& theAddVertices1,
-                                                              const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
                                                               const Handle(BRepExtrema_TriangleSet)& theSet2,
                                                               const BRepExtrema_ShapeList& theShapeList1,
                                                               const BRepExtrema_ShapeList& theShapeList2)
@@ -57,7 +55,6 @@ BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool (const Handle(BRepE
 {
   LoadTriangleSets (theSet1, theSet2);
   LoadShapeLists (theShapeList1, theShapeList2);
-  LoadAdditionalPointsFirstSet (theAddVertices1, theAddStatus1);
 }
 
 //=======================================================================
@@ -72,7 +69,7 @@ void BRepExtrema_ProximityDistTool::LoadTriangleSets (const Handle(BRepExtrema_T
 }
 
 //=======================================================================
-//function : LoadShapeLists
+//function : LoadTriangleSets
 //purpose  : Loads the given list of subshapes into the proximity tool
 //=======================================================================
 void BRepExtrema_ProximityDistTool::LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
@@ -81,50 +78,6 @@ void BRepExtrema_ProximityDistTool::LoadShapeLists (const BRepExtrema_ShapeList&
   myShapeList1 = theShapeList1;
   myShapeList2 = theShapeList2;
 }
-
-//=======================================================================
-//function : LoadAdditionalPointsFirstSet
-//purpose  : Loads given additional vertices and their statuses
-//=======================================================================
-void BRepExtrema_ProximityDistTool::LoadAdditionalPointsFirstSet (const BVH_Array3d& theAddVertices1,
-                                                                  const NCollection_Vector<ProxPnt_Status>& theAddStatus1)
-{
-  myAddVertices1 = theAddVertices1;
-  myAddStatus1 = theAddStatus1;
-}
-
-//=======================================================================
-//function : goThroughtSet1
-//purpose  : Goes throught vertices from the 1st set
-//=======================================================================
-void BRepExtrema_ProximityDistTool::goThroughtSet1 (const BVH_Array3d& theVertices1,
-                                                    const Standard_Boolean theIsAdditionalSet)
-{
-  Standard_Integer aVtxSize = (Standard_Integer)theVertices1.size();
-  Standard_Integer aVtxStep = Max (myNbSamples1 <= 0 ? 1 : aVtxSize / myNbSamples1, 1);
-  for (Standard_Integer aVtxIdx = 0; aVtxIdx < aVtxSize; aVtxIdx += aVtxStep)
-  {
-    myDistance = std::numeric_limits<Standard_Real>::max();
-    myMinDistance = std::numeric_limits<Standard_Real>::max();
-    myIsDone = Standard_False;
-    SetObject (theVertices1[aVtxIdx]);
-
-    ComputeDistance();
-
-    if (!IsDone() && myProxDist < 0.) return;
-
-    if (IsDone() && myDistance > myProxDist)
-    {
-      myPnt1 = theVertices1[aVtxIdx];
-      myPnt2 = myExtremaPoint;
-      myProxDist = myDistance;
-      myProxVtxIdx1 = aVtxIdx;
-      myIsProxVtx1FromAddSet = theIsAdditionalSet;
-      myProxPrjState = myExtPrjState;
-    }
-  }
-}
-
 //=======================================================================
 //function : Perform
 //purpose  : Performs searching of the proximity distance
@@ -132,14 +85,37 @@ void BRepExtrema_ProximityDistTool::goThroughtSet1 (const BVH_Array3d& theVertic
 void BRepExtrema_ProximityDistTool::Perform()
 {
   SetBVHSet (mySet2.get());
-  goThroughtSet1 (mySet1->GetVertices(), Standard_False);
-  goThroughtSet1 (myAddVertices1, Standard_True);
 
-  myIsDone = myProxDist > -1.;
-  if (myIsDone)
+  const BVH_Array3d& aVertices1 = mySet1->GetVertices();
+  Standard_Integer aVtxSize = (Standard_Integer)aVertices1.size();
+  Standard_Integer aVtxStep = Max (myNbSamples1 <= 0 ? 1 : aVtxSize / myNbSamples1, 1);
+  for (Standard_Integer aVtxIdx = 0; aVtxIdx < aVtxSize; aVtxIdx += aVtxStep)
   {
-    DefineStatusProxPnt();
+    myDistance = std::numeric_limits<Standard_Real>::max();
+    myMinDistance = std::numeric_limits<Standard_Real>::max();
+    myIsDone = Standard_False;
+    SetObject (aVertices1[aVtxIdx]);
+
+    ComputeDistance();
+
+    if (!IsDone() && myProxDist < 0.) return;
+
+    if (IsDone() && myDistance > myProxDist)
+    {
+      myPnt1 = aVertices1[aVtxIdx];
+      myPnt2 = myExtremaPoint;
+      myProxDist = myDistance;
+      myProxVtxIdx1 = aVtxIdx;
+      myProxPrjState = myExtPrjState;
+    }
   }
+
+   myIsDone = myProxDist > -1.;
+
+   if (myIsDone)
+   {
+     DefineStatusProxPnt();
+   }
 }
 
 static Standard_Real pointBoxSquareMaxDistance (const BVH_Vec3d& thePoint,
@@ -271,12 +247,7 @@ Standard_Real BRepExtrema_ProximityDistTool::ComputeDistance()
   return myDistance;
 }
 
-//=======================================================================
-//function : IsNodeOnBorder
-//purpose  : Returns true if the node is on the boarder
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::IsNodeOnBorder (const Standard_Integer theNodeIdx,
-                                                                const Handle(Poly_Triangulation)& theTr)
+static Standard_Boolean isNodeOnBorder (const Standard_Integer theNodeIdx, const Handle (Poly_Triangulation)& theTr)
 {
   Poly_Connect aPolyConnect (theTr);
 
@@ -308,49 +279,12 @@ Standard_Boolean BRepExtrema_ProximityDistTool::IsNodeOnBorder (const Standard_I
   return Standard_False;
 }
 
-//=======================================================================
-//function : IsEdgeOnBorder
-//purpose  : Returns true if the edge is on the boarder
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::IsEdgeOnBorder (const Standard_Integer theTrgIdx,
-                                                                const Standard_Integer theFirstEdgeNodeIdx,
-                                                                const Standard_Integer theSecondEdgeNodeIdx,
-                                                                const Handle(Poly_Triangulation)& theTr)
-{
-  Poly_Connect aPolyConnect (theTr);
-
-  Standard_Integer aAdjTrg[3];
-  aPolyConnect.Triangles (theTrgIdx, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
-
-  for (Standard_Integer j = 0; j < 3; j++)
-  {
-    Standard_Integer k = (j + 1) % 3;
-    if (aAdjTrg[j] == 0) //free segment of triangle
-    {
-      //are ends of free segment and it is a part of border
-      if (j == theFirstEdgeNodeIdx &&
-          k == theSecondEdgeNodeIdx)
-      {
-        return Standard_True;
-      }
-    }
-  }
-
-  return Standard_False;
-}
-
 //=======================================================================
 //function : defineStatusProxPnt1
 //purpose  : Defines the status of proximity point from 1st BVH
 //=======================================================================
 void BRepExtrema_ProximityDistTool::defineStatusProxPnt1()
 {
-  if (myIsProxVtx1FromAddSet)
-  {
-    myPntStatus1 = myAddStatus1[myProxVtxIdx1];
-    return;
-  }
-
   Standard_Integer aFaceID1 = mySet1->GetShapeIDOfVtx (myProxVtxIdx1);
 
   if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_EDGE)
@@ -380,9 +314,9 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt1()
 
     TopLoc_Location aLocation;
     const TopoDS_Face& aF = TopoDS::Face (myShapeList1 (aFaceID1));
-    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
+    Handle (Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
 
-    if (IsNodeOnBorder (aNodeIdx, aTr))
+    if (isNodeOnBorder (aNodeIdx, aTr))
     {
       myPntStatus1 = ProxPnt_Status_BORDER;
     }
@@ -464,7 +398,7 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
     {
       TopLoc_Location aLocation;
       const TopoDS_Face& aF = TopoDS::Face (myShapeList2 (aFaceID2));
-      Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
+      Handle (Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
 
       NCollection_Array1<Standard_Integer> aVtxIndicesOfTrg;
       mySet2->GetVtxIndices (aTrgIdx, aVtxIndicesOfTrg);
@@ -474,7 +408,7 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
         Standard_Integer aNodeNum = myProxPrjState.GetNumberOfFirstNode();
         Standard_Integer aNodeIdx = mySet2->GetVtxIdxInShape (aVtxIndicesOfTrg[aNodeNum]) + 1;
 
-        if (IsNodeOnBorder (aNodeIdx, aTr))
+        if (isNodeOnBorder (aNodeIdx, aTr))
         {
           myPntStatus2 = ProxPnt_Status_BORDER;
         }
@@ -485,18 +419,27 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
       }
       else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
       {
+        myPntStatus2 = ProxPnt_Status_MIDDLE;
+
+        Poly_Connect aPolyConnect (aTr);
         Standard_Integer aTrgIdxInShape = mySet2->GetTrgIdxInShape (aTrgIdx) + 1;
 
-        if (IsEdgeOnBorder (aTrgIdxInShape,
-                            myProxPrjState.GetNumberOfFirstNode(),
-                            myProxPrjState.GetNumberOfLastNode(),
-                            aTr))
+        Standard_Integer aAdjTrg[3];
+        aPolyConnect.Triangles (aTrgIdxInShape, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
+
+        for (Standard_Integer j = 0; j < 3; j++)
         {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
+          Standard_Integer k = (j + 1) % 3;
+          if (aAdjTrg[j] == 0) //free segment of triangle
+          {
+            //aVtxIndicesOfTrg[j] and aVtxIndicesOfTrg[k] are ends of free segment and it is a part of border
+            if (j == myProxPrjState.GetNumberOfFirstNode() &&
+                k == myProxPrjState.GetNumberOfLastNode())
+            {
+              myPntStatus2 = ProxPnt_Status_BORDER;
+              break;
+            }
+          }
         }
       } //else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
     }

src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx

@@ -21,7 +21,6 @@
 #include <BRepExtrema_TriangleSet.hxx>
 #include <BVH_Distance.hxx>
 #include <BVH_Tools.hxx>
-#include <Poly_Triangulation.hxx>
 
 //! Tool class for computation the proximity distance from first 
 //! primitive set to second one that is the maximal from minimum 
@@ -94,8 +93,6 @@ public:
   //! Creates new tool for the given element sets.
   Standard_EXPORT BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
                                                  const Standard_Integer theNbSamples1,
-                                                 const BVH_Array3d& theAddVertices1,
-                                                 const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
                                                  const Handle(BRepExtrema_TriangleSet)& theSet2,
                                                  const BRepExtrema_ShapeList& theShapeList1,
                                                  const BRepExtrema_ShapeList& theShapeList2);
@@ -110,10 +107,6 @@ public:
   Standard_EXPORT void LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
                                        const BRepExtrema_ShapeList& theShapeList2);
 
-  //! Loads given additional vertices and their statuses.
-  void LoadAdditionalPointsFirstSet (const BVH_Array3d& theAddVertices1,
-                                     const NCollection_Vector<ProxPnt_Status>& theAddStatus1);
-
   //! Performs searching of the proximity distance.
   Standard_EXPORT void Perform();
 
@@ -128,20 +121,6 @@ public: //! @name Reject/Accept implementations
   Standard_EXPORT virtual Standard_Boolean Accept (const Standard_Integer theSgmIdx,
                                                    const Standard_Real&) Standard_OVERRIDE;
 
-public:
-
-  //! Returns true if the node is on the boarder.
-  Standard_EXPORT static Standard_Boolean IsNodeOnBorder (const Standard_Integer theNodeIdx,
-                                                          const Handle (Poly_Triangulation)& theTr);
-
-  //! Returns true if the edge is on the boarder.
-  Standard_EXPORT static Standard_Boolean IsEdgeOnBorder (const Standard_Integer theTrgIdx,
-                                                          const Standard_Integer theFirstEdgeNodeIdx,
-                                                          const Standard_Integer theSecondEdgeNodeIdx,
-                                                          const Handle (Poly_Triangulation)& theTr);
-
-public:
-
   //! Returns points on triangles sets, which provide the proximity distance.
   void ProximityPoints (BVH_Vec3d& thePoint1, BVH_Vec3d& thePoint2) const
   {
@@ -169,10 +148,6 @@ protected:
 
 private:
 
-  //! Goes throught vertices from the 1st set.
-  void goThroughtSet1 (const BVH_Array3d& aVertices1,
-                       const Standard_Boolean theIsAdditionalSet);
-
   //! Defines the status of proximity point from 1st BVH.
   void defineStatusProxPnt1();
 
@@ -208,11 +183,6 @@ private:
 
   Standard_Integer myNbSamples1; //!< Number of samples points on the first shape
 
-  //! Is vertex corresponding to proximity point of 1st shape from additional set
-  Standard_Integer myIsProxVtx1FromAddSet;
-  BVH_Array3d myAddVertices1; //!< Additional vertices on the 1st shape
-  NCollection_Vector<ProxPnt_Status> myAddStatus1; //!< Status of additional vertices on the 1st shape
-
   //! Vertex index from 1st BVH corresponding to proximity point of 1st shape
   Standard_Integer myProxVtxIdx1;
 

src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx

@@ -1,4 +1,4 @@
-// Created on: 2022-08-08
+// Created on: 2022-08-08
 // Created by: Kseniya NOSULKO
 // Copyright (c) 2022 OPEN CASCADE SAS
 //
@@ -14,32 +14,17 @@
 // commercial license or contractual agreement.
 
 #include <BRepExtrema_ProximityValueTool.hxx>
-#include <BRepExtrema_ProximityDistTool.hxx>
-
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepGProp.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-#include <GCPnts_QuasiUniformAbscissa.hxx>
-#include <GProp_GProps.hxx> 
-#include <Poly_Connect.hxx>
-#include <TopoDS.hxx>
 
 //=======================================================================
 //function : BRepExtrema_ProximityValueTool
 //purpose  : Creates new unitialized proximity tool
 //=======================================================================
 BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool()
-: myIsRefinementRequired1 (Standard_False),
-  myIsRefinementRequired2 (Standard_False),
-  myDistance (std::numeric_limits<Standard_Real>::max()),
+: myDistance (std::numeric_limits<Standard_Real>::max()),
   myIsDone (Standard_False),
   myNbSamples1(0),
   myNbSamples2(0)
-{
-  // Should be initialized later
-  myIsInitS1 = myIsInitS2 = Standard_False;
-}
+{}
 
 //=======================================================================
 //function : BRepExtrema_ProximityValueTool
@@ -49,15 +34,13 @@ BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool (const Handle(BRe
                                                                 const Handle(BRepExtrema_TriangleSet)& theSet2,
                                                                 const BRepExtrema_ShapeList& theShapeList1,
                                                                 const BRepExtrema_ShapeList& theShapeList2)
-: myIsRefinementRequired1 (Standard_False),
-  myIsRefinementRequired2 (Standard_False),
-  myDistance (std::numeric_limits<Standard_Real>::max()),
+: myDistance (std::numeric_limits<Standard_Real>::max()),
   myIsDone (Standard_False),
-  myNbSamples1 (0),
-  myNbSamples2 (0)
+  myNbSamples1(0),
+  myNbSamples2(0)
 {
-  LoadShapeLists (theShapeList1, theShapeList2);
   LoadTriangleSets (theSet1, theSet2);
+  LoadShapeLists (theShapeList1, theShapeList2);
 }
 
 //=======================================================================
@@ -70,94 +53,7 @@ void BRepExtrema_ProximityValueTool::LoadTriangleSets (const Handle(BRepExtrema_
   mySet1 = theSet1;
   mySet2 = theSet2;
 
-  MarkDirty();
-}
-
-//=======================================================================
-//function : calcEdgeRefinementStep
-//purpose  : Calculates the edge refinement step
-//=======================================================================
-static Standard_Real calcEdgeRefinementStep (const TopoDS_Edge& theEdge,
-                                             const Standard_Integer theNbNodes)
-{
-  if (theNbNodes < 2)
-    return 0;
-
-  BRepAdaptor_Curve aBAC (theEdge);
-  Standard_Real aLen = GCPnts_AbscissaPoint::Length (aBAC);
-  return aLen / (Standard_Real)(theNbNodes - 1);
-}
-
-//=======================================================================
-//function : calcFaceRefinementStep
-//purpose  : Calculates the face refinement step as an approximate square
-// (Shape area / number triangles) * 2
-//=======================================================================
-static Standard_Real calcFaceRefinementStep (const TopoDS_Face& theFace,
-                                             const Standard_Integer theNbTrg)
-{
-  if (theNbTrg < 1)
-    return 0;
-
-  GProp_GProps props;
-  BRepGProp::SurfaceProperties (theFace, props);
-  Standard_Real aArea = props.Mass();
-  return 2 * (aArea / (Standard_Real)theNbTrg);
-}
-
-//=======================================================================
-//function : getInfoForRefinement
-//purpose  : Gets shape data for further refinement
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getInfoForRefinement (const TopoDS_Shape& theShape,
-                                                                       TopAbs_ShapeEnum& theShapeType,
-                                                                       Standard_Integer& theNbNodes,
-                                                                       Standard_Real& theStep)
-{
-  if (theShape.ShapeType() == TopAbs_FACE)
-  {
-    theShapeType = TopAbs_FACE;
-    TopoDS_Face aF = TopoDS::Face (theShape);
-
-    TopLoc_Location aLocation;
-    Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aF, aLocation);
-
-    if (aTriangulation.IsNull())
-    {
-      return Standard_False;
-    }
-
-    theNbNodes = aTriangulation->NbNodes();
-    Standard_Integer aNbTrg = aTriangulation->NbTriangles();
-    theStep = calcFaceRefinementStep (aF, aNbTrg);
-  }
-  else if (theShape.ShapeType() == TopAbs_EDGE)
-  {
-    theShapeType = TopAbs_EDGE;
-    TopoDS_Edge aE = TopoDS::Edge (theShape);
-
-    TopLoc_Location aLocation;
-    Handle(Poly_Polygon3D) aPolygon = BRep_Tool::Polygon3D (aE, aLocation);
-
-    if (aPolygon.IsNull())
-    {
-      return Standard_False;
-    }
-
-    theNbNodes = aPolygon->NbNodes();
-    theStep = calcEdgeRefinementStep (aE, theNbNodes);
-  }
-  else
-  {
-    return Standard_False;
-  }
-
-  if (theStep < Precision::Confusion())
-  {
-    return Standard_False;
-  }
-
-  return Standard_True;
+  myIsDone = Standard_False;
 }
 
 //=======================================================================
@@ -170,13 +66,7 @@ void BRepExtrema_ProximityValueTool::LoadShapeLists (const BRepExtrema_ShapeList
   myShapeList1 = theShapeList1;
   myShapeList2 = theShapeList2;
 
-  myShape1 = theShapeList1 (0);
-  myIsInitS1 = getInfoForRefinement (myShape1, myShapeType1, myNbNodes1, myStep1);
-
-  myShape2 = theShapeList2 (0);
-  myIsInitS2 = getInfoForRefinement (myShape2, myShapeType2, myNbNodes2, myStep2);
-
-  MarkDirty();
+  myIsDone = Standard_False;
 }
 
 //=======================================================================
@@ -189,7 +79,7 @@ void BRepExtrema_ProximityValueTool::SetNbSamplePoints(const Standard_Integer th
   myNbSamples1 = theSamples1;
   myNbSamples2 = theSamples2;
 
-  MarkDirty();
+  myIsDone = Standard_False;
 }
 
 //=======================================================================
@@ -198,8 +88,6 @@ void BRepExtrema_ProximityValueTool::SetNbSamplePoints(const Standard_Integer th
 //=======================================================================
 Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
                                                                     const Standard_Integer theNbSamples1,
-                                                                    const BVH_Array3d& theAddVertices1,
-                                                                    const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
                                                                     const Handle(BRepExtrema_TriangleSet)& theSet2,
                                                                     const BRepExtrema_ShapeList& theShapeList1,
                                                                     const BRepExtrema_ShapeList& theShapeList2,
@@ -208,8 +96,7 @@ Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle
                                                                     ProxPnt_Status& thePointStatus1,
                                                                     ProxPnt_Status& thePointStatus2) const
 {
-  BRepExtrema_ProximityDistTool aProxDistTool (theSet1, theNbSamples1, theAddVertices1, theAddStatus1,
-                                               theSet2, theShapeList1, theShapeList2);
+  BRepExtrema_ProximityDistTool aProxDistTool (theSet1, theNbSamples1, theSet2, theShapeList1, theShapeList2);
   aProxDistTool.Perform();
 
   if (!aProxDistTool.IsDone())
@@ -221,311 +108,21 @@ Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle
   return aProxDistTool.ProximityDistance();
 }
 
-//=======================================================================
-//function : getEdgeAdditionalVertices
-//purpose  : Gets additional vertices and their statuses on the edge with the input step
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getEdgeAdditionalVertices (
-  const TopoDS_Edge& theEdge,
-  const Standard_Real theStep,
-  BVH_Array3d& theAddVertices,
-  NCollection_Vector<ProxPnt_Status>& theAddStatuses)
-{
-  BRepAdaptor_Curve aBAC (theEdge);
-  
-  if (!aBAC.Is3DCurve() || theStep < Precision::Confusion())
-  {
-    return Standard_False;
-  }
-
-  Standard_Real aLen = GCPnts_AbscissaPoint::Length (aBAC);
-  Standard_Integer aNbSamplePoints = (Standard_Integer) (aLen / theStep) + 1;
-
-  GCPnts_QuasiUniformAbscissa aGCPnts (aBAC, Max (3, aNbSamplePoints));
-
-  if (!aGCPnts.IsDone())
-    return Standard_False;
-
-  Standard_Integer aNbNodes = aGCPnts.NbPoints();
-  for (Standard_Integer aVertIdx = 2; aVertIdx < aNbNodes; ++aVertIdx) //don't add extreme points
-  {
-    Standard_Real aPar = aGCPnts.Parameter (aVertIdx);
-    gp_Pnt aP = aBAC.Value (aPar);
-
-    theAddVertices.push_back (BVH_Vec3d (aP.X(), aP.Y(), aP.Z()));
-    theAddStatuses.Append (ProxPnt_Status::ProxPnt_Status_MIDDLE);
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : doRecurTrgSplit
-//purpose  : Splits the triangle into two ones recursively, halving the longest side
-//           untill the area of ​​the current triangle > input step
-//! @param theTrg points of the triangle to be splitted
-//! @param theEdgesStatus status of triangle edges - on the border or middle of the face
-//! @param theTol telerance used in search of coincidence points
-//! @param theStep minimum area of ​​the resulting triangle
-//! @param theAddVertices vertices obtained halving sides
-//! @param theAddStatuses status of obtained vertices - on the border or middle of the face,
-//! from triangulation of which the input triangle is
-//=======================================================================
-void BRepExtrema_ProximityValueTool::doRecurTrgSplit (const gp_Pnt (&theTrg)[3],
-                                                      const ProxPnt_Status (&theEdgesStatus)[3],
-                                                      const Standard_Real theTol,
-                                                      const Standard_Real theStep,
-                                                      BVH_Array3d& theAddVertices,
-                                                      NCollection_Vector<ProxPnt_Status>& theAddStatuses)
-{
-  gp_XYZ aTrgSide1 = theTrg[1].Coord() - theTrg[0].Coord();
-  gp_XYZ aTrgSide2 = theTrg[2].Coord() - theTrg[0].Coord();
-  Standard_Real aTrgArea = 0.5 * aTrgSide1.CrossMagnitude (aTrgSide2);
-
-  if (aTrgArea - theStep < Precision::SquareConfusion())
-    return;
-
-  Standard_Real aD[3] { theTrg[0].Distance (theTrg[1]),
-                        theTrg[1].Distance (theTrg[2]),
-                        theTrg[2].Distance (theTrg[0]) };
-  Standard_Integer aBisectedEdgeIdx = aD[0] > aD[1] ? (aD[0] > aD[2] ? 0 : 2) : (aD[1] > aD[2] ? 1 : 2);
-  gp_Pnt aCenterOfMaxSide (theTrg[aBisectedEdgeIdx].Coord());
-  aCenterOfMaxSide.BaryCenter (0.5, theTrg[(aBisectedEdgeIdx + 1) % 3], 0.5);
-
-  Bnd_Box aBox;
-  aBox.Add (aCenterOfMaxSide);
-  aBox.Enlarge (theTol);
-  myInspector.SetCurrent (aCenterOfMaxSide.Coord());
-  myCells.Inspect (aBox.CornerMin().XYZ(), aBox.CornerMax().XYZ(), myInspector);
-  
-  if (myInspector.IsNeedAdd()) //is point aCenterOfMaxSide unique
-  {
-    BVH_Vec3d aBisectingPnt (aCenterOfMaxSide.X(), aCenterOfMaxSide.Y(), aCenterOfMaxSide.Z());
-    theAddVertices.push_back (aBisectingPnt);
-    theAddStatuses.Append (theEdgesStatus[aBisectedEdgeIdx]);
-    myInspector.Add (aCenterOfMaxSide.Coord());
-    myCells.Add (static_cast<BRepExtrema_VertexInspector::Target>(theAddVertices.size()),
-                 aBox.CornerMin().XYZ(), aBox.CornerMax().XYZ());
-  }
-
-  gp_Pnt aTrg1[3] = { theTrg[0], theTrg[1], theTrg[2] };
-  gp_Pnt aTrg2[3] = { theTrg[0], theTrg[1], theTrg[2] };
-  ProxPnt_Status aEdgesStatus1[3] = { theEdgesStatus[0], theEdgesStatus[1], theEdgesStatus[2] };
-  ProxPnt_Status aEdgesStatus2[3] = { theEdgesStatus[0], theEdgesStatus[1], theEdgesStatus[2] };
-  switch (aBisectedEdgeIdx)
-  {
-  case 0:
-    aTrg1[0] = aTrg2[1] = aCenterOfMaxSide;
-    aEdgesStatus1[2] = aEdgesStatus2[1] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    break;
-  case 1:
-    aTrg1[1] = aTrg2[2] = aCenterOfMaxSide;
-    aEdgesStatus1[0] = aEdgesStatus2[2] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    break;
-  case 2:
-    aTrg1[2] = aTrg2[0] = aCenterOfMaxSide;
-    aEdgesStatus1[1] = aEdgesStatus2[0] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    break;
-  }
-
-  doRecurTrgSplit (aTrg1, aEdgesStatus1, theTol, theStep, theAddVertices, theAddStatuses);
-  doRecurTrgSplit (aTrg2, aEdgesStatus2, theTol, theStep, theAddVertices, theAddStatuses);
-}
-
-static Standard_Real getModelRange (const TopLoc_Location& theLocation,
-                                    const Handle(Poly_Triangulation)& theTr)
-{
-  Bnd_Box aBox;
-  theTr->MinMax (aBox, theLocation.Transformation());
-  Standard_Real aXm = 0.0, aYm = 0.0, aZm = 0.0, aXM = 0.0, aYM = 0.0, aZM = 0.0;
-  aBox.Get (aXm, aYm, aZm, aXM, aYM, aZM);
-  Standard_Real aRange = aXM - aXm;
-  aRange = Max (aRange, aYM - aYm);
-  aRange = Max (aRange, aZM - aZm);
-
-  return aRange;
-}
-
-static void getNodesOfTrg (const Standard_Integer theTriIdx,
-                           const TopLoc_Location& theLocation,
-                           const Handle (Poly_Triangulation)& theTr,
-                           gp_Pnt (&theTrg)[3])
-{
-  Standard_Integer aVtxIdx1;
-  Standard_Integer aVtxIdx2;
-  Standard_Integer aVtxIdx3;
-
-  theTr->Triangle (theTriIdx).Get (aVtxIdx1, aVtxIdx2, aVtxIdx3);
-
-  gp_Pnt aVtx1 = theTr->Node (aVtxIdx1);
-  aVtx1.Transform (theLocation);
-  theTrg[0] = aVtx1;
-
-  gp_Pnt aVtx2 = theTr->Node (aVtxIdx2);
-  aVtx2.Transform (theLocation);
-  theTrg[1] = aVtx2;
-
-  gp_Pnt aVtx3 = theTr->Node (aVtxIdx3);
-  aVtx3.Transform (theLocation);
-  theTrg[2] = aVtx3;
-}
-
-// Gets status of triangle edges - on the border or middle of the face
-static void getEdgesStatus(const Standard_Integer theTriIdx,
-                           const Handle(Poly_Triangulation)& theTr,
-                           ProxPnt_Status (&theEdgesStatus1)[3])
-{
-  for (Standard_Integer j = 0; j < 3; j++)
-  {
-    Standard_Integer k = (j + 1) % 3;
-
-    if (BRepExtrema_ProximityDistTool::IsEdgeOnBorder (theTriIdx, j, k, theTr))
-    {
-      theEdgesStatus1[j] = ProxPnt_Status::ProxPnt_Status_BORDER;
-    }
-    else
-    {
-      theEdgesStatus1[j] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    }
-  }
-}
-
-//=======================================================================
-//function : getFaceAdditionalVertices
-//purpose  : Gets additional vertices and their statuses on the face with the input step (triangle square)
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getFaceAdditionalVertices (
-  const TopoDS_Face& theFace,
-  const Standard_Real theStep,
-  BVH_Array3d& theAddVertices,
-  NCollection_Vector<ProxPnt_Status>& theAddStatuses)
-{
-  Standard_Real aTol = Precision::Confusion();
-
-  TopLoc_Location aLocation;
-  Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (theFace, aLocation);
-
-  if (aTr.IsNull())
-  {
-    return Standard_False;
-  }
-
-  myCells.Reset (Max (aTol, getModelRange (aLocation, aTr) / IntegerLast()));
-
-  for (Standard_Integer aTriIdx = 1; aTriIdx <= aTr->NbTriangles(); ++aTriIdx)
-  {
-    gp_Pnt aTrg[3];
-    ProxPnt_Status aEdgesStatus[3];
-    getNodesOfTrg (aTriIdx, aLocation, aTr, aTrg);
-    getEdgesStatus (aTriIdx, aTr, aEdgesStatus);
-    doRecurTrgSplit (aTrg, aEdgesStatus, aTol, theStep, theAddVertices, theAddStatuses);
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : getShapesVertices
-//purpose  : Gets additional vertices on shapes with refining a coarser one if it's needed
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getShapesAdditionalVertices()
-{
-  // estimate the density of meshes of shapes to add points to a coarcer one
-  // target steps for refinement
-  Standard_Real aStep1 = myStep1;
-  Standard_Real aStep2 = myStep2;
-
-  if ((myShapeType1 == TopAbs_EDGE) && (myShapeType2 == TopAbs_EDGE))
-  {
-    if (myNbSamples1 > myNbNodes1) // 1st edge needs refinement
-    {
-      aStep1 = calcEdgeRefinementStep (TopoDS::Edge (myShape1), myNbSamples1);
-      myIsRefinementRequired1 = Standard_True;
-    }
-
-    if (myNbSamples2 > myNbNodes2) // 2nd edge needs refinement
-    {
-      aStep2 = calcEdgeRefinementStep (TopoDS::Edge (myShape2), myNbSamples2);
-      myIsRefinementRequired2 = Standard_True;
-    }
-
-    if (aStep1 / aStep2 > 2.) // 1st edge needs refinement
-    {
-      myIsRefinementRequired1 = Standard_True;
-      aStep1 = aStep2;
-    }
-    else if (aStep2 / aStep1 > 2.) // 2nd edge needs refinement
-    {
-      myIsRefinementRequired2 = Standard_True;
-      aStep2 = aStep1;
-    }
-
-    if (myIsRefinementRequired1)
-    {
-      if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape1), aStep1, myAddVertices1, myAddStatus1))
-      {
-        return Standard_False;
-      }
-    }
-
-    if (myIsRefinementRequired2)
-    {
-      if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape2), aStep2, myAddVertices2, myAddStatus2))
-      {
-        return Standard_False;
-      }
-    }
-  }
-  else if ((myShapeType1 == TopAbs_FACE) && (myShapeType2 == TopAbs_FACE))
-  {
-    if (aStep1 / aStep2 > 2) // 1st face needs refinement
-    {
-      myIsRefinementRequired1 = Standard_True;
-      aStep1 = myStep2;
-    }
-    else if (aStep2 / aStep1 > 2.) // 2nd face needs refinement
-    {
-      myIsRefinementRequired2 = Standard_True;
-      aStep2 = myStep1;
-    }
-
-    if (myIsRefinementRequired1)
-    {
-      return getFaceAdditionalVertices (TopoDS::Face (myShape1), aStep1, myAddVertices1, myAddStatus1);
-    }
-
-    if (myIsRefinementRequired2)
-    {
-      return getFaceAdditionalVertices (TopoDS::Face (myShape2), aStep2, myAddVertices2, myAddStatus2);
-    }
-  }
-
-  return Standard_True;
-}
-
 //=======================================================================
 //function : Perform
 //purpose  : Performs the computation of the proximity value
 //=======================================================================
 void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
 {
-  if (!myIsInitS1 || !myIsInitS2 || (myShapeType1 != myShapeType2))
-    return;
-
-  //get vertices on shapes with refining a coarser mesh if it's needed
-  if (!getShapesAdditionalVertices())
-    return;
+  myIsDone = Standard_False;
 
   // max(min) dist from the 1st shape to the 2nd one
   BVH_Vec3d aP1_1, aP1_2;
   ProxPnt_Status aPointStatus1_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
   ProxPnt_Status aPointStatus1_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
 
-  Standard_Real aProximityDist1 = computeProximityDist (mySet1, myNbSamples1, myAddVertices1, myAddStatus1,
-                                                        mySet2,
-                                                        myShapeList1, myShapeList2,
-                                                        aP1_1, aP1_2,
-                                                        aPointStatus1_1, aPointStatus1_2);
+  Standard_Real aProximityDist1 = computeProximityDist (mySet1, myNbSamples1, mySet2, myShapeList1, myShapeList2,
+                                                        aP1_1, aP1_2, aPointStatus1_1, aPointStatus1_2);
 
   if (aProximityDist1 < 0.)
     return;
@@ -535,11 +132,8 @@ void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
   ProxPnt_Status aPointStatus2_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
   ProxPnt_Status aPointStatus2_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
 
-  Standard_Real aProximityDist2 = computeProximityDist (mySet2, myNbSamples2, myAddVertices2, myAddStatus2,
-                                                        mySet1,
-                                                        myShapeList2, myShapeList1,
-                                                        aP2_2, aP2_1,
-                                                        aPointStatus2_2, aPointStatus2_1);
+  Standard_Real aProximityDist2 = computeProximityDist (mySet2, myNbSamples2, mySet1, myShapeList2, myShapeList1,
+                                                        aP2_2, aP2_1, aPointStatus2_2, aPointStatus2_1);
 
   if (aProximityDist2 < 0.)
     return;
@@ -565,23 +159,3 @@ void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
   myIsDone = Standard_True;
   theTolerance = myDistance;
 }
-
-//=======================================================================
-//function : Inspect
-//purpose  : Used for selection and storage of coinciding nodes
-//=======================================================================
-NCollection_CellFilter_Action BRepExtrema_VertexInspector::Inspect (const Standard_Integer theTarget)
-{
-  myIsNeedAdd = Standard_True;
-
-  const gp_XYZ& aPnt = myPoints.Value (theTarget - 1);
-  Standard_Real aDx, aDy, aDz;
-  aDx = myCurrent.X() - aPnt.X();
-  aDy = myCurrent.Y() - aPnt.Y();
-  aDz = myCurrent.Z() - aPnt.Z();
-
-  if ((aDx * aDx <= myTol) && (aDy * aDy <= myTol) && (aDz * aDz <= myTol))
-    myIsNeedAdd = Standard_False;
-
-  return CellFilter_Keep;
-}

src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx

@@ -1,4 +1,4 @@
-// Created on: 2022-08-08
+// Created on: 2022-08-08
 // Created by: Kseniya NOSULKO
 // Copyright (c) 2022 OPEN CASCADE SAS
 //
@@ -18,67 +18,9 @@
 
 #include <BRepExtrema_ProximityDistTool.hxx>
 #include <BRepExtrema_TriangleSet.hxx>
-#include <NCollection_CellFilter.hxx>
-#include <Precision.hxx>
-
-typedef NCollection_Vector<gp_XYZ> VectorOfPoint;
-
-//! Class BRepExtrema_VertexInspector
-//!   derived from NCollection_CellFilter_InspectorXYZ
-//!   This class define the Inspector interface for CellFilter algorithm,
-//!   working with gp_XYZ points in 3d space.
-//!   Used in search of coincidence points with a certain tolerance.
-class BRepExtrema_VertexInspector : public NCollection_CellFilter_InspectorXYZ
-{
-public:
-  typedef Standard_Integer Target;
-
-  //! Constructor; remembers the tolerance
-  BRepExtrema_VertexInspector()
-  : myTol (Precision::SquareConfusion()),
-    myIsNeedAdd (Standard_True)
-  {}
-
-  //! Keep the points used for comparison
-  void Add (const gp_XYZ& thePnt)
-  {
-    myPoints.Append (thePnt);
-  }
-
-  //! Set tolerance for comparison of point coordinates
-  void SetTol (const Standard_Real theTol)
-  {
-    myTol = theTol;
-  }
-
-  //! Set current point to search for coincidence
-  void SetCurrent (const gp_XYZ& theCurPnt)
-  {
-    myCurrent = theCurPnt;
-    myIsNeedAdd = Standard_True;
-  }
-
-  Standard_Boolean IsNeedAdd()
-  {
-    return myIsNeedAdd;
-  }
-
-  //! Implementation of inspection method
-  Standard_EXPORT NCollection_CellFilter_Action Inspect (const Standard_Integer theTarget);
-
-private:
-  Standard_Real myTol;
-  Standard_Boolean myIsNeedAdd;
-  VectorOfPoint myPoints;
-  gp_XYZ myCurrent;
-};
-
-typedef NCollection_CellFilter<BRepExtrema_VertexInspector> BRepExtrema_CellFilter;
-typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
 
 //! Tool class for computation of the proximity value from one BVH
 //! primitive set to another, solving max(min) problem.
-//! Handles only edge/edge or face/face cases.
 //! This tool is not intended to be used independently, and is integrated
 //! in other classes, implementing algorithms based on shape tessellation
 //! (BRepExtrema_ShapeProximity and BRepExtrema_SelfIntersection).
@@ -87,6 +29,8 @@ typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
 //! on the quality of input tessellation(s).
 class BRepExtrema_ProximityValueTool
 {
+public:
+  typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
 
 public:
 
@@ -142,17 +86,9 @@ public:
 
 private:
 
-  //! Gets shape data for further refinement.
-  Standard_Boolean getInfoForRefinement (const TopoDS_Shape& theShapes,
-                                         TopAbs_ShapeEnum& theShapeType,
-                                         Standard_Integer& theNbNodes,
-                                         Standard_Real& theStep);
-
   //! Returns the computed proximity value from first BVH to another one.
   Standard_Real computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
                                       const Standard_Integer theNbSamples1,
-                                      const BVH_Array3d& theAddVertices1,
-                                      const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
                                       const Handle(BRepExtrema_TriangleSet)& theSet2,
                                       const BRepExtrema_ShapeList& theShapeList1,
                                       const BRepExtrema_ShapeList& theShapeList2,
@@ -161,29 +97,6 @@ private:
                                       ProxPnt_Status& thePointStatus1,
                                       ProxPnt_Status& thePointStatus2) const;
 
-  //! Gets additional vertices on shapes with refining a coarser one if it's needed.
-  Standard_Boolean getShapesAdditionalVertices();
-
-  //! Gets additional vertices and their statuses on the edge with the input step.
-  Standard_Boolean getEdgeAdditionalVertices (const TopoDS_Edge& theEdge,
-                                              const Standard_Real theStep,
-                                              BVH_Array3d& theAddVertices,
-                                              NCollection_Vector<ProxPnt_Status>& theAddStatuses);
-
-  //! Gets additional vertices and their statuses on the face with the input step (triangle square).
-  Standard_Boolean getFaceAdditionalVertices (const TopoDS_Face& theFace,
-                                              const Standard_Real theStep,
-                                              BVH_Array3d& theAddVertices,
-                                              NCollection_Vector<ProxPnt_Status>& theAddStatuses);
-
-  //! Splits the triangle recursively, halving the longest side
-  //! to the area of ​​the current triangle > input step
-  void doRecurTrgSplit (const gp_Pnt (&theTrg)[3],
-                        const ProxPnt_Status (&theEdgesStatus)[3],
-                        const Standard_Real theTol,
-                        const Standard_Real theStep,
-                        BVH_Array3d& theAddVertices,
-                        NCollection_Vector<ProxPnt_Status>& theAddStatuses);
 private:
 
   //! Set of all mesh primitives of the 1st shape.
@@ -196,35 +109,6 @@ private:
   //! List of subshapes of the 2nd shape.
   BRepExtrema_ShapeList myShapeList2;
 
-  //! The 1st shape.
-  TopoDS_Shape myShape1;
-  //! The 2nd shape.
-  TopoDS_Shape myShape2;
-
-  BVH_Array3d myAddVertices1; //!< Additional vertices on the 1st shape if its mesh is coarser.
-  BVH_Array3d myAddVertices2; //!< Additional vertices on the 2nd shape if its mesh is coarser.
-
-  NCollection_Vector<ProxPnt_Status> myAddStatus1; //!< Status of additional vertices on the 1st shape.
-  NCollection_Vector<ProxPnt_Status> myAddStatus2; //!< Status of additional vertices on the 2nd shape.
-
-  Standard_Boolean myIsInitS1; //!< Is the 1st shape initialized?
-  Standard_Boolean myIsInitS2; //!< Is the 2nd shape initialized?
-
-  Standard_Boolean myIsRefinementRequired1; //!< Flag about the need to refine the 1st shape.
-  Standard_Boolean myIsRefinementRequired2; //!< Flag about the need to refine the 2nd shape.
-
-  Standard_Integer myNbNodes1; //!< Number of nodes in triangulation of the 1st shape.
-  Standard_Integer myNbNodes2; //!< Number of nodes in triangulation of the 2nd shape.
-
-  Standard_Real myStep1; //!< Step for getting vertices on the 1st shape.
-  Standard_Real myStep2; //!< Step for getting vertices on the 2nd shape.
-
-  BRepExtrema_CellFilter myCells;
-  BRepExtrema_VertexInspector myInspector;
-
-  TopAbs_ShapeEnum myShapeType1; //!< 1st shape type.
-  TopAbs_ShapeEnum myShapeType2; //!< 2nd shape type.
-
   Standard_Real myDistance;  //!< Distance
   Standard_Boolean myIsDone; //!< State of the algorithm
 

src/BRepExtrema/BRepExtrema_ShapeProximity.cxx

@@ -129,7 +129,6 @@ void BRepExtrema_ShapeProximity::Perform()
                                     myElementSet2);
     myProxValTool.LoadShapeLists (myShapeList1,
                                   myShapeList2);
-    myProxValTool.SetNbSamplePoints (myNbSamples1, myNbSamples2);
 
     myProxValTool.Perform (myTolerance);
     myProxValTool.ProximityPoints(myProxPoint1, myProxPoint2);

src/BRepExtrema/BRepExtrema_ShapeProximity.hxx

@@ -37,8 +37,7 @@
 //! on distance less than the given tolerance from each other.
 //!
 //! Second approach:
-//! Compute the proximity value between two shapes (handles only edge/edge or face/face cases)
-//! if the tolerance is not defined (Precision::Infinite()).
+//! Compute the proximity value between two shapes if the tolerance is not defined (Precision::Infinite()).
 //! In this case the proximity value is a minimal thickness of a layer containing both shapes.
 //!
 //! For the both approaches the high performance is achieved through the use of existing
@@ -47,6 +46,8 @@
 //! triangulation).
 class BRepExtrema_ShapeProximity
 {
+public:
+  typedef typename BRepExtrema_ProximityValueTool::ProxPnt_Status ProxPnt_Status;
 
 public:
 

src/BRepFeat/BRepFeat.cxx

@@ -312,7 +312,7 @@ void BRepFeat::ParametricMinMax(const TopoDS_Shape& S,
 //=======================================================================
 
 static Standard_Boolean IsIn (BRepTopAdaptor_FClass2d& FC,
-                              const Geom2dAdaptor_Curve& AC)
+                              Geom2dAdaptor_Curve      AC)
 {
  Standard_Real Def = 100*Precision::Confusion();
  GCPnts_QuasiUniformDeflection QU(AC,Def);

src/BRepFeat/BRepFeat_Form.cxx

@@ -489,7 +489,7 @@ static void Descendants(const TopoDS_Shape&,
 #endif
     theGlue.Perform();
     if (theGlue.IsDone()) {
-      const TopoDS_Shape& shshs = theGlue.ResultingShape();
+      TopoDS_Shape shshs = theGlue.ResultingShape();
 //      if (BRepOffsetAPI::IsTopologicallyValid(shshs)) {
       if (BRepAlgo::IsValid(shshs)) {
         UpdateDescendants(theGlue);

src/BRepFeat/BRepFeat_MakeDPrism.cxx

@@ -66,7 +66,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
   const TopoDS_Shape& theSFrom,
   const TopoDS_Shape& theSUntil);
 
-static Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+static Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
   const TopoDS_Shape& Until);
 
 static Handle(Geom_Curve) TestCurve(const TopoDS_Face&);
@@ -212,13 +212,13 @@ void BRepFeat_MakeDPrism::Perform(const Standard_Real Height)
   //  myPbase.Orientation(TopAbs_FORWARD);
 
   LocOpe_DPrism theDPrism(myPbase,theheight,myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
 
   MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
 
   myGShape = VraiDPrism;
   GeneratedShapeValid();  
-  const TopoDS_Shape& Base = theDPrism.FirstShape();
+  TopoDS_Shape Base = theDPrism.FirstShape();
   TopExp_Explorer exp(Base, TopAbs_FACE);
   TopoDS_Face theBase = TopoDS::Face(exp.Current());
   exp.Next();
@@ -295,12 +295,12 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
   Standard_Real Height = 
     sens*HeightMax(mySbase, mySkface, mySFrom, mySUntil);
   LocOpe_DPrism theDPrism(myPbase,Height,myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
   if(!Trf) {
     MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
     myGShape = VraiDPrism;
     GeneratedShapeValid();
-    const TopoDS_Shape& Base = theDPrism.FirstShape();
+    TopoDS_Shape Base = theDPrism.FirstShape();
     exp.Init(Base, TopAbs_FACE);
     TopoDS_Face theBase = TopoDS::Face(exp.Current());
     exp.Next();
@@ -350,7 +350,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
       UpdateDescendants(trP, trP.Shape(), Standard_False);
 
       TopExp_Explorer ex(trP.Shape(), TopAbs_SOLID);
-      const TopoDS_Shape& Cutsh = ex.Current();
+      TopoDS_Shape Cutsh = ex.Current();
       if(myFuse == 1) {
         BRepAlgoAPI_Fuse f(mySbase, Cutsh);
         myShape = f.Shape();
@@ -446,7 +446,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From,
   Standard_Real Height = 
     sens*HeightMax(mySbase, myPbase, mySFrom, mySUntil);
   LocOpe_DPrism theDPrism(myPbase, Height, Height, myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
 
 
   if(!Trff) {
@@ -575,7 +575,7 @@ void BRepFeat_MakeDPrism::PerformUntilEnd()
   //  myPbase.Orientation(TopAbs_FORWARD);
 
   LocOpe_DPrism theDPrism(myPbase, Height, myAngle);  
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
 
   MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
 
@@ -624,7 +624,7 @@ void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until)
     sens*HeightMax(mySbase, mySkface, mySFrom, mySUntil);
 
   LocOpe_DPrism theDPrism(myPbase, Height, Height, myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
   if(VraiDPrism.IsNull()) {
     NotDone();
     myStatusError = BRepFeat_NullRealTool;
@@ -762,7 +762,7 @@ void BRepFeat_MakeDPrism::PerformThruAll()
 
   Standard_Real Height = HeightMax(mySbase, mySkface, mySFrom, mySUntil);
   LocOpe_DPrism theDPrism(myPbase, Height, Height, myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
   MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
 
   myGShape = VraiDPrism;
@@ -819,13 +819,13 @@ void BRepFeat_MakeDPrism::PerformUntilHeight(const TopoDS_Shape& Until,
   Standard_Integer sens = SensOfPrism(C, mySUntil);
 
   LocOpe_DPrism theDPrism(myPbase,sens*Height,myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
 
   if(!Trf) {    // case face finished
     MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
     myGShape = VraiDPrism;
     GeneratedShapeValid();
-    const TopoDS_Shape& Base = theDPrism.FirstShape();
+    TopoDS_Shape Base = theDPrism.FirstShape();
     exp.Init(Base, TopAbs_FACE);
     TopoDS_Face theBase = TopoDS::Face(exp.Current());
     exp.Next();
@@ -1074,7 +1074,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,  // shape initial
 //function : SensOfPrism
 //purpose  : determine the direction of prism generation
 //=======================================================================
-Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
   const TopoDS_Shape& Until)
 {
   LocOpe_CSIntersector ASI1(Until);

src/BRepFeat/BRepFeat_MakePrism.cxx

@@ -68,7 +68,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
 			       const TopoDS_Shape& theSFrom,
 			       const TopoDS_Shape& theSUntil);
 
-static Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+static Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
 				    const TopoDS_Shape& Until);
 
 static Handle(Geom_Curve) TestCurve(const TopoDS_Shape&,
@@ -215,7 +215,7 @@ void BRepFeat_MakePrism::Perform(const Standard_Real Length)
 //construction of prism of height Length
 
   LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
   
 // management of descendants
   MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
@@ -325,7 +325,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
 
 // construction of long prism
   LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
 
 // in case of support of face Until
   if(!Trf) {    
@@ -366,7 +366,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
       UpdateDescendants(trP, trP.Shape(), Standard_False);
       //
       TopExp_Explorer ex(trP.Shape(), TopAbs_SOLID);
-      const TopoDS_Shape& Cutsh = ex.Current();
+      TopoDS_Shape Cutsh = ex.Current();
       if (myFuse == 1 && !myJustFeat) {
         BRepAlgoAPI_Fuse f(mySbase, Cutsh);
         myShape = f.Shape();
@@ -591,7 +591,7 @@ void BRepFeat_MakePrism::PerformUntilEnd()
   gp_Vec V(2*Height*myDir);
   
   LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
   
   MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
   
@@ -651,7 +651,7 @@ void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)
   gp_Vec Vtra(-3*Height*sens/2.*myDir);
   gp_Vec Vect(3*sens*Height*myDir);
   LocOpe_Prism thePrism(myPbase,Vect,Vtra);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
   
   if(!Trf) {  // case face until 
     MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
@@ -775,7 +775,7 @@ void BRepFeat_MakePrism::PerformThruAll()
   gp_Vec V(3*Height*myDir);
   gp_Vec Vtra(-3*Height/2.*myDir);
   LocOpe_Prism thePrism(myPbase,V,Vtra);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
   MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
 
   myGShape = VraiPrism;
@@ -830,7 +830,7 @@ void BRepFeat_MakePrism::PerformUntilHeight(const TopoDS_Shape& Until,
   Standard_Integer sens = SensOfPrism(C, mySUntil);
   gp_Vec V(sens*Length*myDir);
   LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
 
   if(!Trf) {
     MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
@@ -978,7 +978,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
 //function : SensOfPrism
 //purpose  : Direction of the prism depending on the shape Until
 //=======================================================================
-Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
 			     const TopoDS_Shape& Until)
 {
   LocOpe_CSIntersector ASI1(Until);

src/BRepFeat/BRepFeat_MakeRevol.cxx

@@ -353,7 +353,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
     myGShape = VraiRevol;
     GeneratedShapeValid();
 
-    const TopoDS_Shape& Base = theRevol.FirstShape();
+    TopoDS_Shape Base = theRevol.FirstShape();
     exp.Init(Base, TopAbs_FACE);
     TopoDS_Face theBase = TopoDS::Face(exp.Current());
     exp.Next();
@@ -633,7 +633,7 @@ void BRepFeat_MakeRevol::PerformUntilAngle(const TopoDS_Shape& Until,
     myGShape = VraiRevol;
     GeneratedShapeValid();
 
-    const TopoDS_Shape& Base = theRevol.FirstShape();
+    TopoDS_Shape Base = theRevol.FirstShape();
     exp.Init(Base, TopAbs_FACE);
     TopoDS_Face theBase = TopoDS::Face(exp.Current());
     exp.Next();
@@ -732,7 +732,7 @@ static void VerifGluedFaces(const TopoDS_Face& theSkface,
   TopTools_DataMapOfShapeShape& theMap)
 {
   Standard_Boolean GluedFaces = Standard_True;
-  const TopoDS_Shape& VraiRevol = theRevol.Shape();
+  TopoDS_Shape VraiRevol = theRevol.Shape();
 
   TColGeom_SequenceOfCurve scur;
   theRevol.Curves(theCurves);

src/BRepFill/BRepFill.cxx

@@ -986,8 +986,8 @@ TopoDS_Wire BRepFill::InsertACR(const TopoDS_Wire& wire,
       }
     }
 
-    const TopoDS_Edge& E = anExp.Current();
-    const TopoDS_Vertex& V = anExp.CurrentVertex();
+    TopoDS_Edge E = anExp.Current();
+    TopoDS_Vertex V = anExp.CurrentVertex();
 
     if (ndec==0 || BRep_Tool::Degenerated(E)) {
       // copy the edge

src/BRepFill/BRepFill_AdvancedEvolved.cxx

@@ -44,8 +44,6 @@
 #include <BRepGProp_Face.hxx>
 #include <BRep_TEdge.hxx>
 #include <ShapeUpgrade_UnifySameDomain.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
 
 #ifdef BRepFill_AdvancedEvolved_DEBUG
 #include <BinTools.hxx>
@@ -526,14 +524,9 @@ void BRepFill_AdvancedEvolved::GetLids()
     return;
   }
 
-  Standard_Real aTol = Max(aFS.Tolerance(), aFS.ToleranceReached());
-  aTol += myFuzzyValue;
-  Bnd_Box aProfBox;
-  BRepBndLib::Add(myProfile, aProfBox);
-  Standard_Real aSqDiag = aProfBox.SquareExtent();
   //Square of the default angular tolerance in
   //BOPAlgo_Tools::EdgesToWires(...) and BOPAlgo_Tools::WiresToFaces(...) methods
-  const Standard_Real aSqAnguarTol = aTol*aTol / aSqDiag;
+  const Standard_Real aSqAnguarTol = 1.0e-16;
   const gp_Dir &aNormal = aSurf->Position().Direction();
 
   // Obtain free-edges from myPipeShell. All edges must be planar
@@ -548,7 +541,6 @@ void BRepFill_AdvancedEvolved::GetLids()
   gp_Pnt aPtmp;
   gp_Vec aTan;
 
-  Standard_Real aDPMax = 0.;
   for (Standard_Integer i = 1; i <= aMapEF.Size(); i++)
   {
     TopTools_ListOfShape& aListF = aMapEF(i);
@@ -572,8 +564,6 @@ void BRepFill_AdvancedEvolved::GetLids()
       continue;
 
     const Standard_Real aDP = aTan.XYZ().Dot(aNormal.XYZ());
-    if (Abs(aDP) > aDPMax)
-      aDPMax = Abs(aDP);
     if (aDP*aDP>aSqModulus*aSqAnguarTol)
     {
       //Only planar edges are considered
@@ -604,9 +594,8 @@ void BRepFill_AdvancedEvolved::GetLids()
   aBB.MakeCompound(aCompW);
   aBB.MakeCompound(aCompF);
   aBB.MakeCompound(myTopBottom);
-  Standard_Real anAngTol = Sqrt(aSqAnguarTol);
-  BOPAlgo_Tools::EdgesToWires(aFreeEdges, aCompW, Standard_True, anAngTol);
-  BOPAlgo_Tools::WiresToFaces(aCompW, aCompF, anAngTol);
+  BOPAlgo_Tools::EdgesToWires(aFreeEdges, aCompW, Standard_True);
+  BOPAlgo_Tools::WiresToFaces(aCompW, aCompF);
 
   {
     // Check orientation

src/BRepFill/BRepFill_CompatibleWires.cxx

@@ -128,7 +128,7 @@ static void AddNewEdge(const TopoDS_Shape& theEdge,
     const TopTools_SequenceOfShape& NewEdges = theEdgeNewEdges(theEdge);
     for (Standard_Integer i = 1; i <= NewEdges.Length(); i++)
     {
-      const TopoDS_Shape& anEdge = NewEdges(i);
+      TopoDS_Shape anEdge = NewEdges(i);
       AddNewEdge(anEdge, theEdgeNewEdges, ListNewEdges);
     }
   }
@@ -140,9 +140,10 @@ static void SeqOfVertices (const TopoDS_Wire&   W,
 			   TopTools_SequenceOfShape& S)
 {
   S.Clear();
-  Standard_Integer jj;
+  Standard_Integer jj, cpt = 0;
   TopExp_Explorer PE;
   for (PE.Init(W,TopAbs_VERTEX); PE.More(); PE.Next()) {
+    cpt++;
     Standard_Boolean trouve=Standard_False;
     for (jj=1;jj<=S.Length() && (!trouve);jj++) {
       if (S.Value(jj).IsSame(PE.Current())) trouve = Standard_True; 
@@ -350,10 +351,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
     for (j=1; j<=ndec; j++) {
       // piece of edge  
       m1 = (CutValues.Value(j)-t0)*(last-first)/(t1-t0)+first;
-      if (Abs(m0 - m1) < Precision::Confusion())
-      {
-        return;
-      }
       TopoDS_Edge CutE = BRepLib_MakeEdge(C,V0,Vbid,m0,m1);
       CutE.Orientation(CurrentOrient);
       S.Append(CutE);
@@ -361,10 +358,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
       V0 = TopExp::LastVertex(CutE);
       if (j==ndec) {
 	// last piece
-        if (Abs(m0 - last) < Precision::Confusion())
-        {
-          return;
-        }
 	TopoDS_Edge LastE = BRepLib_MakeEdge(C,V0,Vl,m0,last);
 	LastE.Orientation(CurrentOrient);
 	S.Append(LastE);
@@ -378,10 +371,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
     for (j=ndec; j>=1; j--) {
       // piece of edge  
       m0 = (CutValues.Value(j)-t0)*(last-first)/(t1-t0)+first;
-      if (Abs(m0 - m1) < Precision::Confusion())
-      {
-        return;
-      }
       TopoDS_Edge CutE = BRepLib_MakeEdge(C,Vbid,V1,m0,m1);
       CutE.Orientation(CurrentOrient);
       S.Append(CutE);
@@ -389,10 +378,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
       V1 = TopExp::FirstVertex(CutE);
       if (j==1) {
 	// last piece
-        if (Abs(first - m1) < Precision::Confusion())
-        {
-          return;
-        }
 	TopoDS_Edge LastE = BRepLib_MakeEdge(C,Vf,V1,first,m1);
 	LastE.Orientation(CurrentOrient);
 	S.Append(LastE);
@@ -562,10 +547,6 @@ static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1,
 	  SR.Clear();
 	  SR.Append(param);
 	  TrimEdge(E,SR,first,last,SO,SE);
-          if (SE.IsEmpty())
-          {
-            return Standard_False;
-          }
           theEdgeNewEdges(E) = SE;
 	  TopoDS_Vertex VV1,VV2;
 	  TopExp::Vertices(TopoDS::Edge(SE.Value(1)),VV1,VV2);
@@ -675,7 +656,7 @@ static void BuildConnectedEdges(const TopoDS_Wire& aWire,
 //=======================================================================
 
 BRepFill_CompatibleWires::BRepFill_CompatibleWires() 
-:myStatus(BRepFill_ThruSectionErrorStatus_NotDone)
+:myIsDone(Standard_False)
 {
 }
 
@@ -700,8 +681,8 @@ void BRepFill_CompatibleWires::Init(const TopTools_SequenceOfShape& Sections)
 {
   myInit = Sections;
   myWork = Sections;
-  myPercent = 0.1;
-  myStatus = BRepFill_ThruSectionErrorStatus_NotDone;
+  myPercent = 0.01;
+  myIsDone = Standard_False;
   myMap.Clear();
 
 }
@@ -726,7 +707,7 @@ void BRepFill_CompatibleWires::SetPercent(const Standard_Real Percent)
 
 Standard_Boolean BRepFill_CompatibleWires::IsDone() const 
 {
-  return myStatus == BRepFill_ThruSectionErrorStatus_Done;
+  return myIsDone;
 }
 
 
@@ -785,7 +766,6 @@ Standard_Boolean BRepFill_CompatibleWires::IsDegeneratedLastSection() const
 
 void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
 {
-  myStatus = BRepFill_ThruSectionErrorStatus_Done;
   // compute origin and orientation on wires to avoid twisted results
   // and update wires to have same number of edges
 
@@ -818,6 +798,7 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
   report = (nbmax != nbmin || contS >= GeomAbs_C1 );
   
   // initialization of the map
+  Standard_Integer nbE = 0;
   TopTools_ListOfShape Empty;
   for (i=1; i<=nbSects; i++) {
     TopoDS_Wire W = TopoDS::Wire(myWork(i));
@@ -825,6 +806,7 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
       TopoDS_Edge E = TopoDS::Edge(anExp.Current());
       myMap.Bind(E,Empty);
       myMap(E).Append(E);
+      nbE++;
     }
   } 
   
@@ -856,7 +838,7 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
     allClosed = (allClosed && wClosed);
     allOpen = (allOpen && !wClosed);
   }
-
+  
   if (allClosed) {
     // All sections are closed 
     if (report) {
@@ -867,26 +849,24 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
       // origin
       ComputeOrigin(Standard_False);
     }
+    myIsDone = Standard_True;
   }
   else if (allOpen) {
     // All sections are open
     // origin
     SearchOrigin();
-    if (myStatus != BRepFill_ThruSectionErrorStatus_Done)
-    {
-      return;
-    }
     // same number of elements
     if (report) {
       SameNumberByACR(report);
     }
+    myIsDone = Standard_True;
   }
   else {
     // There are open and closed sections :
     // not processed
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
+    throw Standard_DomainError("Sections must be all closed or all open");
   }
+  
 }
 
 
@@ -926,10 +906,7 @@ void BRepFill_CompatibleWires::
     //allClosed = (allClosed && myWork(i).Closed());
   }
   if (!allClosed)
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SameNumberByPolarMethod : the wires must be closed");
   
   // sections ponctuelles, sections bouclantes ?
   if (myDegen1) ideb++;
@@ -1009,11 +986,8 @@ void BRepFill_CompatibleWires::
     
     // sequence of vertices of the first wire
     SeqOfVertices(wire1,SeqV);
-    if (SeqV.Length() > NbMaxV)
-    {
-      myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-      return;
-    }
+    if (SeqV.Length()>NbMaxV) 
+      throw Standard_NoSuchObject("BRepFill::SameNumberByPolarMethod failed");
     
     // loop on vertices of wire1
     for (ii=1;ii<=SeqV.Length();ii++) {
@@ -1088,10 +1062,7 @@ void BRepFill_CompatibleWires::
     // sequence of vertices of the first wire
     SeqOfVertices(wire1,SeqV);
     if ( SeqV.Length()>NbMaxV || SeqV.Length()>SizeMap ) 
-    {
-      myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-      return;
-    }
+      throw Standard_NoSuchObject("BRepFill::SameNumberByPolarMethod failed");
     
 
     // next wire 
@@ -1213,17 +1184,14 @@ void BRepFill_CompatibleWires::
 	}
       } //end of for(; itW.More(); itW.Next())
     if (Esol.IsNull())
-    {
-      myStatus = BRepFill_ThruSectionErrorStatus_ProfilesInconsistent;
-      return;
-    }
+      throw Standard_ConstructionError("BRepFill :: profiles are inconsistent");
     MW.Add(Esol);
 
     TopTools_ListOfShape ConnectedEdges;
     BuildConnectedEdges( TopoDS::Wire(myWork(i)), Esol, V2, ConnectedEdges );
 
     TopTools_ListIteratorOfListOfShape itCE(ConnectedEdges);
-    for(; anExp.More() && itCE.More(); anExp.Next(), itCE.Next())
+    for(; anExp.More(), itCE.More(); anExp.Next(), itCE.Next())
       {
 	ECur = anExp.Current();
 	TopExp::Vertices(ECur,VF,VL,Standard_True);
@@ -1296,17 +1264,15 @@ void BRepFill_CompatibleWires::
     if (nbmax<nbEdges) nbmax = nbEdges;
     if (nbmin>nbEdges) nbmin = nbEdges;
   }
-  if (nbmin!=nbmax) 
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-    return;
+  if (nbmin!=nbmax) {
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SameNumberByPolarMethod failed");
   }
 
   //Fill <myMap>
   TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap(myMap);
   for (; itmap.More(); itmap.Next())
   {
-    const TopoDS_Shape& anEdge = itmap.Key();
+    TopoDS_Shape anEdge = itmap.Key();
     TopTools_ListOfShape ListOfNewEdges;
 
     //for each edge of <myMap> find all newest edges
@@ -1471,11 +1437,15 @@ void BRepFill_CompatibleWires::SameNumberByACR(const  Standard_Boolean  report)
 	    TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap;
 	    //TopTools_ListIteratorOfListOfShape itlist;
 	    TopoDS_Edge Ancestor;
+	    Standard_Integer nbedge, nblist=0;
 	    Standard_Boolean found = Standard_False;
 
 	    for (itmap.Initialize(myMap);itmap.More()&&(!found);itmap.Next()) {
+	      nblist++;
 	      TopTools_ListIteratorOfListOfShape itlist(itmap.Value());
+	      nbedge = 0;
 	      while (itlist.More()&&(!found)) {
+		nbedge++;
 		TopoDS_Edge ECur = TopoDS::Edge(itlist.Value());
 		    
 		if (Ecur.IsSame(ECur)) {
@@ -1517,10 +1487,7 @@ void BRepFill_CompatibleWires::SameNumberByACR(const  Standard_Boolean  report)
     if (nbmin>nbEdges(i)) nbmin = nbEdges(i);
   }
   if (nbmax!=nbmin) 
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SameNumberByACR failed");
 }
 
 //=======================================================================
@@ -1565,10 +1532,7 @@ void BRepFill_CompatibleWires::ComputeOrigin(const  Standard_Boolean /*polar*/ )
   }
 */
   if (!allClosed) 
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::ComputeOrigin : the wires must be closed");
 
 /*  
   // Max number of possible cuts
@@ -1905,10 +1869,7 @@ void BRepFill_CompatibleWires::ComputeOrigin(const  Standard_Boolean /*polar*/ )
       gp_Pnt Pmini,P1,P2;
       SeqOfVertices(wire,SeqV);
       if (SeqV.Length()>NbMaxV) 
-      {
-        myStatus = BRepFill::ThruSectionsError_Failed;
-        return;
-      }
+	throw Standard_NoSuchObject("BRepFill::ComputeOrigin failed");
       if (!polar) {
 	// choix du vertex le plus proche comme origine
 	distmini = Precision::Infinite();
@@ -2133,10 +2094,7 @@ void BRepFill_CompatibleWires::SearchOrigin()
     allOpen = (allOpen && !myWork(i).Closed());
   }
   if (!allOpen)
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SearchOrigin : the wires must be open");
 
   // init
 

src/BRepFill/BRepFill_CompatibleWires.hxx

@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 
-#include <BRepFill_ThruSectionErrorStatus.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
@@ -50,11 +49,6 @@ public:
   Standard_EXPORT void Perform (const Standard_Boolean WithRotation = Standard_True);
   
   Standard_EXPORT Standard_Boolean IsDone() const;
-
-  BRepFill_ThruSectionErrorStatus GetStatus() const
-  {
-    return myStatus;
-  }
   
   //! returns the generated sequence.
   Standard_EXPORT const TopTools_SequenceOfShape& Shape() const;
@@ -107,7 +101,7 @@ private:
   Standard_Real myPercent;
   Standard_Boolean myDegen1;
   Standard_Boolean myDegen2;
-  BRepFill_ThruSectionErrorStatus myStatus;
+  Standard_Boolean myIsDone;
   TopTools_DataMapOfShapeListOfShape myMap;
 
 

src/BRepFill/BRepFill_Evolved.cxx

@@ -711,7 +711,7 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
     for (WireExp.Init(TopoDS::Wire(FaceExp.Current())); WireExp.More(); 
       WireExp.Next()) {
 
-        const TopoDS_Edge&   CurrentEdge = WireExp.Current();
+        TopoDS_Edge   CurrentEdge = WireExp.Current();
         TopoDS_Vertex VFirst,VLast;
         EdgeVertices(CurrentEdge,VFirst,VLast);
 
@@ -770,7 +770,9 @@ void BRepFill_Evolved::ElementaryPerform (const TopoDS_Face&              Sp,
     TopTools_DataMapOfShapeSequenceOfShape MapSeqVer;
     BRepFill_DataMapOfShapeSequenceOfPnt   MapSeqPar;
 
+    Standard_Integer vv = 0;
     for(ProfExp.Init(myProfile); ProfExp.More(); ProfExp.Next()) {
+      vv++;
       //-----------------------------------------------
       // Return two faces separated by the bissectrice.
       //-----------------------------------------------
@@ -2137,7 +2139,7 @@ void BRepFill_Evolved::MakeSolid()
   B.MakeCompound(Res);
 
   for (; exp.More(); exp.Next()) {
-    const TopoDS_Shape& Sh = exp.Current();
+    TopoDS_Shape Sh = exp.Current();
     B.MakeSolid(Sol);
     B.Add(Sol,Sh);
     BRepClass3d_SolidClassifier SC(Sol);

src/BRepFill/BRepFill_Filling.cxx

@@ -59,7 +59,7 @@
 #include <TopoDS_Wire.hxx>
 #include <Geom_Surface.hxx>
 
-static gp_Vec MakeFinVec( const TopoDS_Wire& aWire, const TopoDS_Vertex& aVertex )
+static gp_Vec MakeFinVec( const TopoDS_Wire aWire, const TopoDS_Vertex aVertex )
 {
   TopoDS_Vertex Vfirst, Vlast, Origin;
   BRepTools_WireExplorer Explo( aWire );

src/BRepFill/BRepFill_Generator.cxx

@@ -65,7 +65,6 @@ Standard_Integer DetectKPart(const TopoDS_Edge& Edge1,
 			     const TopoDS_Edge& Edge2)
 {
   // initializations
-  // !Note if IType set as -1 it means that occurs error with null 3d curve for the edge
   Standard_Integer IType = 0;
 
   // characteristics of the first edge
@@ -90,9 +89,7 @@ Standard_Integer DetectKPart(const TopoDS_Edge& Edge1,
   else {
     curv1 = BRep_Tool::Curve(Edge1, loc, first1, last1);
     if (curv1.IsNull())
-    {
-      return -1;
-    }
+      throw Standard_NullObject("Null 3D curve in edge");
     curv1 = 
       Handle(Geom_Curve)::DownCast(curv1->Transformed(loc.Transformation()));
     ff = first1;
@@ -159,9 +156,7 @@ Standard_Integer DetectKPart(const TopoDS_Edge& Edge1,
     else {
       curv = BRep_Tool::Curve(Edge2, loc, first2, last2);
       if (curv.IsNull())
-      {
-        return -1;
-      }
+        throw Standard_NullObject("Null 3D curve in edge");
       curv = 
 	Handle(Geom_Curve)::DownCast(curv->Transformed(loc.Transformation()));
       ff = first2;
@@ -317,12 +312,12 @@ Standard_Integer DetectKPart(const TopoDS_Edge& Edge1,
 
 //=======================================================================
 //function : CreateKPart
-//purpose  : Returns true if there is no errors occur
+//purpose  : 
 //=======================================================================
 
-Standard_Boolean CreateKPart (const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
-                              const Standard_Integer IType, 
-                              Handle(Geom_Surface)& Surf)
+void CreateKPart(const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
+		 const Standard_Integer IType, 
+		 Handle(Geom_Surface)& Surf)
 {
   // find the dimension
   TopoDS_Vertex V1, V2;
@@ -331,8 +326,6 @@ Standard_Boolean CreateKPart (const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
   Standard_Real a1, b1, aa =0., bb =0.;
   TopoDS_Vertex v1f,v1l,v2f,v2l;
 
-  Standard_Boolean isDone = Standard_True;
-
   // find characteristics of the first edge
   Handle(Geom_Curve) C1;
   Standard_Boolean degen1 = BRep_Tool::Degenerated(Edge1);
@@ -343,9 +336,7 @@ Standard_Boolean CreateKPart (const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
   else {
     C1 = BRep_Tool::Curve(Edge1, loc, a1, b1);
     if (C1.IsNull())
-    {
-      return Standard_False;
-    }
+      throw Standard_NullObject("Null 3D curve in edge");
     C1 = Handle(Geom_Curve)::DownCast(C1->Transformed(loc.Transformation()));
     aa = a1;
     bb = b1;
@@ -370,9 +361,7 @@ Standard_Boolean CreateKPart (const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
   else {
     C2 = BRep_Tool::Curve(Edge2, loc, a1, b1);
     if (C2.IsNull())
-    {
-      return Standard_False;
-    }
+      throw Standard_NullObject("Null 3D curve in edge");
     C2 = Handle(Geom_Curve)::DownCast(C2->Transformed(loc.Transformation()));
     if (Edge2.Orientation() == TopAbs_REVERSED) {
       C2->Reverse();
@@ -507,7 +496,6 @@ Standard_Boolean CreateKPart (const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
     // IType incorrect
   }
   Surf = surface;
-  return isDone;
 }
 
 //=======================================================================
@@ -540,8 +528,7 @@ static TopoDS_Edge CreateNewEdge(const TopoDS_Edge& theEdge, TopTools_DataMapOfS
 //=======================================================================
 
 BRepFill_Generator::BRepFill_Generator(): 
-  myMutableInput (Standard_True),
-  myStatus (BRepFill_ThruSectionErrorStatus_NotDone)
+  myMutableInput (Standard_True)
 {
 }
 
@@ -564,8 +551,6 @@ void BRepFill_Generator::AddWire(const TopoDS_Wire& Wire)
 
 void BRepFill_Generator::Perform()
 {
-  myStatus = BRepFill_ThruSectionErrorStatus_Done;
-
   TopoDS_Shell Shell;
   TopoDS_Face  Face;
   TopoDS_Shape S1, S2;
@@ -694,12 +679,6 @@ void BRepFill_Generator::Perform()
 
       // processing of KPart
       Standard_Integer IType = DetectKPart(Edge1,Edge2);
-      if (IType == -1)
-      {
-        myStatus = BRepFill_ThruSectionErrorStatus_Null3DCurve;
-        return;
-      }
-
       if (IType==0) {
 	// no part cases
 	TopLoc_Location L,L1,L2;
@@ -715,10 +694,7 @@ void BRepFill_Generator::Perform()
 	else {
 	  C1 = BRep_Tool::Curve(Edge1,L1,f1,l1);
           if (C1.IsNull())
-          {
-            myStatus = BRepFill_ThruSectionErrorStatus_Null3DCurve;
-            return;
-          }
+            throw Standard_NullObject("Null 3D curve in edge");
 	}
 	if (degen2) {
 	  Extremities(1) = BRep_Tool::Pnt(V2l);
@@ -728,10 +704,7 @@ void BRepFill_Generator::Perform()
 	else {
 	  C2 = BRep_Tool::Curve(Edge2,L2,f2,l2);
           if (C2.IsNull())
-          {
-            myStatus = BRepFill_ThruSectionErrorStatus_Null3DCurve;
-            return;
-          }
+            throw Standard_NullObject("Null 3D curve in edge");
 	}
 	
 	// compute the location
@@ -773,11 +746,7 @@ void BRepFill_Generator::Perform()
       }
       else {
 	// particular case
-        if (!CreateKPart(Edge1, Edge2, IType, Surf))
-        {
-          myStatus = BRepFill_ThruSectionErrorStatus_Null3DCurve;
-          return;
-        }
+	CreateKPart(Edge1,Edge2,IType,Surf);
 	B.MakeFace(Face,Surf,Precision::Confusion());
       }
       

src/BRepFill/BRepFill_Generator.hxx

@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 
-#include <BRepFill_ThruSectionErrorStatus.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
@@ -69,12 +68,6 @@ public:
   //! Returns the current mutable input state
   Standard_EXPORT Standard_Boolean IsMutableInput() const;
 
-  //! Returns status of the operation
-  BRepFill_ThruSectionErrorStatus GetStatus() const
-  {
-    return myStatus;
-  }
-
 protected:
 
 private:
@@ -85,7 +78,6 @@ private:
   TopTools_DataMapOfShapeShape myOldNewShapes;
   BRepTools_ReShape myReshaper;
   Standard_Boolean myMutableInput;
-  BRepFill_ThruSectionErrorStatus myStatus;
 
 };
 

src/BRepFill/BRepFill_MultiLine.cxx

@@ -655,7 +655,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real        U,
     }
 #endif    
 
-    const Geom2dAdaptor_Curve& Cu1 = TheV;
+    Geom2dAdaptor_Curve Cu1 = TheV;
     Geom2dAdaptor_Curve Cu2( Line);
 
     Standard_Real TolConf = 0.;

src/BRepFill/BRepFill_OffsetWire.cxx

@@ -570,7 +570,7 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset,
       TopoDS_Iterator itws( myWorkSpine );
       for (; itws.More(); itws.Next())
       {
-        const TopoDS_Shape& aWire = itws.Value();
+        TopoDS_Shape aWire = itws.Value();
         aSubst.Build( aWire );
         if (aSubst.IsCopied(aWire))
         {

src/BRepFill/BRepFill_Pipe.cxx

@@ -746,7 +746,7 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S,
     TopExp_Explorer Explo(result, TopAbs_FACE);
     for (; Explo.More(); Explo.Next())
     {
-      const TopoDS_Shape& aFace = Explo.Current();
+      TopoDS_Shape aFace = Explo.Current();
       RebuildTopOrBottomFace(aFace.Reversed(), Standard_True); //top face was reversed
     }
     /////
@@ -987,7 +987,7 @@ void BRepFill_Pipe::RebuildTopOrBottomFace(const TopoDS_Shape& aFace,
     TopoDS_Iterator itw(aWire);
     for (; itw.More(); itw.Next())
     {
-      const TopoDS_Shape& anEdge = itw.Value();
+      TopoDS_Shape anEdge = itw.Value();
       for (ii = myCurIndexOfSectionEdge; ii <= mySections->ColLength(); ii++)
       {
         TopoDS_Shape aVisoEdge = mySections->Value(ii, IndexOfSection);

src/BRepFill/BRepFill_PipeShell.cxx

@@ -1116,7 +1116,7 @@ void BRepFill_PipeShell::Generated(const TopoDS_Shape&   theShape,
         for (; Explo.More(); Explo.Next())
         {
           const TopoDS_Edge& anEdge = TopoDS::Edge(Explo.Current());
-          const TopTools_ListOfShape& aNewEdges = Georges.GeneratedShapes(anEdge);
+          TopTools_ListOfShape aNewEdges = Georges.GeneratedShapes(anEdge);
           myEdgeNewEdges.Bind(anEdge, aNewEdges);
         }
       }
@@ -1168,7 +1168,7 @@ void BRepFill_PipeShell::Place(const BRepFill_Section& Sec,
 				  Sec.Vertex(),
 				  Sec.WithContact(),
 				  Sec.WithCorrection());
-  const TopoDS_Wire& TmpWire =  Sec.Wire();
+  TopoDS_Wire TmpWire =  Sec.Wire();
   aTrsf = Place.Transformation();
   //Transform the copy
   W = TopoDS::Wire(BRepBuilderAPI_Transform(TmpWire, aTrsf, Standard_True));

src/BRepFill/BRepFill_Sweep.cxx

@@ -798,7 +798,7 @@ static TopoDS_Edge BuildEdge(Handle(Geom_Curve)& C3d,
   const Handle(IntTools_Context) aNullCtx;
   if (BOPTools_AlgoTools::IsMicroEdge(E, aNullCtx))
   {
-    const TopoDS_Vertex& aV = VF;
+    TopoDS_Vertex aV = VF;
     B.UpdateVertex(aV, P1.Distance(P2));
     B.MakeEdge(E);
     B.UpdateEdge(E, C2d, S, TopLoc_Location(), Tol);

src/BRepFill/BRepFill_ThruSectionErrorStatus.hxx

@@ -1,29 +0,0 @@
-// Copyright (c) 2022 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _BRepFill_ThruSectionErrorStatus_HeaderFile
-#define _BRepFill_ThruSectionErrorStatus_HeaderFile
-
-//! Errors that can occur at thrusection algorithm.
-enum BRepFill_ThruSectionErrorStatus
-{
-  BRepFill_ThruSectionErrorStatus_Done,                     //!< Thrusection algorithm is done
-  BRepFill_ThruSectionErrorStatus_NotDone,                  //!< Thrusection algorithm is not done
-  BRepFill_ThruSectionErrorStatus_NotSameTopology,          //!< All profiles have not same topology (they should be all closed or all opened)
-  BRepFill_ThruSectionErrorStatus_ProfilesInconsistent,     //!< Profiles are inconsistent 
-  BRepFill_ThruSectionErrorStatus_WrongUsage,               //!< Wrong usage of punctual sections
-  BRepFill_ThruSectionErrorStatus_Null3DCurve,              //!< Null 3D curve in edge
-  BRepFill_ThruSectionErrorStatus_Failed                    //!< Thrusection algorithm has failed
-};
-
-#endif // _BRepFill_ThruSectionErrorStatus_HeaderFile

src/BRepFill/BRepFill_TrimEdgeTool.cxx

@@ -180,8 +180,8 @@ static void EvalParameters(const Geom2dAdaptor_Curve& Bis,
   Standard_Real Tol = Precision::Confusion();
   //  Standard_Real TolC = 1.e-9;
 
-  const Geom2dAdaptor_Curve& CBis(Bis);
-  const Geom2dAdaptor_Curve& CAC (AC);
+  Geom2dAdaptor_Curve CBis(Bis);
+  Geom2dAdaptor_Curve CAC (AC);
 
   //Intersector = Geom2dInt_GInter(CBis, CAC, TolC, Tol);
   Intersector = Geom2dInt_GInter(CAC, CBis, Tol, Tol);
@@ -245,8 +245,8 @@ static void EvalParametersBis(const Geom2dAdaptor_Curve& Bis,
   Geom2dInt_GInter Intersector;
   Standard_Real TolC = Tol;
 
-  const Geom2dAdaptor_Curve& CBis(Bis);
-  const Geom2dAdaptor_Curve& CAC (AC);
+  Geom2dAdaptor_Curve CBis(Bis);
+  Geom2dAdaptor_Curve CAC (AC);
 
   Intersector = Geom2dInt_GInter(CAC, CBis, TolC, Tol);
 

src/BRepFill/BRepFill_TrimShellCorner.cxx

@@ -56,7 +56,6 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <BRepExtrema_ExtCC.hxx>
-#include <ShapeFix_Edge.hxx>
 
 static TopoDS_Edge FindEdgeCloseToBisectorPlane(const TopoDS_Vertex& theVertex,
                                                 TopoDS_Compound&     theComp,
@@ -535,26 +534,6 @@ BRepFill_TrimShellCorner::MakeFacesNonSec(const Standard_Integer
 
     if(bHasNewEdge) {
       aNewEdge.Orientation(TopAbs_FORWARD);
-
-      // Refer to BrepFill_Sweep.cxx BuildEdge Construct an edge via an iso
-      gp_Pnt P1, P2;
-      Standard_Real p11, p12, p21, p22;
-      P1 = BRep_Tool::Pnt(TopExp::FirstVertex(TopoDS::Edge(aNewEdge)));
-      P2 = BRep_Tool::Pnt(TopExp::LastVertex(TopoDS::Edge(aNewEdge)));
-
-      TopoDS_Edge aERef = TopoDS::Edge(fit == 1 ? aE1 : aE2);
-      p11 = P1.Distance(BRep_Tool::Pnt(TopExp::FirstVertex(aERef)));
-      p22 = P2.Distance(BRep_Tool::Pnt(TopExp::LastVertex(aERef)));
-      p12 = P1.Distance(BRep_Tool::Pnt(TopExp::LastVertex(aERef)));
-      p21 = P2.Distance(BRep_Tool::Pnt(TopExp::FirstVertex(aERef)));
-
-      if (p11 > p12 && p22 > p21) {
-        aNewEdge.Reverse();
-      }
-
-      // for nonPlane surface, we should add pCurve
-      Handle(ShapeFix_Edge) sfe = new ShapeFix_Edge();
-      sfe->FixAddPCurve(aNewEdge, TopoDS::Face(aFace), Standard_False);
     }
 
     TopTools_ListOfShape aOrderedList;
@@ -571,7 +550,7 @@ BRepFill_TrimShellCorner::MakeFacesNonSec(const Standard_Integer
       aIt.Initialize(aLP);
       for ( ; aIt.More(); aIt.Next()) {
         const BOPDS_Pave& aPave = aIt.Value();
-        const TopoDS_Shape& aV = theDS->Shape(aPave.Index());
+        TopoDS_Shape aV = theDS->Shape(aPave.Index());
         
         if(aV.IsSame(alonevertices.First())) {
           if(!bfound1) {

src/BRepFill/FILES

@@ -77,7 +77,6 @@ BRepFill_ShapeLaw.hxx
 BRepFill_ShapeLaw.lxx
 BRepFill_Sweep.cxx
 BRepFill_Sweep.hxx
-BRepFill_ThruSectionErrorStatus.hxx
 BRepFill_TransitionStyle.hxx
 BRepFill_TrimEdgeTool.cxx
 BRepFill_TrimEdgeTool.hxx

src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx

@@ -44,13 +44,13 @@ BRepFilletAPI_MakeFillet::BRepFilletAPI_MakeFillet(const TopoDS_Shape& S,
 //=======================================================================
 
 void BRepFilletAPI_MakeFillet::SetParams(const Standard_Real Tang, 
-                                         const Standard_Real Tesp, 
-                                         const Standard_Real T2d, 
-                                         const Standard_Real TApp3d,
-                                         const Standard_Real TolApp2d, 
-                                         const Standard_Real Fleche)
+					 const Standard_Real Tesp, 
+					 const Standard_Real T2d, 
+					 const Standard_Real TApp3d, 
+					 const Standard_Real TolApp2d, 
+					 const Standard_Real Fleche)
 {
-  myBuilder.SetParams(Tang, Tesp, T2d, TApp3d, TolApp2d, Fleche);
+  myBuilder.SetParams(Tang,Tesp, T2d, TApp3d, TolApp2d, Fleche);
 }
 
 //=======================================================================