The test case "perf modalg bug453_2" has been corrected. Now the area is computed the same on both Linux and Windows.

# reduce enlarging by half to avoid regressions on some blend tests.
0029257: GeomPlate generates surface in unexpected place
2025-08-09 13:22:24 +03:00 · 2017-10-26 11:04:57 +03:00 · 2017-10-25 17:49:10 +03:00 · 2017-10-24 20:48:07 +03:00
2551 changed files with 35550 additions and 71912 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -35,8 +35,6 @@ Release
 *.suo
 *.sdf
 *.opensdf
-*.VC.db
-*.VC.opendb
 *.ipch
 *.aps

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ if ("${BUILD_LIBRARY_TYPE}" STREQUAL "Shared")
  endif()
 else()
  unset (BUILD_SHARED_LIBS)
+  message (STATUS "Info: Only 3rdparty's header files are used for building of static OCCT libraries")
  unset (BUILD_SHARED_LIBRARY_NAME_POSTFIX)
 endif()

@@ -343,9 +344,8 @@ set (BUILD_ADDITIONAL_TOOLKITS "" CACHE STRING "${BUILD_ADDITIONAL_TOOLKITS_DESC
 separate_arguments (BUILD_ADDITIONAL_TOOLKITS)

 if (MSVC)
-  set (BUILD_SAMPLES_MFC OFF CACHE BOOL "${BUILD_SAMPLES_MFC_DESCR}")
+  set (BUILD_MODULE_MfcSamples OFF CACHE BOOL "${BUILD_MODULE_MfcSamples_DESCR}")
 endif()
-set (BUILD_SAMPLES_QT OFF CACHE BOOL "${BUILD_SAMPLES_QT_DESCR}")

 set (BUILD_Inspector OFF CACHE BOOL "${BUILD_Inspector_DESCR}")

@@ -381,7 +381,7 @@ endif()
 # include the patched or original list of modules
 # list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
 # list <OCCT_MODULES> will contain all modules
-OCCT_MODULES_AND_TOOLKITS (MODULES "TOOLKITS" OCCT_MODULES)
+OCCT_MODULES_AND_TOOLKITS (OCCT_MODULES)

 foreach (OCCT_MODULE ${OCCT_MODULES})
  BUILD_MODULE (${OCCT_MODULE})
@@ -583,7 +583,7 @@ else()
 endif()

 # OpenGL ES 2.0
-if (CAN_USE_GLES2)
+if (WIN32 AND CAN_USE_GLES2)
  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
    set (USE_GLES2 ON)
  else()
@@ -702,10 +702,11 @@ else()
  OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
 endif()

-# check all 3rdparty include paths
 string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
+
+# check all 3rdparty paths
 if (3RDPARTY_NOT_INCLUDED)
-  message (FATAL_ERROR "Could not find headers of used third-party products: ${3RDPARTY_NOT_INCLUDED}" )
+  message (FATAL_ERROR "NOT FOUND: ${3RDPARTY_NOT_INCLUDED}" )
 endif()

 if (3RDPARTY_INCLUDE_DIRS)
@@ -718,28 +719,13 @@ endif()
 # include <cmake binary folder>/inc
 include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE})

-# check all 3rdparty library paths
-string (REGEX REPLACE ";" " " 3RDPARTY_NO_LIBS "${3RDPARTY_NO_LIBS}")
-if (3RDPARTY_NO_LIBS)
-  if (BUILD_SHARED_LIBS)
-    message (SEND_ERROR "Could not find libraries of used third-party products: ${3RDPARTY_NO_LIBS}" )
-  else()
-    message (WARNING "Could not find libraries of used third-party products: ${3RDPARTY_NO_LIBS}" )
-  endif()
-endif()
-if (3RDPARTY_LIBRARY_DIRS)
+if (3RDPARTY_LIBRARY_DIRS AND BUILD_SHARED_LIBS)
  list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
  string (REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
  message (STATUS "Info: The directories of 3rdparty libraries: \n\t${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
  link_directories (${3RDPARTY_LIBRARY_DIRS})
 endif()

-# report not found 3rdparty dll paths
-string (REGEX REPLACE ";" " " 3RDPARTY_NO_DLLS "${3RDPARTY_NO_DLLS}")
-if (3RDPARTY_NO_DLLS)
-  message (WARNING "Could not find DLLs of used third-party products: ${3RDPARTY_NO_DLLS}" )
-endif()
-
 # build directories
 if (SINGLE_GENERATOR)
  set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
@@ -789,33 +775,30 @@ else()
  set (SCRIPT_EXT sh)
 endif()

-if (BUILD_Inspector OR BUILD_SAMPLES_QT)
-  # check qt 3rdparty path
-  add_definitions (-DHAVE_QT)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
-  message (STATUS "Info: Qt is used by OCCT")
-else()
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
-  OCCT_CHECK_AND_UNSET ("INSTALL_QT")
-endif()
-
 # OCCT tools
 # include the patched or original list of tools
 # list <TOOLNAME>_TOOLKITS is created foreach tool and contains its toolkits
 # list <OCCT_TOOLS> will contain all tools
-if (BUILD_Inspector)
-  add_definitions (-DHAVE_Inspector)
-
-  OCCT_MODULES_AND_TOOLKITS (TOOLS "TOOL_TOOLKITS" OCCT_TOOLS)
+if (NOT BUILD_Inspector)
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
+  OCCT_CHECK_AND_UNSET ("INSTALL_QT")
+else()
+  OCCT_TOOLS_AND_TOOLKITS (OCCT_TOOLS)
  foreach (OCCT_TOOL ${OCCT_TOOLS})
    list (APPEND BUILD_TOOL_TOOLKITS ${${OCCT_TOOL}_TOOL_TOOLKITS})
  endforeach()

-  # collect all the headers to <binary dir>/inc/inspector folder
+  # collect all the headers to <binary dir>/inc folder
  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT tool header files into ${CMAKE_BINARY_DIR}/inc/inspector ...")
+  message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT tool header files into ${CMAKE_BINARY_DIR}/tools/inc ...")
  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "${INSTALL_DIR_INCLUDE}/inspector")
+
+
+  # check qt 3rdparty path
+  add_definitions (-DHAVE_QT)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
+  message (STATUS "Info: Qt is used by OCCT")
 endif()

 # OCCT samples
@@ -913,9 +896,9 @@ OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${S
 # write current custom.bat/sh (for build directory)
 OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")

-if (BUILD_SAMPLES_MFC OR BUILD_SAMPLES_QT)
-  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
-  OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
+if (BUILD_MODULE_MfcSamples)
+  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR_SCRIPT}")
+  OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
 endif()

 # env script for draw in building environment
@@ -941,15 +924,6 @@ foreach(RESOURCE ${RESOURCES})
  endif()
 endforeach()

-if (BUILD_SAMPLES_QT)
-  FILE_TO_LIST ("adm/SAMPLES_RESOURCES" SAMPLES_RESOURCES)
-  foreach(RESOURCE ${SAMPLES_RESOURCES})
-    OCCT_INSTALL_FILE_OR_DIR ("samples/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/samples")
-    #message("Copy Sample resources: samples/${RESOURCE} into ${INSTALL_DIR_RESOURCE}/samples")
-  endforeach()
-endif()
-
-
 # patch installed DrawDefault file if BUILD_SHARED_LIBRARY_NAME_POSTFIX is changed
 if (NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
  OCCT_UPDATE_DRAW_DEFAULT_FILE()
@@ -994,11 +968,9 @@ endif()

 message (STATUS "Info: \(${CURRENT_TIME}\) OCCT toolkits processed")
 # samples do not support patch usage
-if (BUILD_SAMPLES_MFC OR BUILD_SAMPLES_QT)
+if (BUILD_MODULE_MfcSamples)
  set (OCCT_ROOT ${CMAKE_SOURCE_DIR})
-endif()

-if (BUILD_SAMPLES_MFC)
  set (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
  set (COMMON_WINMAIN_FILE      ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)

@@ -1017,33 +989,6 @@ if (BUILD_SAMPLES_MFC)
  message (STATUS "Info: \(${CURRENT_TIME}\) MFC Sample projects added")
 endif()

-OCCT_MODULES_AND_TOOLKITS (SAMPLES "SAMPLES_TOOLKITS" OCCT_SAMPLES)
-
-if (BUILD_Inspector OR BUILD_SAMPLES_QT)
-  if (BUILD_SAMPLES_QT)
-    if (NOT Qt5_FOUND OR "${Qt5Gui_EGL_INCLUDE_DIRS}" STREQUAL "" OR NOT WIN32)
-      list (REMOVE_ITEM qt_SAMPLES_TOOLKITS AndroidQt)
-      message (STATUS "Info: AndroidQt sample excluded due to OS is not Windows or Qt is configured without ANGLE")
-    endif()
-  else()
-    list (REMOVE_ITEM OCCT_SAMPLES qt)
-    message (STATUS "Info: qt samples excluded due to BUILD_SAMPLES_QT is disabled")
-  endif()
-
-  foreach (OCCT_SAMPLE ${OCCT_SAMPLES})
-    list (APPEND BUILD_SAMPLE_TOOLKITS ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS})
-
-    # collect all the headers to <binary dir>/inc/samples folder
-    string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-    message (STATUS "Info: \(${CURRENT_TIME}\) ${OCCT_SAMPLE} Sample projects added")
-
-    # include patched toolkit projects or original ones
-    foreach (BUILD_SAMPLE_TOOLKIT ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS})
-      OCCT_ADD_SUBDIRECTORY ("samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}")
-    endforeach()
-  endforeach()
-endif()
-
 if (BUILD_MODULE_UwpSample)
  add_subdirectory(samples/xaml)
 endif()
@@ -1058,9 +1003,13 @@ if (BUILD_TOOL_TOOLKITS)
            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
  endif()

-  set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  set (BUILD_SAMPLE_TOOLKITS TInspectorEXE)
+  foreach (BUILD_SAMPLE_TOOL_TOOLKIT ${BUILD_SAMPLE_TOOLKITS})
+    OCCT_ADD_SUBDIRECTORY ("samples/tools/${BUILD_SAMPLE_TOOL_TOOLKIT}")
+  endforeach()
+
  # patch TInspectorEXE
-  OCCT_CONFIGURE ("adm/templates/TInspectorEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/tools/TInspectorEXE/TInspectorEXE.vcxproj.user")
+  OCCT_CONFIGURE ("adm/templates/TInspectorEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/samples/tools/TInspectorEXE/TInspectorEXE.vcxproj.user")
 endif()

 # Prepare variables for configuration of OpenCASCADE cmake config file
@@ -1146,6 +1095,10 @@ if (APPLE)
  set (SET_OpenCASCADE_WITH_GLX "set (OpenCASCADE_WITH_GLX       ${USE_GLX})")
 endif()

+if (NOT SINGLE_GENERATOR)
+  OCCT_INSERT_CODE_FOR_TARGET()
+endif()
+
 # Configure and install cmake config file
 configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
 install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION  "${INSTALL_DIR_CMAKE}")
--- a/adm/SAMPLES
+++ b/adm/SAMPLES
@@ -1 +0,0 @@
-qt AndroidQt FuncDemo IESample Tutorial
--- a/adm/SAMPLES_RESOURCES
+++ b/adm/SAMPLES_RESOURCES
@@ -1,2 +0,0 @@
-qt/Common/res/
-qt/Tutorial/res/
--- a/adm/TOOLS
+++ b/adm/TOOLS
@@ -1,4 +1,4 @@
 TModelingData TKShapeView
 TVisualization TKView TKVInspector
 TApplicationFramework TKTreeModel TKTInspectorAPI TKDFBrowser
-TTool TKTInspector TKToolsDraw TInspectorEXE
+TTool TKTInspector TKToolsDraw
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -433,5 +433,4 @@ n IVtkDraw
 t TKIVtkDraw
 n Geom2dEvaluator
 t TKVCAF
-n XCAFView
-n XCAFNoteObjects
+n XCAFView
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -117,7 +117,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME

  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-#    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS)
      # library
      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
@@ -167,7 +167,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
      if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
      else()
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
+        list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})

        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
      endif()
@@ -213,7 +213,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
        if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
          list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
        else()
-          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
+          list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
        endif()
      endif()

@@ -311,7 +311,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
      endif()

      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
-#    endif()
+    endif()
  endforeach()
 endmacro()

--- a/adm/cmake/ffmpeg.cmake
+++ b/adm/cmake/ffmpeg.cmake
@@ -140,7 +140,7 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
  if (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})

    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
  endif()
@@ -167,7 +167,7 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
    if (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
    endif()
  endif()

--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -218,7 +218,7 @@ else()
 endif()

 # freetype library
-#if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)

@@ -253,7 +253,7 @@ endif()
  if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FREETYPE_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_LIBRARY_DIR)

    set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
  endif()
@@ -290,7 +290,7 @@ endif()
    if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FREETYPE_DLL_DIR)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_DLL_DIR)
    endif()
  endif()

@@ -345,7 +345,7 @@ endif()
      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
    endif()
  endif()
-#endif()
+endif()

 # unset all redundant variables
 OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -73,7 +73,6 @@ if (WIN32)
  set (CSF_user32        "user32.lib")
  set (CSF_wsock32       "wsock32.lib")
  set (CSF_psapi         "Psapi.lib")
-  set (CSF_d3d9          "D3D9.lib")
  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
    set (CSF_OpenGlLibs  "libEGL libGLESv2")
  else()
@@ -86,7 +85,7 @@ if (WIN32)
    set (CSF_objc        "objc")

    # frameworks
-    find_library (Appkit_LIB NAMES AppKit)
+    find_library (Appkit_LIB NAMES Appkit)
    set (CSF_Appkit ${Appkit_LIB})

    find_library (IOKit_LIB NAMES IOKit)
@@ -110,11 +109,7 @@ if (WIN32)
    set (CSF_OpenGlLibs  "EGL GLESv2")
  elseif (UNIX)
    set (CSF_ThreadLibs  "pthread rt stdc++")
-    if (USE_GLES2)
-      set (CSF_OpenGlLibs  "EGL GLESv2")
-    else()
-      set (CSF_OpenGlLibs  "GL")
-    endif()
+    set (CSF_OpenGlLibs  "GL")
    set (CSF_XwLibs      "X11 Xext Xmu Xi")
    set (CSF_dl          "dl")
  endif()
--- a/adm/cmake/occt_defs_flags.cmake
+++ b/adm/cmake/occt_defs_flags.cmake
@@ -16,9 +16,10 @@ if (MSVC)
  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /fp:precise")
 endif()

-# add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)
+# set compiler short name and choose SSE2 option for appropriate MSVC compilers
+# ONLY for 32-bit
 if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-  if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))
+  if (MSVC80 OR MSVC90 OR MSVC10)
    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /arch:SSE2")
  endif()
@@ -81,7 +82,7 @@ if (IS_DEBUG_C)
  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 endif()
 # enable parallel compilation on MSVC 9 and above
-if (MSVC AND (MSVC_VERSION GREATER 1400))
+if (MSVC AND NOT MSVC70 AND NOT MSVC80)
  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()

--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -60,27 +60,25 @@ endmacro()
 # COMPILER variable
 macro (OCCT_MAKE_COMPILER_SHORT_NAME)
  if (MSVC)
-    if ((MSVC_VERSION EQUAL 1300) OR (MSVC_VERSION EQUAL 1310))
+    if (MSVC70)
      set (COMPILER vc7)
-    elseif (MSVC_VERSION EQUAL 1400)
+    elseif (MSVC80)
      set (COMPILER vc8)
-    elseif (MSVC_VERSION EQUAL 1500)
+    elseif (MSVC90)
      set (COMPILER vc9)
-    elseif (MSVC_VERSION EQUAL 1600)
+    elseif (MSVC10)
      set (COMPILER vc10)
-    elseif (MSVC_VERSION EQUAL 1700)
+    elseif (MSVC11)
      set (COMPILER vc11)
-    elseif (MSVC_VERSION EQUAL 1800)
+    elseif (MSVC12)
      set (COMPILER vc12)
-    elseif (MSVC_VERSION EQUAL 1900)
+    elseif (MSVC14)
      set (COMPILER vc14)
-    elseif ((MSVC_VERSION GREATER 1900) AND (MSVC_VERSION LESS 2000))
+    elseif (MSVC15)
      # Since Visual Studio 15 (2017), its version diverged from version of
      # compiler which is 14.1; as that compiler uses the same run-time as 14.0,
      # we keep its id as "vc14" to be compatibille
      set (COMPILER vc14)
-    else()
-      message (FATAL_ERROR "Unrecognized MSVC_VERSION")
    endif()
  elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
    set (COMPILER gcc)
@@ -502,11 +500,11 @@ function (OCCT_TOOLKIT_FULL_DEP TOOLKIT_NAME TOOLKIT_FULL_DEPS)
  set (${TOOLKIT_FULL_DEPS} ${LOCAL_TOOLKIT_FULL_DEPS} PARENT_SCOPE)
 endfunction()

-# Function to get list of modules/toolkits/samples from file adm/${FILE_NAME}.
+# Function to get list of modules and toolkits from file adm/MODULES.
 # Creates list <$MODULE_LIST> to store list of MODULES and
-# <NAME_OF_MODULE>_TOOLKITS foreach module to store its toolkits, where "TOOLKITS" is defined by TOOLKITS_NAME_SUFFIX.
-function (OCCT_MODULES_AND_TOOLKITS FILE_NAME TOOLKITS_NAME_SUFFIX MODULE_LIST)
-  FILE_TO_LIST ("adm/${FILE_NAME}" FILE_CONTENT)
+# <NAME_OF_MODULE>_TOOLKITS foreach module to store its toolkits.
+function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
+  FILE_TO_LIST ("adm/MODULES" FILE_CONTENT)

  foreach (CONTENT_LINE ${FILE_CONTENT})
    string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
@@ -514,12 +512,30 @@ function (OCCT_MODULES_AND_TOOLKITS FILE_NAME TOOLKITS_NAME_SUFFIX MODULE_LIST)
    list (REMOVE_AT CONTENT_LINE 0)
    list (APPEND ${MODULE_LIST} ${MODULE_NAME})
    # (!) REMOVE THE LINE BELOW (implicit variables)
-    set (${MODULE_NAME}_${TOOLKITS_NAME_SUFFIX} ${CONTENT_LINE} PARENT_SCOPE)
+    set (${MODULE_NAME}_TOOLKITS ${CONTENT_LINE} PARENT_SCOPE)
  endforeach()

  set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
 endfunction()

+# Function to get list of tools and toolkits from file adm/TOOLS.
+# Creates list <$TOOL_LIST> to store list of TOOLS and
+# <NAME_OF_TOOL>_TOOLKITS foreach tool to store its toolkits.
+function (OCCT_TOOLS_AND_TOOLKITS TOOL_LIST)
+  FILE_TO_LIST ("adm/TOOLS" FILE_CONTENT)
+
+  foreach (CONTENT_LINE ${FILE_CONTENT})
+    string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
+    list (GET CONTENT_LINE 0 TOOL_NAME)
+    list (REMOVE_AT CONTENT_LINE 0)
+    list (APPEND ${TOOL_LIST} ${TOOL_NAME})
+    # (!) REMOVE THE LINE BELOW (implicit variables)
+    set (${TOOL_NAME}_TOOL_TOOLKITS ${CONTENT_LINE} PARENT_SCOPE)
+  endforeach()
+
+  set (${TOOL_LIST} ${${TOOL_LIST}} PARENT_SCOPE)
+endfunction()
+
 # Returns OCC version string from file Standard_Version.hxx (if available)
 function (OCC_VERSION OCC_VERSION_MAJOR OCC_VERSION_MINOR OCC_VERSION_MAINTENANCE OCC_VERSION_DEVELOPMENT OCC_VERSION_STRING_EXT)

@@ -585,7 +601,7 @@ endmacro()
 # prior to version 3.3 not supporting per-configuration install paths
 # for install target files (see https://cmake.org/Bug/view.php?id=14317)
 macro (OCCT_UPDATE_TARGET_FILE)
-  if (MSVC)
+  if (NOT SINGLE_GENERATOR)
    OCCT_INSERT_CODE_FOR_TARGET ()
  endif()

--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -1,69 +1,28 @@
 # script for each OCCT toolkit

-# filling some variables by default values(src) or using custom(tools, samples)
-set (RELATIVE_SOURCES_DIR "${RELATIVE_DIR}")
-if ("${RELATIVE_SOURCES_DIR}" STREQUAL "")
-  #if it is not defined, use default directory
-  set (RELATIVE_SOURCES_DIR "src")
-endif()
-
-set (OCC_MODULES_LIST "${MODULES_LIST}")
-if ("${OCC_MODULES_LIST}" STREQUAL "")
-  set (OCC_MODULES_LIST ${OCCT_MODULES})
-endif()
-
-set (OCC_TARGET_FOLDER "${TARGET_FOLDER}")
-if ("${OCC_TARGET_FOLDER}" STREQUAL "")
-  set (OCC_TARGET_FOLDER "Modules")
-endif()
-
-set (OCCT_TOOLKITS_NAME_SUFFIX "${TOOLKITS_NAME_SUFFIX}")
-if ("${OCCT_TOOLKITS_NAME_SUFFIX}" STREQUAL "")
-  set (OCCT_TOOLKITS_NAME_SUFFIX "TOOLKITS")
-endif()
-
 # parce PACKAGES file
-FILE_TO_LIST ("${RELATIVE_SOURCES_DIR}/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
-if ("${USED_PACKAGES}" STREQUAL "")
-  set (USED_PACKAGES ${PROJECT_NAME})
+if ("${PROJECT_NAME}" STREQUAL DRAWEXE)
+  set (USED_PACKAGES DRAWEXE)
+else()
+  FILE_TO_LIST ("src/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
 endif()

-if (USE_QT)
-  # Qt dependencies
-  OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt_macro)
-  FIND_QT_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-  include_directories("${PROJECT_INCLUDES}")
-endif(USE_QT)
-
 set (PRECOMPILED_DEFS)

 if (NOT BUILD_SHARED_LIBS)
  list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
-  if (WIN32)
-    list (APPEND PRECOMPILED_DEFS "-DOCCT_STATIC_BUILD")
-  endif()
 endif()

 # Get all used packages from toolkit
-UNSET(RESOURCE_FILES)
 foreach (OCCT_PACKAGE ${USED_PACKAGES})
-
-  #remove part after "/" in the OCCT_PACKAGE variable if exists
-  string (FIND "${OCCT_PACKAGE}" "/" _index)
-  if (_index GREATER -1)
-    math (EXPR _index "${_index}")
-    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
-  else()
-    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
-  endif()
-
+  
  # TKService contains platform-dependent packages: Xw and WNT
  if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
    # do nothing
  else()

    if (WIN32)
-      list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE_NAME}_DLL")
+      list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
    endif()

    set (SOURCE_FILES)
@@ -73,11 +32,11 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    if (${BUILD_YACCLEX})

      # flex files
-      OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
+      OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
      list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)

      # bison files
-      OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
+      OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
      list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)

      if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
@@ -99,8 +58,8 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
          if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
            set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
            set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
-            BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
-            FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
+            BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
+            FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
            ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
           
            list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
@@ -110,23 +69,23 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    endif()

    # header files
-    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES")
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")

-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+      file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
      if(APPLE)
-        file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+        file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
      endif()
    else()
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")

-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
      if(APPLE)
-        file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
+        file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
      endif()
    endif()
    
@@ -137,36 +96,26 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    endif()

    foreach(HEADER_FILE ${HEADER_FILES})
-      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        list (APPEND USED_INCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        list (APPEND USED_INCFILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
      else()
-        list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+        list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
      endif()
    endforeach()

    foreach(SOURCE_FILE ${SOURCE_FILES})
-      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        list (APPEND USED_SRCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        list (APPEND USED_SRCFILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
      else()
-        list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
      endif()
    endforeach()
-
-    if (USE_QT)
-      FIND_AND_INSTALL_QT_RESOURCES (${OCCT_PACKAGE} RESOURCE_FILES)
-      #message("Qt Resource files are: ${QT_RESOURCE_FILES} in ${OCCT_PACKAGE}")
-    endif(USE_QT)
-
-    #message("Resource files are: ${RESOURCE_FILES} in ${OCCT_PACKAGE}")
-    foreach(RESOURCE_FILE ${RESOURCE_FILES})
-      SOURCE_GROUP ("Resource Files\\${OCCT_PACKAGE_NAME}" FILES "${RESOURCE_FILE}")
-    endforeach()
  endif()
 endforeach()
 string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
@@ -183,30 +132,24 @@ if (MSVC)
 endif()

 set (CURRENT_MODULE)
-foreach (OCCT_MODULE ${OCC_MODULES_LIST})
-  list (FIND ${OCCT_MODULE}_${OCCT_TOOLKITS_NAME_SUFFIX} ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
-
+foreach (OCCT_MODULE ${OCCT_MODULES})
+  list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
  if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
    set (CURRENT_MODULE ${OCCT_MODULE})
  endif()
 endforeach()

-if (MSVC)
+if (NOT SINGLE_GENERATOR)
  OCCT_INSERT_CODE_FOR_TARGET ()
 endif()

-if (USE_QT)
-  FIND_AND_WRAP_MOC_FILES("${USED_INCFILES}" "${PROJECT_NAME}_MOC_FILES")
-  #message("MOC files: ${${PROJECT_NAME}_MOC_FILES}")
-endif (USE_QT)
-
-if (EXECUTABLE_PROJECT)
-  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
+if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
+  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})

  install (TARGETS ${PROJECT_NAME}
           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
 else()
-  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
+  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})

  if (MSVC)
    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
@@ -235,7 +178,7 @@ else()
 endif()

 if (CURRENT_MODULE)
-  set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "${OCC_TARGET_FOLDER}/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Modules/${CURRENT_MODULE}")
  set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
  if (APPLE)
    if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
@@ -261,7 +204,7 @@ set (USED_TOOLKITS_BY_CURRENT_PROJECT)
 set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)

 # parce EXTERNLIB file
-FILE_TO_LIST ("${RELATIVE_SOURCES_DIR}/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
+FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
 foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
  string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
  if (NOT COMMENT_FOUND)
@@ -338,34 +281,15 @@ if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
      if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
        list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
-        if(VTK_MAJOR_VERSION GREATER 6)
-          list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingGL2PSOpenGL2)
-        endif()
      endif()
    endif()
  endforeach()
-else()
-  if(VTK_MAJOR_VERSION EQUAL 6 AND VTK_MINOR_VERSION GREATER 2 OR VTK_MAJOR_VERSION GREATER 6)
-    list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL" IS_VTK_RENDER_FREETYPE_FOUND)
-    if (NOT ${IS_VTK_RENDER_FREETYPE_FOUND} EQUAL -1)
-      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT "vtkRenderingFreeTypeOpenGL")
-    endif()
-  endif()
 endif()

 if (BUILD_SHARED_LIBS)
  target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
 endif()

-if (USE_QT)
-  foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
-    target_link_libraries (${PROJECT_NAME} debug ${PROJECT_LIBRARY_DEBUG})
-  endforeach()
-  foreach (PROJECT_LIBRARY_RELEASE ${PROJECT_LIBRARIES_RELEASE})
-    target_link_libraries (${PROJECT_NAME} optimized ${PROJECT_LIBRARY_RELEASE})
-  endforeach()
-endif()
-
 # suppress deprecation warnings inside OCCT itself for old gcc versions with unavailable Standard_DISABLE_DEPRECATION_WARNINGS
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6.0)
--- a/adm/cmake/occt_toolkit_prepare_sample.cmake
+++ b/adm/cmake/occt_toolkit_prepare_sample.cmake
@@ -1,18 +0,0 @@
-if ("${TARGET_FOLDER}" STREQUAL "")
-  set (EXECUTABLE_PROJECT ON)
-  set (USE_QT ON)
-
-  set (RELATIVE_DIR "samples/qt")
-  set (MODULES_LIST ${OCCT_SAMPLES})
-  set (TARGET_FOLDER "Samples")
-  set (TOOLKITS_NAME_SUFFIX "SAMPLES_TOOLKITS")
-
-  include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
-else()
-  unset (USE_QT)
-  unset (RELATIVE_DIR)
-  unset (EXECUTABLE_PROJECT)
-  unset (MODULES_LIST)
-  unset (TARGET_FOLDER)
-  unset (TOOLKITS_NAME_SUFFIX)
-endif("${TARGET_FOLDER}" STREQUAL "")
--- a/adm/cmake/occt_toolkit_prepare_tool.cmake
+++ b/adm/cmake/occt_toolkit_prepare_tool.cmake
@@ -1,13 +0,0 @@
-if ("${TARGET_FOLDER}" STREQUAL "")
-  set (USE_QT ON)
-  set (RELATIVE_DIR "tools")
-  set (MODULES_LIST ${OCCT_TOOLS})
-  set (TARGET_FOLDER "Tools")
-  set (TOOLKITS_NAME_SUFFIX "TOOL_TOOLKITS")
-else()
-  unset (USE_QT)
-  unset (RELATIVE_DIR)
-  unset (MODULES_LIST)
-  unset (TARGET_FOLDER)
-  unset (TOOLKITS_NAME_SUFFIX)
-endif("${TARGET_FOLDER}" STREQUAL "")
--- a/adm/cmake/occt_toolkit_tool.cmake
+++ b/adm/cmake/occt_toolkit_tool.cmake
@@ -0,0 +1,301 @@
+# script for each OCCT tool toolkit
+
+# Qt dependencies
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt_macro)
+
+FIND_QT_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
+include_directories("${PROJECT_INCLUDES}"
+                    "${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/tools")
+
+FILE_TO_LIST ("tools/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
+# parce PACKAGES file
+
+if ("${PROJECT_NAME}" STREQUAL TInspectorEXE)
+  set (USED_PACKAGES ${PROJECT_NAME})
+  set (PACKAGE_PREFIX_DIR "samples/tools")
+  include_directories("${PROJECT_INCLUDES}"
+                      "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${PROJECT_NAME}")
+else()
+  FILE_TO_LIST ("tools/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
+  set (PACKAGE_PREFIX_DIR "tools")
+endif()
+
+
+SET (RCC_FILES)
+foreach (OCCT_PACKAGE ${USED_PACKAGES})
+  file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+
+  #message("Sources are ${SOURCE_FILES_C}")
+  FIND_AND_WRAP_MOC_FILES("${SOURCE_FILES_C}")
+
+  #message("Dir is ${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${OCCT_PACKAGE}.qrc")
+  FIND_AND_WRAP_RESOURCE_FILE("${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${OCCT_PACKAGE}.qrc" RCC_FILES)
+endforeach()
+#message("RCC_FILES for ${PROJECT_NAME} are ${RCC_FILES}")
+
+set (PRECOMPILED_DEFS)
+
+if (NOT BUILD_SHARED_LIBS)
+  list (APPEND PRECOMPILED_DEFS "-DOCCT_NO_PLUGINS")
+endif()
+
+# Get all used packages from toolkit
+foreach (OCCT_PACKAGE ${USED_PACKAGES})
+
+  ADD_DEFINITIONS(-D${OCCT_PACKAGE}_EXPORTS)
+  
+  # TKService contains platform-dependent packages: Xw and WNT
+  if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
+    # do nothing
+  else()
+
+    if (WIN32)
+      list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
+    endif()
+
+    set (SOURCE_FILES)
+    set (HEADER_FILES)
+
+    # Generate Flex and Bison files
+    if (${BUILD_YACCLEX})
+
+      # flex files
+      OCCT_ORIGIN_AND_PATCHED_FILES ("tools/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
+      list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
+
+      # bison files
+      OCCT_ORIGIN_AND_PATCHED_FILES ("tools/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
+      list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
+
+      if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
+      
+        list (SORT SOURCE_FILES_FLEX)
+        list (SORT SOURCE_FILES_BISON)
+
+        math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
+        foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
+
+          list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
+          get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
+
+          list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
+          get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
+          
+          string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
+
+          if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
+            set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
+            set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
+            BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/tools/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
+            FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/tools/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
+            ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
+           
+            list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
+          endif()
+        endforeach()
+      endif()
+    endif()
+
+    # header files
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES")
+      file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+      file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+      file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+      file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+      if(APPLE)
+        file (STRINGS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+      endif()
+    else()
+      file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+      file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
+      if(APPLE)
+        file (STRINGS "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
+      endif()
+    endif()
+
+
+    
+    list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
+    list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
+    if(APPLE)
+      list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
+    endif()
+
+    foreach(HEADER_FILE ${HEADER_FILES})
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
+        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
+        list (APPEND USED_INCFILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
+        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${HEADER_FILE}")
+      else()
+        list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+      endif()
+    endforeach()
+
+
+    foreach(SOURCE_FILE ${SOURCE_FILES})
+      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        list (APPEND USED_SRCFILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${BUILD_PATCH}/tools/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      else()
+        list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/${PACKAGE_PREFIX_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      endif()
+    endforeach()
+  endif()
+endforeach()
+string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
+
+set (USED_RCFILE "")
+if (MSVC)
+  set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc")
+
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in")
+    configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+  else()
+    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY)
+  endif()
+endif()
+
+set (CURRENT_MODULE)
+foreach (OCCT_MODULE ${OCCT_TOOLS})
+  list (FIND ${OCCT_MODULE}_TOOL_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
+  if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
+    set (CURRENT_MODULE ${OCCT_MODULE})
+  endif()
+endforeach()
+
+if (NOT SINGLE_GENERATOR)
+  OCCT_INSERT_CODE_FOR_TARGET ()
+endif()
+
+if ("${PROJECT_NAME}" STREQUAL TInspectorEXE)
+  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RCC_FILES})
+
+  install (TARGETS ${PROJECT_NAME}
+           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+else()
+  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RCC_FILES})
+
+  if (MSVC)
+    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+             CONFIGURATIONS Debug RelWithDebInfo
+             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+  endif()
+
+  if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
+    set (CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT ${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set (CMAKE_SHARED_LIBRARY_SUFFIX "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  endif()
+
+  install (TARGETS ${PROJECT_NAME}
+           EXPORT OpenCASCADE${CURRENT_MODULE}Targets
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}"
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}"
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
+
+
+  if (NOT WIN32)
+    if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
+      set (LINK_NAME    "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT}/tools")
+      set (LIBRARY_NAME "${INSTALL_DIR}/${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}/lib${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}/tools")
+      OCCT_CREATE_SYMLINK_TO_FILE (${LIBRARY_NAME} ${LINK_NAME})
+    endif()
+  endif()
+endif()
+
+if (CURRENT_MODULE)
+  set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Tools/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}")
+  if (APPLE)
+    if (NOT "${INSTALL_NAME_DIR}" STREQUAL "")
+      set_target_properties (${PROJECT_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "${INSTALL_NAME_DIR}")
+    endif()
+  endif()
+endif()
+
+get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR)
+get_property (OCC_VERSION_MINOR GLOBAL PROPERTY OCC_VERSION_MINOR)
+get_property (OCC_VERSION_MAINTENANCE GLOBAL PROPERTY OCC_VERSION_MAINTENANCE)
+
+if (ANDROID)
+  # do not append version to the filename
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
+else()
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}"
+                                                    SOVERSION     "${OCC_VERSION_MAJOR}"
+                                                    VERSION       "${OCC_VERSION_MAJOR}.${OCC_VERSION_MINOR}.${OCC_VERSION_MAINTENANCE}")
+endif()
+
+set (USED_TOOLKITS_BY_CURRENT_PROJECT)
+set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
+
+# parce EXTERNLIB file
+FILE_TO_LIST ("${PACKAGE_PREFIX_DIR}/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
+foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
+  string (REGEX MATCH "^ *#" COMMENT_FOUND ${USED_ITEM})
+  if (NOT COMMENT_FOUND)
+    string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
+    string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM})
+    
+    if (NOT "${TK_FOUND}" STREQUAL "" OR NOT "${VTK_FOUND}" STREQUAL "")
+      list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
+      if (NOT "${VTK_FOUND}" STREQUAL "" AND BUILD_SHARED_LIBS AND INSTALL_VTK AND COMMAND OCCT_INSTALL_VTK)
+        OCCT_INSTALL_VTK(${USED_ITEM})
+      endif()
+    else()
+      string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
+      if ("${CSF_FOUND}" STREQUAL "")
+        message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
+      else() # get CSF_ value
+        set (CURRENT_CSF ${${USED_ITEM}})
+        if (NOT "x${CURRENT_CSF}" STREQUAL "x")
+          # prepare a list from a string with whitespaces
+          separate_arguments (CURRENT_CSF)
+          list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
+        endif()
+      endif()
+    endif()
+  endif()
+endforeach()
+
+if (APPLE)
+  list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
+  if (NOT ${IS_X11_FOUND} EQUAL -1)
+    find_package (X11 COMPONENTS X11 Xext Xmu Xi)
+    if (NOT X11_FOUND)
+      message (STATUS "Warning: X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
+    endif()
+  endif()
+endif()
+
+# Update list of used VTK libraries if OpenGL2 Rendering BackEnd is used.
+# Add VTK_OPENGL2_BACKEND definition.
+if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
+  add_definitions(-DVTK_OPENGL2_BACKEND)
+  foreach (VTK_EXCLUDE_LIBRARY vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL)
+    list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "${VTK_EXCLUDE_LIBRARY}" IS_VTK_OPENGL_FOUND)
+    if (NOT ${IS_VTK_OPENGL_FOUND} EQUAL -1)
+      list (REMOVE_ITEM USED_TOOLKITS_BY_CURRENT_PROJECT ${VTK_EXCLUDE_LIBRARY})
+      if (${VTK_EXCLUDE_LIBRARY} STREQUAL vtkRenderingOpenGL)
+        list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT vtkRenderingOpenGL2)
+      endif()
+    endif()
+  endforeach()
+endif()
+
+if (BUILD_SHARED_LIBS)
+  target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+endif()
+
+# Set Qt dependencies
+target_link_libraries(${PROJECT_NAME} "${PROJECT_LIBRARIES}")
+
+target_link_libraries(${PROJECT_NAME} debug "${PROJECT_LIBRARIES_DEBUG}")
+target_link_libraries(${PROJECT_NAME} optimized "${PROJECT_LIBRARIES_RELEASE}")
+
--- a/adm/cmake/qt.cmake
+++ b/adm/cmake/qt.cmake
@@ -7,8 +7,8 @@ THIRDPARTY_PRODUCT("QT" "" "CSF_QtCore" "d")
 list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")

 list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_INCLUDE_DIR")
-list (REMOVE_ITEM 3RDPARTY_NO_LIBS "3RDPARTY_QT_LIBRARY_DIR")
-list (REMOVE_ITEM 3RDPARTY_NO_DLLS "3RDPARTY_QT_DLL_DIR")
+list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_LIBRARY_DIR")
+list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_DLL_DIR")

 UNSET (${3RDPARTY_QT_DLL} CACHE)
 UNSET (${3RDPARTY_QT_DLL_DIR} CACHE)
@@ -18,19 +18,3 @@ UNSET (${3RDPARTY_QT_LIBRARY_DIR} CACHE)

 set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
 message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
-
-# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
-# Without this setting find_package() will not work
-set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-
-# Now we can apply standard CMake finder for Qt5. We do this mostly
-# to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
-find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
-if (NOT ${Qt5_FOUND})
-  # Now we can apply standard CMake finder for Qt. We do this mostly
-  # to have qt4_wrap_cpp() function available
-  find_package(Qt4)
-  #message (STATUS "Qt4 cmake configuration")
-else()
-  #message (STATUS "Qt5 cmake configuration")
-endif()
--- a/adm/cmake/qt_macro.cmake
+++ b/adm/cmake/qt_macro.cmake
@@ -6,50 +6,51 @@ macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT
    message (FATAL_ERROR "Empty Qt dir")
  endif()

+  # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
+  # Without this setting find_package() will not work
+  set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
+
+  # Now we can apply standard CMake finder for Qt5. We do this mostly
+  # to have qt5_wrap_cpp() function available
+  find_package(Qt5 QUIET COMPONENTS Widgets PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
  if (${Qt5_FOUND})
    #message (STATUS "Qt5 cmake configuration")

-    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}")
-    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
-    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
-
-    # processing *.ts files to generate *.qm
-    find_package(Qt5LinguistTools)
-    get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
-    mark_as_advanced(QT_LRELEASE_EXECUTABLE)
-
-    GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
-    MARK_AS_ADVANCED(QT_BINARY_DIR)
+    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}")
+    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}")
+    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}")
  else()
+    # Now we can apply standard CMake finder for Qt. We do this mostly
+    # to have qt4_wrap_cpp() function available
+    find_package(Qt4)
+
    #message (STATUS "Qt4 cmake configuration")
    set(PROJECT_INCLUDES ${QT_INCLUDES})
    if (WIN32)
-      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib")
+      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib")
+      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib")
    else()
-      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
+      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so")
+      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so")
    endif(WIN32)
-    find_program(QT_LRELEASE_EXECUTABLE lrelease)
  endif()
 endmacro()


-macro (FIND_AND_WRAP_MOC_FILES HEADER_FILES GENERATED_MOC_FILES)
-  set (GENERATED_MOC_FILES "")
-  foreach (FILE ${HEADER_FILES})
-    # processing only files where Q_OBJECT exists
-    file(STRINGS "${FILE}" LINES REGEX "Q_OBJECT")
-    if(LINES)
-      unset (MOC_FILE)
-      if (${Qt5_FOUND})
-        qt5_wrap_cpp(MOC_FILE ${FILE})
-      else()
-        qt4_wrap_cpp(MOC_FILE ${FILE})
-      endif()
-      #message (STATUS "... Info: next MOC file ${MOC_FILE}")
-      list(APPEND ${GENERATED_MOC_FILES} ${MOC_FILE})
-     endif(LINES)
+macro (FIND_AND_WRAP_MOC_FILES SOURCE_FILES)
+
+  SET(CMAKE_AUTOMOC ON)
+
+  foreach (FILE ${SOURCE_FILES})
+    set (src_files ${src_files} ${FILE})
+    unset (MOC_FILE)
+    if (${Qt5_FOUND})
+      qt5_wrap_cpp(MOC_FILE ${FILE})
+    else()
+      qt4_wrap_cpp(MOC_FILE ${FILE})
+    endif()
+    #message (STATUS "... Info: next MOC file ${MOC_FILE}")
+
  endforeach (FILE)

 endmacro()
@@ -67,51 +68,3 @@ macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
    endif()
  endif()
 endmacro()
-
-macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
-  if(EXISTS "${RESOURCE_FILE_NAME}")
-    if (${Qt5_FOUND})
-      qt5_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
-    else()
-      qt4_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
-    endif()
-  endif()
-endmacro()
-
-macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
-  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   TS_FILES   REGEX ".+[.]ts")
-  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
-
-  string (FIND "${OCCT_PACKAGE}" "/" _index)
-  if (_index GREATER -1)
-    math (EXPR _index "${_index}")
-    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
-  else()
-    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
-  endif(_index GREATER -1)
-
-  #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
-  foreach (QRC_FILE ${QRC_FILES})
-    set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
-    if (EXISTS ${QRC_FILE_RELATIVE})
-      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
-      list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
-    endif()
-  endforeach()
-
-  #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
-  foreach (TS_FILE ${TS_FILES})
-    set (TS_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}")
-    FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
-    if (EXISTS ${TS_FILE_RELATIVE})
-      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
-      list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
-    endif()
-  endforeach()
-
-  foreach (QM_FILE ${QM_FILES})
-    INSTALL(FILES ${QM_FILE} DESTINATION "${INSTALL_DIR_RESOURCE}/samples")
-    #message("install *.qm files (${QM_FILE}) to: ${INSTALL_DIR_RESOURCE}/samples")
-  endforeach (QM_FILE ${QM_FILES})
-endmacro()
-
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -173,7 +173,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
  if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)

    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
  endif()
@@ -226,7 +226,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
    endif()
  endif()

@@ -275,7 +275,7 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
  mark_as_advanced (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL)
 endmacro()

-#if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
  separate_arguments (CSF_TBB)
  foreach (LIB IN LISTS CSF_TBB)
    TBB_PRODUCT_SEARCH (${LIB})
@@ -291,4 +291,4 @@ endmacro()
      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
    endif()
  endif()
-#endif()
+endif()
--- a/adm/cmake/tcl.cmake
+++ b/adm/cmake/tcl.cmake
@@ -184,14 +184,14 @@ if (BUILD_SHARED_LIBS)
  if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_LIBRARY_DIR)
  endif()

  if (WIN32)
    if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TCL_DLL_DIR)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_DLL_DIR)
    endif()
  endif()

--- a/adm/cmake/tk.cmake
+++ b/adm/cmake/tk.cmake
@@ -190,14 +190,14 @@ if (BUILD_SHARED_LIBS)
  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_LIBRARY_DIR)
  endif()

  if (WIN32)
    if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TK_DLL_DIR)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_DLL_DIR)
    endif()
  endif()

--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -117,16 +117,11 @@ want to build some particular libraries (toolkits) only, then you may uncheck
 all modules in the corresponding BUILD_MODUE_* options and provide the list of
 necessary libraries here. Of course, all dependencies will be resolved automatically")

-set (BUILD_SAMPLES_MFC_DESCR
+set (BUILD_MODULE_MfcSamples_DESCR
 "Indicates whether OCCT MFC samples should be built together with OCCT.
 These samples show some possibilities of using OCCT and they can be executed
 with script samples.bat from the installation directory (INSTALL_DIR)")

-set (BUILD_SAMPLES_QT_DESCR
-"Indicates whether OCCT Qt samples should be built together with OCCT.
-These samples show some possibilities of using OCCT and they can be executed
-with script samples.bat from the installation directory (INSTALL_DIR)")
-
 set (BUILD_Inspector_DESCR
 "Indicates whether OCCT inspector should be built together with OCCT.
 This inspector provides functionality to interactively inspect low-level content
--- a/adm/cmake/vtk.cmake
+++ b/adm/cmake/vtk.cmake
@@ -31,7 +31,7 @@ if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
 endif()

-#if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
  # vtk library directory
  if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
    set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
@@ -41,7 +41,7 @@ endif()
  if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
    set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
  endif()
-#endif()
+endif()

 # check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
 if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
@@ -75,10 +75,10 @@ if (VTK_FOUND)

    set (3RDPARTY_VTK_INCLUDE_DIRS)

-#    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS)
      set (3RDPARTY_VTK_LIBRARY_DIRS)
      set (3RDPARTY_VTK_DLL_DIRS)
-#    endif()
+    endif()

    foreach (VTK_LIBRARY ${VTK_LIBRARIES})
      string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
@@ -168,7 +168,7 @@ if (VTK_FOUND)
    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
  endif()

-#  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS)
    if (3RDPARTY_VTK_LIBRARY_DIRS)
      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
@@ -186,7 +186,7 @@ if (VTK_FOUND)
        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
      endif()
    endif()
-#  endif()
+  endif()

 if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
  list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
@@ -198,14 +198,14 @@ if (BUILD_SHARED_LIBS)
  if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
    list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_VTK_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_LIBRARY_DIR)
  endif()

  if (WIN32)
    if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
      list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_VTK_DLL_DIR)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_DLL_DIR)
    endif()
  endif()
 endif()
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -1366,7 +1366,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
    set aLibsMap(CSF_dl)           "dl"
    if { "$theOS" == "mac" } {
      set aLibsMap(CSF_objc)       "objc"
-      set aFrmsMap(CSF_Appkit)     "AppKit"
+      set aFrmsMap(CSF_Appkit)     "Appkit"
      set aFrmsMap(CSF_IOKit)      "IOKit"
      set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
      set aFrmsMap(CSF_TclLibs)    "Tcl"
@@ -1727,7 +1727,7 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
  regsub -all -- {__TKDEP__} $theProjTmpl $aUsedLibs theProjTmpl

  set anIncPaths "..\\..\\..\\inc"
-#  set aTKDefines ""
+  set aTKDefines ""
  set aFilesSection ""
  set aVcFilesX(units) ""
  set listloc [osutils:tk:units $theToolKit]
@@ -1794,13 +1794,13 @@ proc osutils:vcproj { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
    }

    # macros
-#    append aTKDefines ";__${xlo}_DLL"
+    append aTKDefines ";__${xlo}_DLL"
    # common includes
 #    append anIncPaths ";..\\..\\..\\src\\${xlo}"
  }

  regsub -all -- {__TKINC__}  $theProjTmpl $anIncPaths theProjTmpl
-#  regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
+  regsub -all -- {__TKDEFS__} $theProjTmpl $aTKDefines theProjTmpl
  regsub -all -- {__FILES__}  $theProjTmpl $aFilesSection theProjTmpl

  # write file
@@ -1866,7 +1866,6 @@ proc osutils:tk:files { tkloc thePlatform } {
         "t" { set utyp "toolkit" }
         "n" { set utyp "nocdlpack" }
         "x" { set utyp "executable" }
-         default { error "Error: Cannot determine type of unit $loc, check adm/UDLIST!" }
    }
    if [array exists map] { unset map }
    osutils:tk:loadunit $loc map
@@ -1948,10 +1947,10 @@ proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap } {
      puts "Warning : in vcproj there are than one occurences for [file tail $f]"
    }
    #puts "$aProjTmpl $aFilesSection"
-#    set aTKDefines ";__${theToolKit}_DLL"
+    set aTKDefines ";__${theToolKit}_DLL"
    set anIncPaths "..\\..\\..\\inc"
    regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
-#    regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines    aProjTmpl
+    regsub -all -- {__TKDEFS__} $aProjTmpl $aTKDefines    aProjTmpl
    regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
    regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl

@@ -2163,9 +2162,9 @@ proc osutils:cbptk { theCmpl theOutDir theToolKit thePlatform} {
    }

    # macros for correct DLL exports
-#    if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
-#      lappend aTKDefines "__${xlo}_DLL"
-#    }
+    if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
+      lappend aTKDefines "__${xlo}_DLL"
+    }
  }

  return [osutils:cbp $theCmpl $theOutDir $theToolKit $thePlatform $aTKSrcFiles $aUsedLibs $aFrameworks $anIncPaths $aTKDefines]
@@ -2282,9 +2281,9 @@ proc osutils:cbpx { theCmpl theOutDir theToolKit thePlatform } {
    }

    # macros for correct DLL exports
-#    if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
-#      lappend aTKDefines "__${theToolKit}_DLL"
-#    }
+    if { $thePlatform == "wnt" || $thePlatform == "uwp" } {
+      lappend aTKDefines "__${theToolKit}_DLL"
+    }

    # common include paths
    lappend anIncPaths "../../../inc"
--- a/adm/templates/TInspectorEXE.vcxproj.user.in
+++ b/adm/templates/TInspectorEXE.vcxproj.user.in
@@ -4,7 +4,7 @@
  <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 QTDIR=@3RDPARTY_QT_DIR@
-PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@;%PATH%
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
 </LocalDebuggerEnvironment>
 <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
@@ -13,7 +13,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@;%PATH%
  <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 QTDIR=@3RDPARTY_QT_DIR@
-PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@i;%PATH%
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
 </LocalDebuggerEnvironment>
 <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
@@ -22,7 +22,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@i;%PATH%
  <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 QTDIR=@3RDPARTY_QT_DIR@
-PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@d;%PATH%
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
 </LocalDebuggerEnvironment>
 <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
--- a/adm/templates/sample.bat
+++ b/adm/templates/sample.bat
@@ -16,16 +16,11 @@ if ["%1"] == [""] (
  echo    HLR
  echo    Animation
  echo    Convert
-  echo    AndroidQt
-  echo    FuncDemo
-  echo    IESample
-  echo    Tutorial
  PAUSE
  exit /B
 )

 call "%~dp0env.bat" %2 %3 %4
-if not ["%QTDIR%"] == [""] if exist "%QTDIR%\qml" if ["%QML2_IMPORT_PATH%"] == [""] set "QML2_IMPORT_PATH=%QTDIR%/qml"
 set "EXE_PATH=%CSF_OCCTBinPath%/%1.exe"

 if not exist "%EXE_PATH%" (
--- a/adm/templates/sample.sh
+++ b/adm/templates/sample.sh
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-if [ "$1" == "" ]; then
-  echo Launch selected sample as follows:
-  echo   sample.sh SampleName d
-  echo or to use last sample build configuration:
-  echo   sample.sh SampleName
-  echo available samples:
-  echo    FuncDemo
-  echo    IESample
-  echo    Tutorial
-fi
-
-
-aCurrentPath="$PWD"
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-
-source "${aScriptPath}/env.sh" "$2"
-
-if test "${QTDIR}" == ""; then
-  if [ -d "$QTDIR%\qml" ];
-    then export QML2_IMPORT_PATH="$QTDIR\qml";
-  fi
-fi
-
-export "EXE_PATH=$CSF_OCCTBinPath/$1"
-
-if [ ! -f "$EXE_PATH" ]; then
-  echo "Executable \"$EXE_PATH\" not found."
-  echo "Probably you didn't compile the application."
-  exit 1
-fi
-
-cd ${aCurrentPath}
-"$EXE_PATH"
--- a/adm/templates/template.vc10
+++ b/adm/templates/template.vc10
@@ -90,7 +90,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -107,7 +107,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -138,7 +138,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@@ -156,7 +156,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -186,7 +186,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -234,7 +234,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
@@ -252,7 +252,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
--- a/adm/templates/template.vc10x
+++ b/adm/templates/template.vc10x
@@ -85,7 +85,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -100,7 +100,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@@ -130,7 +130,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@@ -146,7 +146,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@@ -175,7 +175,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -190,7 +190,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
@@ -219,7 +219,7 @@
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <Optimization>Disabled</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
@@ -235,7 +235,7 @@
    </ClCompile>
    <ResourceCompile>
      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
--- a/adm/templates/template.vc7
+++ b/adm/templates/template.vc7
@@ -22,7 +22,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -62,7 +62,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1036"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -89,7 +89,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
@@ -131,7 +131,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1036"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/adm/templates/template.vc7x
+++ b/adm/templates/template.vc7x
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
@@ -61,7 +61,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -86,7 +86,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/adm/templates/template.vc8
+++ b/adm/templates/template.vc8
@@ -50,7 +50,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -70,7 +70,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1036"
 			/>
 			<Tool
@@ -148,7 +148,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -170,7 +170,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1036"
 			/>
 			<Tool
@@ -249,7 +249,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1036"
 			/>
 			<Tool
@@ -347,7 +347,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -368,7 +368,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1036"
 			/>
 			<Tool
--- a/adm/templates/template.vc8x
+++ b/adm/templates/template.vc8x
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -68,7 +68,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES);"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__;"
 				Culture="1033"
 			/>
 			<Tool
@@ -145,7 +145,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__;"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -164,7 +164,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES);"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__;"
 				Culture="1033"
 			/>
 			<Tool
@@ -240,7 +240,7 @@
 				AdditionalOptions="/favor:blend"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -258,7 +258,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1033"
 			/>
 			<Tool
@@ -337,7 +337,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -355,7 +355,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 				Culture="1033"
 			/>
 			<Tool
--- a/adm/templates/template.vc9
+++ b/adm/templates/template.vc9
@@ -53,7 +53,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -150,7 +150,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -172,7 +172,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -248,7 +248,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -267,7 +267,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -342,7 +342,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -363,7 +363,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
--- a/adm/templates/template.vc9x
+++ b/adm/templates/template.vc9x
@@ -52,7 +52,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -71,7 +71,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -143,7 +143,7 @@
 				AdditionalOptions="-MP"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -162,7 +162,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -236,7 +236,7 @@
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				StringPooling="true"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -254,7 +254,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -327,7 +327,7 @@
 				AdditionalOptions="-MP -favor:blend"
 				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)__TKDEFS__"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -345,7 +345,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)__TKDEFS__"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
--- a/adm/upgrade.dat
+++ b/adm/upgrade.dat
@@ -1,76 +1,8 @@
 [rename]
-Adaptor3d_OffsetCurve Adaptor2d_OffsetCurve
 BRepExtrema_OverlappedSubShapes BRepExtrema_MapOfIntegerPackedMapOfInteger
 ShapeConstruct_CompBezierCurves2dToBSplineCurve2d Convert_CompBezierCurves2dToBSplineCurve2d
 ShapeConstruct_CompBezierCurves2dToBSplineCurve Convert_CompBezierCurves2dToBSplineCurve
 Image_PixMap::Img Image_Format_
-V3d_TypeOfShadingModel Graphic3d_TypeOfShadingModel
-Graphic3d_TOSM_NONE Graphic3d_TOSM_UNLIT
-V3d_COLOR Graphic3d_TOSM_UNLIT
-V3d_FLAT Graphic3d_TOSM_FACET
-V3d_GOURAUD Graphic3d_TOSM_VERTEX
-V3d_PHONG Graphic3d_TOSM_FRAGMENT
-V3d_TypeOfLight Graphic3d_TypeOfLightSource
-V3d_AMBIENT Graphic3d_TOLS_AMBIENT
-V3d_DIRECTIONAL Graphic3d_TOLS_DIRECTIONAL
-V3d_POSITIONAL Graphic3d_TOLS_POSITIONAL
-V3d_SPOT Graphic3d_TOLS_SPOT
-BOPCol_BaseAllocator Handle(NCollection_BaseAllocator)
-BOPCol_BoxBndTree is replaced with BOPTools_BoxBndTree
-BOPCol_DataMapOfIntegerInteger TColStd_DataMapOfIntegerInteger
-BOPCol_DataMapOfIntegerListOfInteger TColStd_DataMapOfIntegerListOfInteger
-BOPCol_DataMapOfIntegerListOfShape TopTools_DataMapOfIntegerListOfShape
-BOPCol_DataMapOfIntegerReal TColStd_DataMapOfIntegerReal
-BOPCol_DataMapOfIntegerShape TopTools_DataMapOfIntegerShape
-BOPCol_DataMapOfShapeBox TopTools_DataMapOfShapeBox
-BOPCol_DataMapOfShapeInteger TopTools_DataMapOfShapeInteger
-BOPCol_DataMapOfShapeListOfShape TopTools_DataMapOfShapeListOfShape
-BOPCol_DataMapOfShapeReal TopTools_DataMapOfShapeReal
-BOPCol_DataMapOfShapeShape TopTools_DataMapOfShapeShape
-BOPCol_IndexedDataMapOfShapeListOfShape TopTools_IndexedDataMapOfShapeListOfShape
-BOPCol_IndexedDataMapOfShapeShape TopTools_IndexedDataMapOfShapeShape
-BOPCol_IndexedMapOfInteger TColStd_IndexedMapOfInteger
-BOPCol_IndexedMapOfOrientedShape TopTools_IndexedMapOfOrientedShape
-BOPCol_IndexedMapOfShape TopTools_IndexedMapOfShape
-BOPCol_ListOfInteger TColStd_ListOfInteger
-BOPCol_ListOfListOfShape TopTools_ListOfListOfShape
-BOPCol_ListOfShape TopTools_ListOfShape
-BOPCol_MapOfInteger TColStd_MapOfInteger
-BOPCol_MapOfOrientedShapeTopTools_MapOfOrientedShape
-BOPCol_MapOfShape TopTools_MapOfShape
-BOPCol_SequenceOfPnt2d TColgp_SequenceOfPnt2d
-BOPCol_SequenceOfReal TColStd_SequenceOfReal
-BOPCol_SequenceOfShape TopTools_SequenceOfShape 
-BOPCol_Parallel BOPTools_Parallel
-BOPCol_NCVector NCollection_Vector
-BOPCol_DataMapOfShapeAddress DataMapOfShapeAddress
-BOPCol_DataMapOfTransientAddress DataMapOfTransientAddress
-BOPCol_DataMapIteratorOfDataMapOfIntegerReal TColStd_DataMapIteratorOfDataMapOfIntegerReal
-BOPCol_DataMapIteratorOfDataMapOfShapeAddress DataMapOfShapeAddress::Iterator
-BOPCol_DataMapIteratorOfDataMapOfTransientAddress DataMapOfTransientAddress::Iterator
-BOPCol_ListIteratorOfListOfInteger TColStd_ListIteratorOfListOfInteger
-BOPCol_ListIteratorOfListOfShape TopTools_ListIteratorOfListOfShape
-BOPCol_MapIteratorOfMapOfInteger TColStd_MapIteratorOfMapOfInteger
-BOPCol_BoxBndTreeSelector BOPTools_BoxBndTreeSelector
-BOPCol_BoxBndTree BOPTools_BoxBndTree
-BOPCol_PListOfInteger TColStd_ListOfInteger*
-BOPCol_IndexedDataMapOfShapeReal TopTools_IndexedDataMapOfShapeReal
-BOPCol_MapOfOrientedShape TopTools_MapOfOrientedShape
-BOPCol_DataMapIteratorOfDataMapOfIntegerInteger TColStd_DataMapIteratorOfDataMapOfIntegerInteger
-BOPCol_MapIteratorOfMapOfShape TopTools_MapIteratorOfMapOfShape
-BOPCol_ContextFunctor BOPTools_ContextFunctor
-BOPCol_ContextCnt BOPTools_ContextCnt
-BOPCol_Functor BOPTools_Functor
-BOPCol_Cnt BOPTools_Cnt
-BOPCol_DataMapIteratorOfDataMapOfIntegerListOfShape TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape
-BOPCol_MapIteratorOfMapOfOrientedShape TopTools_MapIteratorOfMapOfOrientedShape
-BOPCol_DataMapIteratorOfDataMapOfIntegerListOfInteger TColStd_DataMapIteratorOfDataMapOfIntegerListOfInteger
-BOPCol_DataMapIteratorOfDataMapOfShapeShape TopTools_DataMapIteratorOfDataMapOfShapeShape
-BOPTools::MapShapes TopExp::MapShapes
-BOPTools::MapShapesAndAncestors TopExp::MapShapesAndAncestors
-BOPCol_Box2DBndTreeSelector BOPTools_BoxSelector<Bnd_Box2d>
-BiTgte_DataMapOfShapeBox TopTools_DataMapOfShapeBox
-CDM_MessageDriver Message_Messenger

 [tcollection]
 AdvApp2Var_SequenceOfNode
--- a/dox/dev_guides/building/cmake/cmake.md
+++ b/dox/dev_guides/building/cmake/cmake.md
@@ -93,11 +93,10 @@ The following table gives the full list of environment variables used at the con
 | 3RDPARTY_TBB* | Path | Path to TBB binaries |
 | 3RDPARTY_VTK_* | Path | Path to VTK binaries |
 | BUILD_MODULE_<MODULE>| Boolean flag | Indicates whether the corresponding OCCT module should be built or not. It should be noted that some toolkits of a module can be built even if this module is not checked (this happens if some other modules depend on these toolkits). The main modules and their descriptions can be found in @ref user_guides |
-| BUILD_LIBRARY_TYPE | String |  Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files used when linking other targets. Note that Draw Harness plugin system is incompatible with "Static" builds, and therefore it is disabled for these builds.|
+| BUILD_LIBRARY_TYPE | String |  Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files used when linking other targets |
 | BUILD_ADDITIONAL_TOOLKITS | String | Semicolon-separated individual toolkits to include into build process. If you want to build some particular libraries (toolkits) only, then you may uncheck all modules in the corresponding *BUILD_MODUE_\<MODULE\>* options and provide the list of necessary libraries here. Of course, all dependencies will be resolved automatically |
 | BUILD_YACCLEX | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this option leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files |
-| BUILD_SAMPLES_MFC | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |
-| BUILD_SAMPLES_QT | Boolean flag | Indicates whether QT samples should be built together with OCCT. |
+| BUILD_MODULE_MfcSamples | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |
 | BUILD_Inspector | Boolean flag | Indicates whether Inspector should be built together with OCCT. |
 | BUILD_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this option leads to automatic search of Doxygen binaries. Its building calls Doxygen command to generate the documentation in HTML format |
 | BUILD_PATCH | Path | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution |
--- a/dox/dev_guides/building/xcode.md
+++ b/dox/dev_guides/building/xcode.md
@@ -49,13 +49,6 @@ For instance, in Terminal application:
  $ ./genproj
 ~~~~~

-Option **-static** can be used with XCode to build static libraries.
-
-~~~~~
-  $ cd /dev/OCCT/opencascade-7.0.0
-  $ ./genproj xcd -static
-~~~~~
-
@section build_xcode_build Building

 To start **Xcode**, launch script *xcode.sh*.
--- a/dox/dev_guides/contribution/coding_rules.md
+++ b/dox/dev_guides/contribution/coding_rules.md
@@ -76,28 +76,19 @@ Note that .lxx files should be avoided in most cases - inline method should be p

 Toolkit names are prefixed by *TK*, followed by a meaningful part of the name explaining the domain of functionality covered by the toolkit (e.g. *TKOpenGl*).

-### Names of public types
+### Names of classes

-Names of public classes and other types (structures, enums, typedefs) should match the common pattern: name of the package followed by underscore and suffix (the own name of the type):
+Usually the names of source files located in a unit start from the unit name separated from the other part of the file name by underscore "_".
+
+Thus, the names of files containing sources of C++ classes that belong to a package are constructed according to the following template:

 ~~~~~
-    <package-name>_<class-name>
+    <package-name>_<class-name>.cxx (or .hxx)
 ~~~~~

-Static methods related to the whole package are defined in the class with the same name as package (without suffix).
+For example, file *Adaptor2d_Curve2d.cxx* belongs to the package *Adaptor2d*

-Each type should be defined in its own header file with the name of the type and extension ".hxx".
-Implementation should be placed in the file with the same name and extension ".cxx"; for large classes it is possible to split implementation into multiple source files with additional suffixes in the names (usually numerical, e.g. *BSplCLib_1.cxx*).
-
-For example, class *Adaptor2d_Curve2d* belongs to the package *Adaptor2d*; it is defined in header file *Adaptor2d_Curve2d.hxx* and implemented in source file *Adaptor2d_Curve2d.cxx*.
-
-This rule also applies to complex types constructed by instantiation of templates.
-Such types should be given own names using *typedef* statement, located in same-named header file.
-
-For example, see definition in the file *TColStd_IndexedDataMapOfStringString.hxx*:
-~~~~~
-typedef NCollection_IndexedDataMap<TCollection_AsciiString,TCollection_AsciiString,TCollection_AsciiString> TColStd_IndexedDataMapOfStringString;
-~~~~~
+Files that contain sources related to the whole unit are called by the unit name with appropriate extension.

 ### Names of functions

--- a/dox/dev_guides/git_guide/git_guide.md
+++ b/dox/dev_guides/git_guide/git_guide.md
@@ -140,7 +140,7 @@ The official repository contains:
  @figure{OCCT_GitGuide_V2_image006.png,"",320}

  Optionally, you can set up TortoiseGit to use visual diff utility for SVG images used in OCCT documentation.
-  For that, click on item "Diff Viewer" in the Settings dialog, then click button "Advanced..." in the right tab to add a new record with the following parameters:
+  For that, click on item "Diff Viewer" in the Settings dialog, then click button "Advanced..." on the right tab add new record with the following parameters:
  - Extension: <code>.svg</code>
  - External program: <code>&lt;path_to_OCCT&gt;\\adm\\svgdiff.bat %%base %%mine %%bname %%yname</code>

--- a/dox/dev_guides/tests/tests.md
+++ b/dox/dev_guides/tests/tests.md
@@ -193,9 +193,9 @@ Use prefix <i>bug</i> followed by Mantis issue ID and, if necessary, additional
 	*	To check expected output which should be obtained as the test result, add @ref testmanual_3_7 "REQUIRED" statement for each line of output to mark it as required.
 	*	If the test case produces error messages (contained in parse.rules), which are expected in that test and should not be considered as its failure (e.g. test for *checkshape* command), add REQUIRED statement for each error to mark it as required output.
 4.	To check whether the data files needed for the test are already present in the database, use DRAW command *testfile* (see below).
-    If the data file is already present, use it for a new test instead of adding a duplicate.
-    If the data file(s) are not yet present in the test database, put them to a folder and add it to the environment variable *CSF_TestDataPath* to be found by the test system.
-    The location of the data files, which need to be accessed by OCC team and put to the official database, should be provided in the comment to Mantis issue, clearly indicating how the names of the files used by the test script match the actual names of the files.
+    If the data file is already present, use it for new test instead of adding a duplicate.
+    If the data file(s) are not yet present in the test database, put them to some folder and add it to the environment variable *CSF_TestDataPath* to be found by the test system.
+    Information on where the data files can be accessed by OCC team for putting to official database should be provided in comment to Mantis issue, clearly indicating how names of the files used by the test script match the actual names of the files.
    The simplest way is to attach the data files to the Mantis issue, with the same names as used by the test script.
 5.	Check that the test case runs as expected (test for fix: OK with the fix, FAILED without the fix; test for existing problem: BAD), and integrate it to the Git branch created for the issue.

@@ -222,8 +222,8 @@ fixshape result a 0.01 0.01
 checkshape result
 ~~~~~

-DRAW command *testfile* should be used to check the data files used by the test for possible duplication of content or names.
-The command accepts the list of paths to files to be checked (as a single argument) and gives a conclusion on each of the files, for instance:
+DRAW command testfile should be used to check the data files being used by the test for possible duplication of content or names.
+The command accepts list of paths to files being checked as single argument, and will give conclusion on each of the files, for instance:

 ~~~~~
 Draw[1]> testfile [glob /my/data/path/bug12345*]
--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -791,7 +791,6 @@ std::stable_sort (aValues.begin(), aValues.end());

 The old mechanism for rendering Underlay and Overlay on-screen 2D objects based on *Visual3d_Layer* and immediate drawing model (uncached and thus slow) has been removed.
 Classes *Aspect_Clayer2d, OpenGl_GraphicDriver_Layer, Visual3d_Layer, Visual3d_LayerItem, V3d_LayerMgr* and *V3d_LayerMgrPointer* have been deleted.
-The following auxiliary definition have been removed as well: Aspect_TypeOfPrimitive, Aspect_TypeOfLayer, Aspect_TypeOfEdge, Aspect_TypeOfDrawMode, Aspect_TypeOfConstraint, Aspect_DriverDefinitionError, Aspect_BadAccess.

 General AIS interactive objects with transformation persistence flag *Graphic3d_TMF_2d* can be used as a replacement of *Visual3d_LayerItem*.
 The anchor point specified for transformation persistence defines the window corner of  (or center in case of (0, 0) point).
@@ -1438,141 +1437,3 @@ The Error/Warning reporting system of the algorithms in Boolean Component (in al
 The methods returning the status of errors and warnings of the algorithms (ErrorStatus() and WarningStatus()) have been removed.
 Instead use methods HasErrors() and HasWarnings() to check for presence of errors and warnings, respectively.
 The full list of errors and warnings, with associated data such as problematic sub-shapes, can be obtained by method GetReport().
-
-@section upgrade_occt721 Upgrade to OCCT 7.2.1
-
-@subsection upgrade_721_Changes_In_USD Changes in ShapeUpgrade_UnifySameDomain
-
-The following public methods in the class ShapeUpgrade_UnifySameDomain became protected:
-* *UnifyFaces*
-* *UnifyEdges*
-
-The following public method has been removed:
-* *UnifyFacesAndEdges*
-
-@subsection upgrade_721_Move_BuildPCurveForEdgeOnPlane Moving BuildPCurveForEdgeOnPlane from BOPTools_AlgoTools2D to BRepLib
-
-The methods BuildPCurveForEdgeOnPlane and BuildPCurveForEdgesOnPlane have been moved from the class BOPTools_AlgoTools2D
-to the more lower level class BRepLib.
-
-@subsection upgrade_721_removed Removed features
-
-The following obsolete features have been removed:
-* The package BOPCol has been fully removed:
-  - *BOPCol_BaseAllocator* is replaced with *Handle(NCollection_BaseAllocator)*;
-  - *BOPCol_BoxBndTree* is replaced with *BOPTools_BoxBndTree*;
-  - *BOPCol_Box2DBndTree* is removed as unused;
-  - *BOPCol_DataMapOfIntegerInteger* is replaced with *TColStd_DataMapOfIntegerInteger*;
-  - *BOPCol_DataMapOfIntegerListOfInteger* is replaced with *TColStd_DataMapOfIntegerListOfInteger*;
-  - *BOPCol_DataMapOfIntegerListOfShape* is replaced with *TopTools_DataMapOfIntegerListOfShape*;
-  - *BOPCol_DataMapOfIntegerMapOfInteger.hxx* is removed as unused;
-  - *BOPCol_DataMapOfIntegerReal* is replaced with *TColStd_DataMapOfIntegerReal*;
-  - *BOPCol_DataMapOfIntegerShape* is replaced with *TopTools_DataMapOfIntegerShape*;
-  - *BOPCol_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;
-  - *BOPCol_DataMapOfShapeInteger* is replaced with *TopTools_DataMapOfShapeInteger*;
-  - *BOPCol_DataMapOfShapeListOfShape* is replaced with *TopTools_DataMapOfShapeListOfShape*;
-  - *BOPCol_DataMapOfShapeReal* is replaced with *TopTools_DataMapOfShapeReal*;
-  - *BOPCol_DataMapOfShapeShape* is replaced with *TopTools_DataMapOfShapeShape*;
-  - *BOPCol_DataMapOfTransientAddress* is removed as unused;
-  - *BOPCol_IndexedDataMapOfIntegerListOfInteger* is removed as unused;
-  - *BOPCol_IndexedDataMapOfShapeBox* is removed as unused;
-  - *BOPCol_IndexedDataMapOfShapeInteger* is removed as unused;
-  - *BOPCol_IndexedDataMapOfShapeListOfShape* is replaced with *TopTools_IndexedDataMapOfShapeListOfShape*;
-  - *BOPCol_IndexedDataMapOfShapeReal* is removed as unused;
-  - *BOPCol_IndexedDataMapOfShapeShape* is replaced with *TopTools_IndexedDataMapOfShapeShape*;
-  - *BOPCol_IndexedMapOfInteger* is replaced with *TColStd_IndexedMapOfInteger*;
-  - *BOPCol_IndexedMapOfOrientedShape* is replaced with *TopTools_IndexedMapOfOrientedShape*;
-  - *BOPCol_IndexedMapOfShape* is replaced with *TopTools_IndexedMapOfShape*;
-  - *BOPCol_ListOfInteger* is replaced with *TColStd_ListOfInteger*;
-  - *BOPCol_ListOfListOfShape* is replaced with *TopTools_ListOfListOfShape*;
-  - *BOPCol_ListOfShape* is replaced with *TopTools_ListOfShape*;
-  - *BOPCol_MapOfInteger* is replaced with *TColStd_MapOfInteger*;
-  - *BOPCol_MapOfOrientedShape* is replaced with *TopTools_MapOfOrientedShape*;
-  - *BOPCol_MapOfShape* is replaced with *TopTools_MapOfShape*;
-  - *BOPCol_PListOfInteger* is removed as unused;
-  - *BOPCol_PInteger* is removed as unused
-  - *BOPCol_SequenceOfPnt2d* is replaced with *TColgp_SequenceOfPnt2d*;
-  - *BOPCol_SequenceOfReal* is replaced with *TColStd_SequenceOfReal*;
-  - *BOPCol_SequenceOfShape* is replaced with *TopTools_SequenceOfShape*;
-  - *BOPCol_Parallel* is replaced with *BOPTools_Parallel*;
-  - *BOPCol_NCVector* is replaced with *NCollection_Vector*;
-* The class *BOPDS_PassKey* and containers for it have been removed as unused.
-* The unused containers from *IntTools* package have been removed:
-  - *IntTools_DataMapOfShapeAddress* is removed as unused;
-  - *IntTools_IndexedDataMapOfTransientAddress* is removed as unused;
-* The container *BiTgte_DataMapOfShapeBox* is replaced with *TopTools_DataMapOfShapeBox*;
-* The class *BOPTools* has been removed as duplicate of the class *TopExp*;
-* The method *BOPAlgo_Builder::Splits()* has been removed as excessive. The method *BOPAlgo_Builder::Images()* can be used instead.
-* The method *BOPTools_AlgoTools::CheckSameGeom()* has been removed as excessive. The method *BOPTools_AlgoTools::AreFacesSameDomain()* can be used instead.
-
-@section upgrade_occt730 Upgrade to OCCT 7.3.0
-
-@subsection upgrade_730_lights Light sources
-
-Multiple changes have been applied to lights management within *TKV3d* and *TKOpenGl*:
-* *V3d_Light* class is now an alias to *Graphic3d_CLight*.
-  *Graphic3d_CLight* is now a Handle class with refactored methods for managing light source parameters.
-  Most methods of *V3d_Light* sub-classes have been preserved to simplify porting.
-* Obsolete debugging functionality for drawing a light source has been removed from *V3d_Light*.
-  Methods and constructors that take parameters for debug display and do not affect the light definition itself have also been removed.
-* Light constructors taking *V3d_Viewer* have been marked as deprecated.
-  Use method *AddLight()* of the class *V3d_Viewer* or *V3d_View* to add new light sources to a scene or a single view, respectively.
-* The upper limit of 8 light sources has been removed.
-* The classes for specific light source types: *V3d_AmbientLight, V3d_DirectionalLight, V3d_PositionalLight* and *V3d_SpotLight* have been preserved, but it is now possible to define the light of any type by creating base class *Graphic3d_CLight* directly. The specific classes only hide unrelated light properties depending on the type of light source.
-* It is no more required to call *V3d_Viewer::UpdateLights()* after modifying the properties of light sources (color, position, etc.)
-
-@subsection upgrade_730_shadingmodels Shading Models
-
-*Graphic3d_AspectFillArea3d* has been extended by a new property *ShadingModel()*, which previously has been defined globally for the entire View.
-
-Previously, a triangle array without normal vertex attributes was implicitly considered as unshaded,
-but now such array will be shaded using *Graphic3d_TOSM_FACET* model (e.g. by computing per-triangle normals).
-Therefore, *Graphic3d_TOSM_UNLIT* should be explicitly specified to disable shading of triangles array.
-Alternatively, a material without reflectance properties can be used to disable shading (as before).
-
-@subsection upgrade_730_tkopengl Custom low-level OpenGL elements
-
-The following API changes should be considered while porting custom *OpenGl_Element* objects:
-* *OpenGl_ShaderManager::BindFaceProgram()*, *BindLineProgram()*, *BindMarkerProgram()* now take enumeration arguments instead of Boolean flags.
-
-@subsection upgrade_730_BOPAlgo_Section Changes in BOPAlgo_Section
-
-The public method *BuildSection()* in the class *BOPAlgo_Section* has become protected. The methods *Perform()* or *PerformWithFiller()* should be called for construction of the result of SECTION operation.
-
-@subsection upgrade_730_BRepAdaptor_CompCurve Changes in BRepAdaptor_CompCurve
-
-The method *BRepAdaptor_CompCurve::SetPeriodic* has been eliminated.
-Since the new version, the method *BRepAdaptor_CompCurve::IsPeriodic()* will always return FALSE. Earlier, it could return TRUE in case if the wire contained only one edge based on a periodic curve. 
-
-@subsection upgrade_730_removed Removed features
-* The methods *SetDeflection*, *SetEpsilonT*, *SetDiscretize* of the class *IntTools_EdgeFace* have been removed as redundant.
-
-@subsection upgrade_730_BuilderSolid Boolean Operations - Solid Builder algorithm
-
-Previously, the unclassified faces of *BOPAlgo_BuilderSolid* algorithm (i.e. the faces not used for solids creation and located outside of all created solids) were used to form an additional (not closed) solid with INTERNAL orientation.
-Since the new version, these unclassified faces are no longer added into the resulting solids. Instead, the @ref occt_algorithms_ers "warning" with a list of these faces appears.
-
-The following public methods of the *BOPAlgo_BuilderSolid* class have been removed as redundant:
-* *void SetSolid(const TopoDS_Solid& theSolid);*
-* *const TopoDS_Solid& Solid() const;*
-
-@subsection upgrade_730_BRepAlgoBO Boolean Operation classes in BRepAlgo are deprecated
-
-The API classes in the package BRepAlgo providing access to old Boolean operations are marked as deprecated:
-* BRepAlgo_Fuse
-* BRepAlgo_Common
-* BRepAlgo_Cut
-* BRepAlgo_Section
-Corresponding classes from the package BRepAlgoAPI should be used instead.
-
-@subsection upgrade_730_replace_CDM_MessageDriver_interface_by_Message_Messenger Unification of the Error/Warning reporting system of Application Framework
-
-Class *CDM_MessageDriver* and its descendants have been removed; class *Message_Messenger* is used instead in all OCAF packages.
-By default, messenger returned by *Message::DefaultMessenger()* is used, thus all messages generated by OCAF are directed in the common message queue of OCCT.
-
-In classes implementing OCAF persistence for custom attributes (those inheriting from *BinMDF_ADriver*, *XmlMDF_ADriver*), uses of method *WriteMessage()* should be replaced by call to method *Send()* of the inherited field *myMessageDriver*. Note that this method takes additional argument indicating the gravity of the message (Trace, Info, Warning, Alarm, or Fail).
-
-Class *Message_PrinterOStream* can be used instead of *CDM_COutMessageDriver* to direct all messages to a stream.
-If custom driver class is used in the application, that class shall be reimplemented inheriting from *Message_Printer* instead of *CDM_MessageDriver*.
-Method *Send()* should be redefined instead of method *Write()* of *CDM_MessageDriver*.
-To use the custom printer in OCAF, it can be either added to default messenger or set into the custom *Message_Messenger* object created in the method *MessageDriver()* of a class inheriting *CDF_Application*.
--- a/dox/overview/images/overview_3rdparty.png
+++ b/dox/overview/images/overview_3rdparty.png
--- a/dox/overview/images/overview_installation.png
+++ b/dox/overview/images/overview_installation.png
--- a/dox/overview/overview.md
+++ b/dox/overview/overview.md
@@ -18,7 +18,7 @@ modeling (CAD), manufacturing / measuring (CAM) or numerical simulation (CAE).
@section OCCT_OVW_SECTION_2 Copyrights

 Open CASCADE Technology and all materials, including this documentation, is 
-Copyright (c) 1999-2018 by OPEN CASCADE S.A.S. All rights reserved.
+Copyright (c) 1999-2017 by OPEN CASCADE S.A.S. All rights reserved.

@htmlonly<center>@endhtmlonly
 https://www.opencascade.com
@@ -136,9 +136,6 @@ FreeImage is easy to use, fast, multithreading safe, compatible with all 32-bit
 and cross-platform (works both with Linux and Mac OS X). FreeImage is optionally used by OCCT to work
 with images, on conditions of the FreeImage Public License (FIPL) (http://freeimage.sourceforge.net/freeimage-license.txt).

-**David M. Gay's floating point routines** (dtoa.c) are used for fast reading of floating point values from text strings.
-These routines are available under MIT-like license (see http://www.netlib.org/fp/).
-
 **CMake** is an open-source, cross-platform family of tools designed to build, test and package software. CMake is used to control the software compilation process using simple platform and compiler independent configuration files, and generate native makefiles and workspaces that can be used in the compiler environment of your choice. 
 OCCT uses CMake as a build system. CMake is available under BSD 3-Clause license. See more at https://cmake.org/

@@ -223,7 +220,7 @@ for which OCCT is certified to work.
 | Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ <br> Direct3D 9 |
 | Qt (for samples and demos) | Desktop: Qt 4.8.6+ https://www.qt.io/download/ <br> Android: Qt 5.3.2+ https://www.qt.io/download/ |
 | TCL (for testing tools)    | Tcl/Tk 8.6.3+ https://www.tcl.tk/software/tcltk/download.html <br> or ActiveTcl 8.6 https://www.activestate.com/activetcl/downloads (for Windows)| 
-| Freetype (for text rendering) | FreeType 2.4.11-2.7.1 https://sourceforge.net/projects/freetype/files/ |
+| Freetype (for text rendering) | FreeType 2.4.11-2.5.5 https://sourceforge.net/projects/freetype/files/ |
 | FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.17.0+ https://sourceforge.net/projects/freeimage/files |
 | FFmpeg (optional, for video recording) | FFmpeg 3.1+ https://www.ffmpeg.org/download.html |
 | gl2ps (optional, for export contents of OCCT viewer to vector formats) | gl2ps-1.3.8+  http://geuz.org/gl2ps/ |
@@ -286,13 +283,13 @@ When the installation is complete, you will find the directories for 3rd party p

@figure{/overview/images/overview_3rdparty.png}

-The contents of the OCCT-7.3.0 directory (called further "OCCT root", or $CASROOT) are as follows:
+The contents of the OCCT-7.0.0 directory (called further "OCCT root", or $CASROOT) are as follows:

@figure{/overview/images/overview_installation.png, "The directory tree"}

  * **adm**   This folder contains administration files, which allow rebuilding OCCT;
  * **adm/cmake**  This folder contains files of CMake building procedure;
-  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++ 2010, 2012, 2013, 2015 and 2017 which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
+  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++  2005, 2008, 2010, 2012 and 2013 which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
  * **data**  This folder contains CAD files in different formats, which can be used to test the OCCT functionality;
  * **doc**  This folder contains OCCT documentation in HTML and PDF format;
  * **dox**  This folder contains sources of OCCT documentation in plain text (MarkDown) format;
@@ -300,7 +297,6 @@ The contents of the OCCT-7.3.0 directory (called further "OCCT root", or $CASROO
  * **samples**  This folder contains sample applications.
  * **src**  This folder contains OCCT source files. They are organized in folders, one per development unit;
  * **tests**  This folder contains scripts for OCCT testing.
-  * **tools**  This folder contains sources of Inspector tool.
  * **win64/vc10**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2010;

@section OCCT_OVW_SECTION_4_2 Environment Variables
@@ -311,7 +307,7 @@ To run any Open CASCADE Technology application you need to set the environment v

 You can define the environment variables with env.bat script located in the 
 $CASROOT folder. This script accepts two arguments to be used: 
-the version of Visual Studio (vc10 -- vc141) and the architecture (win32 or win64).
+the version of Visual Studio (vc8 -- vc12) and the architecture (win32 or win64).

 The additional environment settings necessary for compiling OCCT libraries and samples 
 by Microsoft Visual Studio can be set using script custom.bat located in the same folder. 
--- a/dox/resources/occ_logo.png
+++ b/dox/resources/occ_logo.png
--- a/dox/user_guides/boolean_operations/boolean_operations.md
+++ b/dox/user_guides/boolean_operations/boolean_operations.md
@@ -548,8 +548,7 @@ The class *BOPAlgo_Options* provides the following options for the algorithms:
 * Check the presence of the Errors and Warnings;
 * Turn on/off the parallel processing;
 * Set the additional tolerance for the operation;
-* Break the operations by user request;
-* Usage of Oriented Bounding boxes in the operation.
+* Break the operations by user request.

@subsection occt_algorithms_root_classes_2 Class BOPAlgo_Algo

@@ -786,118 +785,6 @@ The types of resulting shapes depend on the type of the corresponding argument p
 | 7	| EDGE	| Set of split EDGEs	| |
 | 8	| VERTEX | VERTEX | |

-@subsection occt_algorithms_7_3a Options
-
-The General Fuse algorithm has a set of options, which allow speeding-up the operation and improving the quality of the result:
-* Parallel processing option allows running the algorithm in parallel mode;
-* Fuzzy option allows setting the additional tolerance for the operation;
-* Safe input shapes option allows preventing modification of the input shapes;
-* Gluing option allows speeding-up the intersection of the arguments;
-* Possibility to disable the check for the inverted solids among input shapes;
-* Usage of Oriented Bounding Boxes in the operation;
-* History support.
-
-For more detailed information on these options please see the @ref occt_algorithms_11a "Advanced options" section.
-
-@subsection occt_algorithms_7_3b Usage
-
-The following example illustrates how to use the GF algorithm:
-
-#### Usage of the GF algorithm on C++ level
-
-~~~~
-BOPAlgo_Builder aBuilder;
-// Setting arguments
-TopTools_ListOfShape aLSObjects = …; // Objects
-aBuilder.SetArguments(aLSObjects);
-
-// Setting options for GF
-
-// Set parallel processing mode (default is false)
-Standard_Boolean bRunParallel = Standard_True;
-aBuilder.SetRunParallel(bRunParallel);
-
-// Set Fuzzy value (default is Precision::Confusion())
-Standard_Real aFuzzyValue = 1.e-5;
-aBuilder.SetFuzzyValue(aFuzzyValue);
-
-// Set safe processing mode (default is false)
-Standard_Boolean bSafeMode = Standard_True;
-aBuilder.SetNonDestructive(bSafeMode);
-
-// Set Gluing mode for coinciding arguments (default is off)
-BOPAlgo_GlueEnum aGlue = BOPAlgo_GlueShift;
-aBuilder.SetGlue(aGlue);
-
-// Disabling/Enabling the check for inverted solids (default is true)
-Standard Boolean bCheckInverted = Standard_False;
-aBuilder.SetCheckInverted(bCheckInverted);
-
-// Set OBB usage (default is false)
-Standard_Boolean bUseOBB = Standard_True;
-aBuilder.SetUseOBB(buseobb);
-
-// Perform the operation
-aBuilder.Perform();
-
-// Check for the errors
-if (aBuilder.HasErrors())
-{
-  return;
-}
-
-// Check for the warnings
-if (aBuilder.HasWarnings())
-{
-  // treatment of the warnings
-  ...
-}
-
-// result of the operation
-const TopoDS_Shape& aResult = aBuilder.Shape();
-~~~~
-
-#### Usage of the GF algorithm on Tcl level
-
-~~~~
-# prepare the arguments
-box b1 10 10 10 
-box b2 3 4 5 10 10 10 
-box b3 5 6 7 10 10 10 
-
-# clear inner contents
-bclearobjects; bcleartools;
-
-# set the arguments
-baddobjects b1 b2 b3
-
-# setting options for GF
-
-# set parallel processing mode (default is 0)
-brunparallel 1
-
-# set Fuzzy value
-bfuzzyvalue 1.e-5
-
-# set safe processing mode (default is 0)
-bnondestructive 1
-
-# set gluing mode (default is 0)
-bglue 1
-
-# set check for inverted (default is 1)
-bcheckinverted 0
-
-# set obb usage (default is 0)
-buseobb 1
-
-# perform intersection
-bfillds
-
-# perform GF operaton
-bbuild result
-~~~~
-
@subsection occt_algorithms_7_3 Examples

 Please, have a look at the examples, which can help to better understand the definitions.
@@ -1174,7 +1061,7 @@ The input data for this step is a *BOPAlgo_Builder* object after building result
@section occt_algorithms_8  Splitter Algorithm

 The Splitter algorithm allows splitting a group of arbitrary shapes by another group of arbitrary shapes.<br>
-It is based on the General Fuse  algorithm, thus all options of the General Fuse (see @ref occt_algorithms_7_3a "GF Options") are also available in this algorithm.
+It is based on the General Fuse  algorithm, thus all options of the General Fuse such as Fuzzy mode, safe processing mode, parallel mode, gluing mode and history support are also available in this algorithm.

@subsection occt_algorithms_8_1 Arguments

@@ -1195,18 +1082,22 @@ It is based on the General Fuse  algorithm, thus all options of the General Fuse
 On the low level the Splitter algorithm is implemented in class *BOPAlgo_Splitter*. The usage of this algorithm looks as follows:
 ~~~~~
 BOPAlgo_Splitter aSplitter;
-// Setting arguments and tools
-TopTools_ListOfShape aLSObjects = …; // Objects
-TopTools_ListOfShape aLSTools = …; // Tools
+BOPCol_ListOfShape aLSObjects = …; // Objects
+BOPCol_ListOfShape aLSTools = …; // Tools
+Standard_Boolean bRunParallel = Standard_False; /* parallel or single mode (the default value is FALSE)*/
+Standard_Real aTol = 0.0; /* fuzzy option (default value is 0)*/
+Standard_Boolean bSafeMode = Standard_False; /* protect or not the arguments from modification*/
+BOPAlgo_Glue aGlue = BOPAlgo_GlueOff; /* Glue option to speed up intersection of the arguments*/
+// setting arguments
 aSplitter.SetArguments(aLSObjects);
 aSplitter.SetTools(aLSTools);
-
-// Set options for the algorithm
-// setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-...
-
-// Perform the operation
-aSplitter.Perform();
+// setting options
+aSplitter.SetRunParallel(bRunParallel);
+aSplitter.SetFuzzyValue(aTol);
+aSplitter.SetNonDestructive(bSafeMode);
+aSplitter.SetGlue(aGlue);
+//
+aSplitter.Perform(); //perform the operation
 if (aSplitter.HasErrors()) { //check error status
  return;
 }
@@ -2150,7 +2041,7 @@ The algorithm creates only closed solids. In general case the result solids are
 But the algorithm allows preventing the addition of the internal for solids parts into result. In this case the result solids will be manifold and not contain any internal parts. However, this option does not prevent from the occurrence of the internal edges or vertices in the faces.<br>
 Non-closed faces, free wires etc. located outside of any solid are always excluded from the result.

-The Volume Maker algorithm is implemented in the class BOPAlgo_MakerVolume. It is based on the General Fuse (GF) algorithm. All the options of the GF algorithm (see @ref occt_algorithms_7_3a "GF Options") are also available in this algorithm.
+The Volume Maker algorithm is implemented in the class BOPAlgo_MakerVolume. It is based on the General Fuse (GF) algorithm. All the options of the GF algorithm such as possibility to run algorithm in parallel mode, fuzzy option, safe mode, glue options and history support are also available in this algorithm.

 The requirements for the arguments are the same as for the arguments of GF algorithm - they could be of any type, but each argument should be valid and not self-interfered.

@@ -2163,19 +2054,23 @@ This option is useful e.g. for building a solid from the faces of one shell or f
 The usage of the algorithm on the API level:
 ~~~~
 BOPAlgo_MakerVolume aMV;
-// Set the arguments
-TopTools_ListOfShape aLS = …; // arguments
+BOPCol_ListOfShape aLS = …; // arguments
+Standard_Boolean bRunParallel = Standard_False; /* parallel or single mode (the default value is FALSE)*/
+Standard_Boolean bIntersect = Standard_True; /* intersect or not the arguments (the default value is TRUE)*/
+Standard_Real aTol = 0.0; /* fuzzy option (default value is 0)*/
+Standard_Boolean bSafeMode = Standard_False; /* protect or not the arguments from modification*/
+BOPAlgo_Glue aGlue = BOPAlgo_GlueOff; /* Glue option to speed up intersection of the arguments*/
+Standard_Boolean bAvoidInternalShapes = Standard_False; /* Avoid or not the internal for solids shapes in the result*/
+//
 aMV.SetArguments(aLS);
-
-// Set options for the algorithm
-// setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-...
-// Additional option of the algorithm
-Standard_Boolean bAvoidInternalShapes = Standard_False; // Set to True to exclude from the result any shapes internal to the solids
+aMV.SetRunParallel(bRunParallel);
+aMV.SetIntersect(bIntersect);
+aMV.SetFuzzyValue(aTol);
+aMV.SetNonDestructive(bSafeMode);
+aMV.SetGlue(aGlue);
 aMV.SetAvoidInternalShapes(bAvoidInternalShapes);
-
-// Perform the operation
-aMV.Perform();
+//
+aMV.Perform(); //perform the operation
 if (aMV.HasErrors()) { //check error status
  return;
 }
@@ -2233,7 +2128,7 @@ The algorithm can also create containers from the connected Cells added into res

 The algorithm has been implemented in the *BOPAlgo_CellsBuilder* class.

-Cells Builder is based on the General Fuse algorithm. Thus all options of the General Fuse algorithm (see @ref occt_algorithms_7_3a "GF Options") are also available in this algorithm.
+Cells Builder is based on the General Fuse algorithm. Thus all options of the General Fuse algorithm, such as parallel processing mode, fuzzy mode, safe processing mode, gluing mode and history support are also available in this algorithm.

 The requirements for the input shapes are the same as for General Fuse - each argument should be valid in terms of *BRepCheck_Analyzer* and *BOPAlgo_ArgumentAnalyzer*.

@@ -2253,14 +2148,18 @@ It is possible to create typed Containers from the parts added into result by us
 Here is the example of the algorithm use on the API level:
 ~~~~
 BOPAlgo_CellsBuilder aCBuilder;
-// Set the arguments
-TopTools_ListOfShape aLS = …; // arguments
+BOPCol_ListOfShape aLS = …; // arguments
+Standard_Boolean bRunParallel = Standard_False; /* parallel or single mode (the default value is FALSE)*/
+Standard_Real aTol = 0.0; /* fuzzy option (the default value is 0)*/
+Standard_Boolean bSafeMode = Standard_False; /* protect or not the arguments from modification*/
+BOPAlgo_Glue aGlue = BOPAlgo_GlueOff; /* Glue option to speed up the intersection of arguments*/
+//
 aCBuilder.SetArguments(aLS);
-
-// Set options for the algorithm
-// setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-...
-
+aCBuilder.SetRunParallel(bRunParallel);
+aCBuilder.SetFuzzyValue(aTol);
+aCBuilder.SetNonDestructive(bSafeMode);
+aCBuilder.SetGlue(aGlue);
+//
 aCBuilder.Perform(); // build splits of all arguments (GF)
 if (aCBuilder.HasErrors()) { // check error status
  return;
@@ -2270,8 +2169,8 @@ if (aCBuilder.HasErrors()) { // check error status
 const TopoDS_Shape& anEmptyRes = aCBuilder.Shape(); // empty result, as nothing has been added yet 
 const TopoDS_Shape& anAllCells = aCBuilder.GetAllParts(); //all split parts 
 //
-TopTools_ListOfShape aLSToTake = ...; // parts of these arguments will be taken into result
-TopTools_ListOfShape aLSToAvoid = ...; // parts of these arguments will not be taken into result
+BOPCol_ListOfShape aLSToTake = ...; // parts of these arguments will be taken into result
+BOPCol_ListOfShape aLSToAvoid = ...; // parts of these arguments will not be taken into result
 //
 Standard_Integer iMaterial = 1; // defines the material for the cells
 Standard_Boolean bUpdate = Standard_False; // defines whether to update the result right now or not
@@ -2819,63 +2718,6 @@ To enable the safe processing mode for the operation in DRAW, it is necessary to
 bnondestructive 1
 ~~~~

-@subsection occt_algorithms_11a_4 How to disable check of input solids for inverted status
-
-By default, all input solids are checked for inverted status, i.e. the solids are classified to understand if they are holes in the space (negative volumes) or normal solids (positive volumes). The possibility to disable the check of the input solids for inverted status is the advanced option in Boolean Operation component. This option can be applied to all Basic operations, such as General Fuse, Splitting, Boolean, Section, Maker Volume and Cells building.
-This option allows avoiding time-consuming classification of the input solids and processing them in the same way as positive volumes, saving up to 10 percent of time on the cases with a big number of input solids.
-
-The classification should be disabled only if the user is sure that there are no negative volumes among the input solids, otherwise the result may be invalid.
-
-@subsubsection occt_algorithms_11a_4_1 Usage
-
-#### API level
-
-To enable/disable the classification of the input solids it is necessary to call *SetCheckInverted()* method with the appropriate value:
-~~~~
-BOPAlgo_Builder aGF;
-//
-....
-// disabling the classification of the input solid
-aGF.SetCheckInverted(Standard_False);
-//
-....
-~~~~
-
-#### TCL level
-To enable/disable the classification of the solids in DRAW, it is necessary to call *bcheckinverted* command with the appropriate value:
-* 0 - disabling the classification;
-* 1 - default value, enabling the classification.
-
-~~~~
-bcheckinverted 0
-~~~~
-
-@subsection occt_algorithms_11a_5_obb Usage of Oriented Bounding Boxes
-
-Since Oriented Bounding Boxes are usually much tighter than Axes Aligned Bounding Boxes (for more information on OBB see the @ref occt_modat_6 "Bounding boxes" chapter of Modeling data User guide) its usage can significantly speed-up the intersection stage of the operation by reducing the number of interfering objects.
-
-@subsubsection occt_algorithms_11a_5_obb_1 Usage
-
-#### API level
-To enable/disable the usage of OBB in the operation it is necessary to call the *SetUseOBB()* method with the approriate value:
-~~~~
-BOPAlgo_Builder aGF;
-//
-....
-// Enabling the usage of OBB in the operation
-aGF.SetUseOBB(Standard_True);
-//
-....
-~~~~
-
-#### TCL level
-To enable/disable the usage of OBB in the operation in DRAW it is necessary to call the *buseobb* command with the approriate value: 
-* 0 - disabling the usage of OBB;
-* 1 - enabling the usage of OBB.
-~~~~
-buseobb 1
-~~~~
-
@section occt_algorithms_ers Errors and warnings reporting system

 The chapter describes the Error/Warning reporting system of the algorithms in the Boolean Component.
@@ -2929,148 +2771,6 @@ Warning: The positioning of the shapes leads to creation of small edges without
 ~~~~


-@section occt_algorithms_history History Information
-
-All operations in Boolean Component support @ref occt_modalg_hist "History information". This chapter describes how the History is filled for these operations.
-
-Additionally to Vertices, Edges and Faces the history is also available for the Solids.
-
-The rules for filling the History information about Deleted and Modified shapes are the same as for the API algorithms.
-
-Only the rules for Generated shapes require clarification.
-In terms of the algorithms in Boolean Component the shape from the arguments can have Generated shapes only if these new shapes 
-have been obtained as a result of pure intersection (not overlapping) of this shape with any other shapes from arguments. Thus, the Generated shapes are always:
-* VERTICES created from the intersection points and may be Generated from edges and faces only;
-* EDGES created from the intersection edges and may be Generated from faces only.
-
-So, only EDGES and FACES could have information about Generated shapes. For all other types of shapes the list of Generated shapes will be empty.
-
-@subsection occt_algorithms_history_ex Examples
-
-Here are some examples illustrating the History information.
-
-@subsubsection occt_algorithms_history_ex_del Deleted shapes
-
-The result of CUT operation of two overlapping planar faces (see the example below) does not contain any parts from the tool face. Thus, the tool face is considered as Deleted.
-If the faces are not fully coinciding, the result must contain some parts of the object face. In this case object face will be considered as not deleted.
-But if the faces are fully coinciding, the result must be empty, and both faces will be considered as Deleted.
-
-Example of the overlapping faces:
-
-~~~~
-plane p 0 0 0 0 0 1
-mkface f1 p -10 10 -10 10
-mkface f2 p 0 20 -10 10
-
-bclearobjects
-bcleartools
-baddobjects f1
-baddtools f2
-bfillds
-bbop r 2
-
-savehistory cut_hist
-isdeleted cut_hist f1
-# Not deleted
-
-isdeleted cut_hist f2
-# Deleted
-~~~~
-
-@subsubsection occt_algorithms_history_ex_modif Modified shapes
-
-In the FUSE operation of two edges intersecting in one point (see the example below), both edges will be split by the intersection point. All these splits will be contained in the result.
-Thus, each of the input edges will be Modified into its two splits.
-But in the CUT operation on the same edges, the tool edge will be Deleted from the result and, thus, will not have any Modified shapes.
-
-Example of the intersecting edges:
-~~~~
-line l1 0 0 0 1 0 0
-mkedge e1 l1 -10 10
-
-line l2 0 0 0 0 1 0
-mkedge e2 l2 -10 10
-
-bclearobjects
-bcleartools
-baddobjects e1
-baddtools e2
-bfillds
-
-# fuse operation
-bbop r 1
-
-savehistory fuse_hist
-
-modified m1 fuse_hist e1
-nbshapes m1
-# EDGES: 2
-
-modified m2 fuse_hist e2
-nbshapes m2
-# EDGES: 2
-
-# cut operation
-bbop r 2
-
-savehistory cut_hist
-
-modified m1 cut_hist e1
-nbshapes m1
-# EDGES: 2
-
-modified m2 cut_hist e2
-# The shape has not been modified
-~~~~
-
-
-@subsubsection occt_algorithms_history_gen Generated shapes
-
-Two intersecting edges will both have the intersection vertices Generated from them.
-
-As for the operation with intersecting faces, consider the following example:
-
-~~~~
-plane p1 0 0 0 0 0 1
-mkface f1 p1 -10 10 -10 10
-
-plane p2 0 0 0 1 0 0
-mkface f2 p2 -10 10 -10 10
-
-bclearobjects
-bcleartools
-baddobjects f1
-baddtools f2
-bfillds
-
-# fuse operation
-bbop r 1
-
-savehistory fuse_hist
-
-generated gf1 fuse_hist f1
-nbshapes gf1
-# EDGES: 1
-
-generated gf2 fuse_hist f2
-nbshapes gf2
-# EDGES: 1
-
-
-# common operation - result is empty
-bbop r 0
-
-savehistory com_hist
-
-generated gf1 com_hist f1
-# No shapes were generated from the shape
-
-generated gf2 com_hist f2
-# No shapes were generated from the shape
-
-~~~~
-
-
@section occt_algorithms_11b Usage 

 The chapter contains some examples of the OCCT Boolean Component usage. The usage is possible on two levels: C++ and Tcl. 
@@ -3113,18 +2813,41 @@ The following example illustrates how to use General Fuse operator:
 #include <TopTools_ListOfShape.hxx>
 #include <BRepAlgoAPI_BuilderAlgo.hxx>
 {…
+  Standard_Boolean bRunParallel;
+  Standard_Real aFuzzyValue;
  BRepAlgoAPI_BuilderAlgo aBuilder;
  //
  // prepare the arguments
  TopTools_ListOfShape& aLS=…;
  //
+  bRunParallel=Standard_True;
+  aFuzzyValue=2.1e-5;
+  //
  // set the arguments	
  aBuilder.SetArguments(aLS);
-  
-  // Set options for the algorithm
-  // setting options on this level is similar to setting options to GF algorithm on low level (see "GF Usage" chapter)
-  ...
-
+  // set parallel processing mode 
+  // if  bRunParallel= Standard_True :  the parallel processing is switched on
+  // if  bRunParallel= Standard_False :  the parallel processing is switched off
+  aBuilder.SetRunParallel(bRunParallel);
+  //
+  // set Fuzzy value
+  // if aFuzzyValue=0.: the Fuzzy option is off
+  //  if aFuzzyValue>0.: the Fuzzy option is on
+  aBuilder.SetFuzzyValue(aFuzzyValue);
+  //
+  // safe mode - avoid modification of the arguments
+  Standard_Boolean bSafeMode = Standard_True;
+  // if bSafeMode == Standard_True  - the safe mode is switched on
+  // if bSafeMode == Standard_False - the safe mode is switched off
+  aBuilder.SetNonDestructive(bSafeMode);
+  //
+  // gluing options - for coinciding arguments
+  BOPAlgo_GlueEnum aGlueOpt = BOPAlgo_GlueFull;
+  // if aGlueOpt == BOPAlgo_GlueOff   - the gluing mode is switched off
+  // if aGlueOpt == BOPAlgo_GlueShift - the gluing mode is switched on
+  // if aGlueOpt == BOPAlgo_GlueFull  - the gluing mode is switched on
+  aBuilder.SetGlue(aGlueOpt);
+  //
  // run the algorithm 
  aBuilder.Build(); 
  if (aBuilder.HasErrors()) {
@@ -3151,10 +2874,28 @@ bclearobjects; bcleartools;
 #
 # set the arguments
 baddobjects b1 b2 b3
-
-# set options for the algorithm (see "GF Usage" chapter)
-...
-
+# set parallel processing mode
+# 1:  the parallel processing is switched on
+# 0:  the parallel processing is switched off
+brunparallel 1 
+#
+# set Fuzzy value
+# 0.    : the Fuzzy option is off
+# >0. : the Fuzzy option is on
+bfuzzyvalue 0.
+#
+# set safe processing mode
+bnondestructive 1
+# set safe mode
+# 1 - the safe processing mode is switched on
+# 0 - the safe processing mode is switched off
+#
+# set gluing mode
+bglue 1
+# set the gluing mode
+# 1 or 2 - the gluing mode is switched on
+# 0 - the gluing mode is switched off
+#
 # run the algorithm
 # r is the result of the operation
 bapibuild r 
@@ -3183,9 +2924,31 @@ TopTools_ListOfShape& aLSTools = … ;
 aSplitter.SetArguments(aLSObjects);
 aSplitter.SetTools(aLSTools);
 //
-// Set options for the algorithm
-// setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-...
+// set options
+// parallel processing mode 
+Standard_Boolean bRunParallel = Standard_True;
+// bRunParallel == Standard_True  - the parallel processing is switched on
+// bRunParallel == Standard_False - the parallel processing is switched off
+aSplitter.SetRunParallel();
+//
+// fuzzy value - additional tolerance for the operation
+Standard_Real aFuzzyValue = 1.e-5;
+// if aFuzzyValue == 0. - the Fuzzy option is off
+// if aFuzzyValue > 0.  - the Fuzzy option is on
+aSplitter.SetFuzzyValue(aFuzzyValue);
+//
+// safe mode - avoid modification of the arguments
+Standard_Boolean bSafeMode = Standard_True;
+// if bSafeMode == Standard_True  - the safe mode is switched on
+// if bSafeMode == Standard_False - the safe mode is switched off
+aSplitter.SetNonDestructive(bSafeMode);
+//
+// gluing options - for coinciding arguments
+BOPAlgo_GlueEnum aGlueOpt = BOPAlgo_GlueFull;
+// if aGlueOpt == BOPAlgo_GlueOff   - the gluing mode is switched off
+// if aGlueOpt == BOPAlgo_GlueShift - the gluing mode is switched on
+// if aGlueOpt == BOPAlgo_GlueFull  - the gluing mode is switched on
+aSplitter.SetGlue(aGlueOpt);
 //
 // run the algorithm 
 aSplitter.Build(); 
@@ -3218,8 +2981,27 @@ baddobjects b1 b2
 # set the tools
 baddtools f
 #
-# set options for the algorithm (see "GF Usage" chapter)
-...
+# set parallel processing mode
+# 1:  the parallel processing is switched on
+# 0:  the parallel processing is switched off
+brunparallel 1 
+#
+# set Fuzzy value
+# 0.  : the Fuzzy option is off
+# >0. : the Fuzzy option is on
+bfuzzyvalue 0.
+#
+# set safe processing mode
+bnondestructive 1
+# set safe mode
+# 1 - the safe processing mode is switched on
+# 0 - the safe processing mode is switched off
+#
+# set gluing mode
+bglue 1
+# set the gluing mode
+# 1 or 2 - the gluing mode is switched on
+# 0 - the gluing mode is switched off
 #
 # run the algorithm
 # r is the result of the operation
@@ -3252,9 +3034,28 @@ The following example illustrates how to use Common operation:
  aBuilder.SetArguments(aLS);
  aBuilder.SetTools(aLT);
  //	
-  // Set options for the algorithm
-  // setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-  ...
+  // set parallel processing mode 
+  // if  bRunParallel= Standard_True :  the parallel processing is switched on
+  // if  bRunParallel= Standard_False :  the parallel processing is switched off
+  aBuilder.SetRunParallel(bRunParallel);
+  //
+  // set Fuzzy value
+  // if aFuzzyValue=0.: the Fuzzy option is off
+  //  if aFuzzyValue>0.: the Fuzzy option is on
+  aBuilder.SetFuzzyValue(aFuzzyValue);
+  //
+  // safe mode - avoid modification of the arguments
+  Standard_Boolean bSafeMode = Standard_True;
+  // if bSafeMode == Standard_True  - the safe mode is switched on
+  // if bSafeMode == Standard_False - the safe mode is switched off
+  aBuilder.SetNonDestructive(bSafeMode);
+  //
+  // gluing options - for coinciding arguments
+  BOPAlgo_GlueEnum aGlueOpt = BOPAlgo_GlueFull;
+  // if aGlueOpt == BOPAlgo_GlueOff   - the gluing mode is switched off
+  // if aGlueOpt == BOPAlgo_GlueShift - the gluing mode is switched on
+  // if aGlueOpt == BOPAlgo_GlueFull  - the gluing mode is switched on
+  aBuilder.SetGlue(aGlueOpt);
  //
  // run the algorithm 
  aBuilder.Build(); 
@@ -3284,8 +3085,27 @@ bclearobjects; bcleartools;
 baddobjects b1 b3
 baddtools b2
 #
-# set options for the algorithm (see "GF Usage" chapter)
-...
+# set parallel processing mode
+# 1:  the parallel processing is switched on
+# 0:  the parallel processing is switched off
+brunparallel 1
+#
+# set Fuzzy value
+# 0.    : the Fuzzy option is off
+# >0. : the Fuzzy option is on
+bfuzzyvalue 0.
+#
+# set safe processing mode
+bnondestructive 1
+# set safe mode
+# 1 - the safe processing mode is switched on
+# 0 - the safe processing mode is switched off
+#
+# set gluing mode
+bglue 1
+# set the gluing mode
+# 1 or 2 - the gluing mode is switched on
+# 0 - the gluing mode is switched off
 #
 # run the algorithm
 # r is the result of the operation
@@ -3319,9 +3139,28 @@ The following example illustrates how to use Fuse operation:
  aBuilder.SetArguments(aLS);
  aBuilder.SetTools(aLT);
  //	
-  // Set options for the algorithm
-  // setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-  ...
+  // set parallel processing mode 
+  // if  bRunParallel= Standard_True :  the parallel processing is switched on
+  // if  bRunParallel= Standard_False :  the parallel processing is switched off
+  aBuilder.SetRunParallel(bRunParallel);
+  //
+  // set Fuzzy value
+  // if aFuzzyValue=0.: the Fuzzy option is off
+  //  if aFuzzyValue>0.: the Fuzzy option is on
+  aBuilder.SetFuzzyValue(aFuzzyValue);
+  //
+  // safe mode - avoid modification of the arguments
+  Standard_Boolean bSafeMode = Standard_True;
+  // if bSafeMode == Standard_True  - the safe mode is switched on
+  // if bSafeMode == Standard_False - the safe mode is switched off
+  aBuilder.SetNonDestructive(bSafeMode);
+  //
+  // gluing options - for coinciding arguments
+  BOPAlgo_GlueEnum aGlueOpt = BOPAlgo_GlueFull;
+  // if aGlueOpt == BOPAlgo_GlueOff   - the gluing mode is switched off
+  // if aGlueOpt == BOPAlgo_GlueShift - the gluing mode is switched on
+  // if aGlueOpt == BOPAlgo_GlueFull  - the gluing mode is switched on
+  aBuilder.SetGlue(aGlueOpt);
  //
  // run the algorithm 
  aBuilder.Build(); 
@@ -3351,8 +3190,27 @@ bclearobjects; bcleartools;
 baddobjects b1 b3
 baddtools b2
 #
-# set options for the algorithm (see "GF Usage" chapter)
-...
+# set parallel processing mode
+# 1:  the parallel processing is switched on
+# 0:  the parallel processing is switched off
+brunparallel 1
+#
+# set Fuzzy value
+# 0.    : the Fuzzy option is off
+# >0. : the Fuzzy option is on
+bfuzzyvalue 0.
+#
+# set safe processing mode
+bnondestructive 1
+# set safe mode
+# 1 - the safe processing mode is switched on
+# 0 - the safe processing mode is switched off
+#
+# set gluing mode
+bglue 1
+# set the gluing mode
+# 1 or 2 - the gluing mode is switched on
+# 0 - the gluing mode is switched off
 #
 # run the algorithm
 # r is the result of the operation
@@ -3386,9 +3244,28 @@ The following example illustrates how to use Cut operation:
  aBuilder.SetArguments(aLS);
  aBuilder.SetTools(aLT);
  //	
-  // Set options for the algorithm
-  // setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-  ...
+  // set parallel processing mode 
+  // if  bRunParallel= Standard_True :  the parallel processing is switched on
+  // if  bRunParallel= Standard_False :  the parallel processing is switched off
+  aBuilder.SetRunParallel(bRunParallel);
+  //
+  // set Fuzzy value
+  // if aFuzzyValue=0.: the Fuzzy option is off
+  //  if aFuzzyValue>0.: the Fuzzy option is on
+  aBuilder.SetFuzzyValue(aFuzzyValue);
+  //
+  // safe mode - avoid modification of the arguments
+  Standard_Boolean bSafeMode = Standard_True;
+  // if bSafeMode == Standard_True  - the safe mode is switched on
+  // if bSafeMode == Standard_False - the safe mode is switched off
+  aBuilder.SetNonDestructive(bSafeMode);
+  //
+  // gluing options - for coinciding arguments
+  BOPAlgo_GlueEnum aGlueOpt = BOPAlgo_GlueFull;
+  // if aGlueOpt == BOPAlgo_GlueOff   - the gluing mode is switched off
+  // if aGlueOpt == BOPAlgo_GlueShift - the gluing mode is switched on
+  // if aGlueOpt == BOPAlgo_GlueFull  - the gluing mode is switched on
+  aBuilder.SetGlue(aGlueOpt);
  //
  // run the algorithm 
  aBuilder.Build(); 
@@ -3418,8 +3295,27 @@ bclearobjects; bcleartools;
 baddobjects b1 b3
 baddtools b2
 #
-# set options for the algorithm (see "GF Usage" chapter)
-...
+# set parallel processing mode
+# 1:  the parallel processing is switched on
+# 0:  the parallel processing is switched off
+brunparallel 1
+#
+# set Fuzzy value
+# 0.    : the Fuzzy option is off
+# >0. : the Fuzzy option is on
+bfuzzyvalue 0.
+#
+# set safe processing mode
+bnondestructive 1
+# set safe mode
+# 1 - the safe processing mode is switched on
+# 0 - the safe processing mode is switched off
+# set gluing mode
+#
+bglue 1
+# set the gluing mode
+# 1 or 2 - the gluing mode is switched on
+# 0 - the gluing mode is switched off
 #
 # run the algorithm
 # r is the result of the operation
@@ -3454,9 +3350,28 @@ The following example illustrates how to use Section operation:
  aBuilder.SetArguments(aLS);
  aBuilder.SetTools(aLT);
  //	
-  // Set options for the algorithm
-  // setting options for this algorithm is similar to setting options for GF algorithm (see "GF Usage" chapter)
-  ...
+  // set parallel processing mode 
+  // if  bRunParallel= Standard_True :  the parallel processing is switched on
+  // if  bRunParallel= Standard_False :  the parallel processing is switched off
+  aBuilder.SetRunParallel(bRunParallel);
+  //
+  // set Fuzzy value
+  // if aFuzzyValue=0.: the Fuzzy option is off
+  //  if aFuzzyValue>0.: the Fuzzy option is on
+  aBuilder.SetFuzzyValue(aFuzzyValue);
+  //
+  // safe mode - avoid modification of the arguments
+  Standard_Boolean bSafeMode = Standard_True;
+  // if bSafeMode == Standard_True  - the safe mode is switched on
+  // if bSafeMode == Standard_False - the safe mode is switched off
+  aBuilder.SetNonDestructive(bSafeMode);
+  //
+  // gluing options - for coinciding arguments
+  BOPAlgo_GlueEnum aGlueOpt = BOPAlgo_GlueFull;
+  // if aGlueOpt == BOPAlgo_GlueOff   - the gluing mode is switched off
+  // if aGlueOpt == BOPAlgo_GlueShift - the gluing mode is switched on
+  // if aGlueOpt == BOPAlgo_GlueFull  - the gluing mode is switched on
+  aBuilder.SetGlue(aGlueOpt);
  //
  // run the algorithm 
  aBuilder.Build(); 
@@ -3486,8 +3401,27 @@ bclearobjects; bcleartools;
 baddobjects b1 b3
 baddtools b2
 #
-# set options for the algorithm (see "GF Usage" chapter)
-...
+# set parallel processing mode
+# 1:  the parallel processing is switched on
+# 0:  the parallel processing is switched off
+brunparallel 1
+#
+# set Fuzzy value
+# 0.    : the Fuzzy option is off
+# >0. : the Fuzzy option is on
+bfuzzyvalue 0.
+#
+# set safe processing mode
+bnondestructive 1
+# set safe mode
+# 1 - the safe processing mode is switched on
+# 0 - the safe processing mode is switched off
+#
+# set gluing mode
+bglue 1
+# set the gluing mode
+# 1 or 2 - the gluing mode is switched on
+# 0 - the gluing mode is switched off
 #
 # run the algorithm
 # r is the result of the operation
--- a/dox/user_guides/draw_test_harness/draw_test_harness.md
+++ b/dox/user_guides/draw_test_harness/draw_test_harness.md
@@ -5529,7 +5529,6 @@ surface_radius c pi 3 c1 c2

 * **intersect** computes intersections of surfaces; 
 * **2dintersect** computes intersections of 2d curves.
-* **intconcon** computes intersections of 2d conic curves.

@subsubsection occt_draw_6_7_1  intersect

@@ -5548,43 +5547,21 @@ plane p 0 0 40 0 1 5
 intersect e c p 
 ~~~~~

-@subsubsection occt_draw_6_7_2  2dintersect
+@subsubsection occt_draw_6_7_2  dintersect

 Syntax:      
 ~~~~~
-2dintersect curve1 [curve2] [-tol tol] [-state]
-~~~~~
-
-Displays the intersection points between 2d curves.
-Options:
- -tol - allows changing the intersection tolerance (default value is 1.e-3);
- -state - allows printing the intersection state for each point.
-
-**Example:** 
-~~~~~
-# intersect two 2d ellipses 
-ellipse e1 0 0 5 2 
-ellipse e2 0 0 0 1 5 2 
-2dintersect e1 e2 -tol 1.e-10 -state
-~~~~~
-
-@subsubsection occt_draw_6_7_3 intconcon
-
-Syntax:      
-~~~~~
-intconcon curve1 curve2 
+2dintersect curve1 curve2 
 ~~~~~

 Displays the intersection points between two 2d curves. 
-Curves must be only conic sections: 2d lines, circles, ellipses,
-hyperbolas, parabolas. The algorithm from *IntAna2d_AnaIntersection* is used.

 **Example:** 
 ~~~~~
 # intersect two 2d ellipses 
 ellipse e1 0 0 5 2 
 ellipse e2 0 0 0 1 5 2 
-intconcon e1 e2 
+2dintersect e1 e2 
 ~~~~~

@subsection occt_draw_6_8  Approximations
@@ -5844,7 +5821,6 @@ The following topics are covered in the eight sections of this chapter:
  * Transformations of shapes: translation, copy, etc.
  * Topological operations, or booleans.
  * Drafting and blending.
-  * Defeaturing.
  * Analysis of shapes.


@@ -7323,33 +7299,13 @@ buildevol
 ~~~~~


-@subsection occt_draw_defeaturing Defeaturing
-
-Draw command **removefeatures** is intended for performing @ref occt_modalg_defeaturing "3D Model Defeaturing", i.e. it performs the removal of the requested features from the shape.
-
-Syntax:
-~~~~
-removefeatures result shape f1 f2 ... [-nohist] [-parallel]
-
-Where:
-result   - result of the operation;
-shape    - the shape to remove the features from;
-f1, f2   - features to remove from the shape;
-
-Options:
-nohist   - disables the history collection;
-parallel - enables the parallel processing mode.
-~~~~
-
-
@subsection occt_draw_7_9  Analysis of topology and geometry

 Analysis of shapes includes commands to compute length, area, volumes and inertial properties, as well as to compute some aspects impacting shape validity.

  * Use **lprops**, **sprops**, **vprops** to compute integral properties.
-  * Use **bounding** to compute and to display the bounding box of a shape.
+  * Use **bounding** to display the bounding box of a shape.
  * Use **distmini** to calculate the minimum distance between two shapes.
-  * Use **isbbinterf** to check if the two shapes are interfered by their bounding boxes. 
  * Use **xdistef**, **xdistcs**, **xdistcc**, **xdistc2dc2dss**, **xdistcc2ds** to check the distance between two objects on even grid.
  * Use **checkshape** to check validity of the shape.
  * Use **tolsphere** to see the tolerance spheres of all vertices in the shape.
@@ -7360,26 +7316,15 @@ Analysis of shapes includes commands to compute length, area, volumes and inerti

 Syntax:      
 ~~~~~
-lprops shape  [x y z] [-skip] [-full] [-tri]
-sprops shape [epsilon] [c[losed]] [x y z] [-skip] [-full] [-tri]
-vprops shape [epsilon] [c[losed]] [x y z] [-skip] [-full] [-tri] 
+lprops shape 
+sprops shape 
+vprops shape 
 ~~~~~

 * **lprops** computes the mass properties of all edges in the shape with a linear density of 1;
 * **sprops** of all faces with a surface density of 1;
 * **vprops** of all solids with a density of 1. 

-For computation of properties of the shape, exact geomery (curves, surfaces) or
-some discrete data (polygons, triangulations) can be used for calculations.
-The epsilon, if given, defines relative precision of computation.
-The **closed** flag, if present, forces computation only closed shells of the shape.
-The centroid coordinates will be put to DRAW variables x y z (if given).
-Shared entities will be taken in account only one time in the **skip** mode.
-All values are output with the full precision in the **full** mode.
-Preferable source of geometry data are triangulations in case if it exists, 
-if the **-tri** key is used, otherwise preferable data is exact geometry.
-If epsilon is given, exact geometry (curves, surfaces) are used for calculations independently of using key **-tri**.
-
 All three commands print the mass, the coordinates of the center of gravity, the matrix of inertia and the moments. Mass is either the length, the area or the volume. The center and the main axis of inertia are displayed. 

 **Example:** 
@@ -7413,135 +7358,20 @@ I.Z = 314159.265357595

 Syntax:      
 ~~~~~
-bounding {-s shape | -c xmin ymin zmin xmax ymax zmax} [-obb] [-shape name] [-dump] [-notriangulation] [-perfmeter name NbIters] [-save xmin ymin zmin xmax ymax zmax] [-nodraw] [-optimal] [-exttoler]
+bounding shape 
 ~~~~~

-Computes and displays the bounding box (BndBox) of a shape. The bounding box is a cuboid that circumscribes the source shape.
-Generaly, bounding boxes can be divided into two main types:
-  - axis-aligned BndBox (AABB). I.e. the box whose edges are parallel to an axis of World Coordinate System (WCS);
-  - oriented BndBox (OBB). I.e. not AABB.
+Displays the bounding box of a shape. The bounding box is a cuboid created with faces parallel to the x, y, and z planes. The command returns the dimension values of the the box, *xmin ymin zmin xmax ymax zmax.* 

-Detailed information about this command is availabe in DRAW help-system (enter "help bounding" in DRAW application).
-  
-**Example 1: Creation of AABB with given corners** 
+**Example:** 
 ~~~~~
-bounding -c 50 100 30 180 200 100 -shape result
-# look at the box
-vdisplay result
-vfit
-vsetdispmode 1
-~~~~~
-
-**Example 2: Compare AABB and OBB** 
-~~~~~
-# Create a torus and rotate it
+# bounding box of a torus 
 ptorus t 20 5 
-trotate t 5 10 15 1 1 1 28
-
-# Create AABB from the torus
-bounding -s t -shape ra -dump -save x1 y1 z1 x2 y2 z2
-==Axes-aligned bounding box
-==X-range: -26.888704600189307 23.007685197265488
-==Y-range: -22.237699567214314 27.658690230240481
-==Z-range: -13.813966507560762 12.273995247458407
-
-# Obtain the boundaries
-dump x1 y1 z1 x2 y2 z2
-==*********** Dump of x1 *************
-==-26.8887046001893
-
-==*********** Dump of y1 *************
-==-22.2376995672143
-
-==*********** Dump of z1 *************
-==-13.8139665075608
-
-==*********** Dump of x2 *************
-==23.0076851972655
-
-==*********** Dump of y2 *************
-==27.6586902302405
-
-==*********** Dump of z2 *************
-==12.2739952474584
-
-# Compute the volume of AABB
-vprops ra 1.0e-12
-==Mass :         64949.9
-
-# Let us check this value
-dval (x2-x1)*(y2-y1)*(z2-z1)
-==64949.886543606823
-~~~~~
-
-The same result is obtained.
-
-~~~~~
-# Create OBB from the torus
-bounding -s t -shape ro -dump -obb
-==Oriented bounding box
-==Center: -1.9405097014619073 2.7104953315130857 -0.76998563005117782
-==X-axis: 0.31006700219833244 -0.23203206410428409 0.9219650619059514
-==Y-axis: 0.098302309139513336 -0.95673739537318336 -0.27384340837854165
-==Z-axis: 0.94561890324040099 0.17554109923901748 -0.27384340837854493
-==Half X: 5.0000002000000077
-==Half Y: 26.783728747002169
-==Half Z: 26.783728747002165
-
-# Compute the volume of OBB
-vprops ro 1.0e-12
-==Mass :         28694.7
-~~~~~
-
-As we can see, the volume of OBB is significantly less than the volume of AABB.
-
-@subsubsection occt_draw_7_9_2a   isbbinterf
-
-Syntax:      
-~~~~~
-isbbinterf shape1 shape2 [-o]
-~~~~~
-
-Checks whether the bounding boxes created from the given shapes are interfered. If "-o"-option is switched on then the oriented boxes will be checked. Otherwise, axis-aligned boxes will be checked.
-
-**Example 1: Not interfered AABB** 
-~~~~~
-box b1 100 60 140 20 10 80
-box b2 210 200 80 120 60 90
-isbbinterf b1 b2
-==The shapes are NOT interfered by AABB.
-~~~~~
-
-**Example 2: Interfered AABB** 
-~~~~~
-box b1 300 300 300
-box b2 100 100 100 50 50 50
-isbbinterf b1 b2
-==The shapes are interfered by AABB.
-~~~~~
-
-**Example 3: Not interfered OBB** 
-~~~~~
-box b1 100 150 200
-copy b1 b2
-trotate b1 -150 -150 -150 1 2 3 -40
-trotate b2 -150 -150 -150 1 5 2 60
-
-# Check of interference
-isbbinterf b1 b2 -o
-==The shapes are NOT interfered by OBB.
-~~~~~
-
-**Example 4: Interfered OBB** 
-~~~~~
-box b1 100 150 200
-copy b1 b2
-trotate b1 -50 -50 -50 1 1 1 -40
-trotate b2 -50 -50 -50 1 1 1 60
-
-# Check of interference
-isbbinterf b1 b2 -o
-==The shapes are interfered by OBB.
+bounding t 
+==-27.059805107309852              -27.059805107309852 - 
+5.0000001000000003 
+==27.059805107309852               27.059805107309852 
+5.0000001000000003 
 ~~~~~

@subsubsection occt_draw_7_9_3  distmini
@@ -7551,7 +7381,7 @@ Syntax:
 distmini name Shape1 Shape2 
 ~~~~~

-Calculates the minimum distance between two shapes. The calculation returns the number of solutions, if more than one solution exists. The options are displayed in the viewer in red and the results are listed in the shell window. The *distmini* lines are considered as shapes which have a value v. 
+Calculates the minimum distance between two shapes. The calculation returns the number of solutions, If more than one solution exists. The options are displayed in the viewer(red) and the results are listed in the shell window. The *distmini* lines are considered as shapes which have a value v. 

 **Example:** 
 ~~~~~
@@ -7621,8 +7451,8 @@ checkshape [-top] shape [result] [-short]

 Where: 
 * *top* -- optional parameter, which allows checking only topological validity of a shape. 
-* *shape* -- the only required parameter, defines the name of the shape to check. 
-* *result* -- optional parameter, defines custom prefix for the output shape names.
+* *shape* -- the only required parameter which represents the name of the shape to check. 
+* *result* -- optional parameter which is the prefix of the output shape names. 
 * *short* -- a short description of the check. 

 **checkshape** examines the selected object for topological and geometric coherence. The object should be a three dimensional shape. 
@@ -7667,9 +7497,9 @@ validrange edge [(out) u1 u2]

 Where: 
 * *edge* -- the name of the edge to analyze. 
-* *u1*, *u2* -- optional names of variables to put into the range.
+* *u1*, *u2* -- optional names of variables to put the range into.

-**validrange** computes valid range of the edge. If *u1* and *u2* are not given, it returns the first and the last parameters. Otherwise, it sets variables *u1* and *u2*.
+**validrange** computes valid range of the edge. If *u1* and *u2* are not given it returns first and last parameters. Otherwise, it sets the variables u1 and u2.

 **Example:** 
 ~~~~~
@@ -8043,163 +7873,6 @@ Options:
 * -a AngTol - angular tolerance used for distinguishing the planar faces;
 * -s Shared(0/1) - boolean flag which defines whether the input edges are already shared or have to be intersected.

-@subsection occt_draw_hist History commands
-
-Draw module for @ref occt_modalg_hist "History Information support" includes the command to save history of modifications performed by Boolean operation or sibling commands into a drawable object and the actual history commands:
-
-* *savehistory*;
-* *isdeleted*;
-* *modified*;
-* *generated*.
-
-@subsubsection occt_draw_hist_save savehistory
-
-*savehistory* command saves the history from the session into a drawable object with the given name.
-
-Syntax:
-~~~~
-savehistory     : savehistory name
-~~~~
-
-If the history of shape modifications performed during an operation is needed, the *savehistory* command should be called after the command performing the operation.
-If another operation supporting history will be performed before the history of the first operation is saved it will be overwritten with the new history.
-
-Example:
-~~~~
-box b1 10 10 10
-box b2 5 0 0 10 10 15
-bfuse r b1 b2
-savehistory fuse_hist
-
-dump fuse_hist
-#*********** Dump of fuse_hist *************
-# History contains:
-# - 4 Deleted shapes;
-# - 20 Modified shapes;
-# - 6 Generated shapes.
-
-unifysamedom ru r
-savehistory usd_hist
-dump usd_hist
-#*********** Dump of usd_hist *************
-#History contains:
-# - 14 Deleted shapes;
-# - 28 Modified shapes;
-# - 0 Generated shapes.
-~~~~
-
-@subsubsection occt_draw_hist_isdel isdeleted
-
-*isdeleted* command checks if the given shape has been deleted in the given history.
-
-Syntax:
-~~~~
-isdeleted       : isdeleted history shape
-~~~~
-
-Example:
-~~~~
-box b1 4 4 4 2 2 2
-box b2 10 10 10
-bcommon r b1 b2
-
-savehistory com_hist
-# all vertices, edges and faces of the b2 are deleted
-foreach s [join [list [explode b2 v] [explode b2 e] [explode b2 f] ] ] {
-  isdeleted com_hist $s
-  # Deleted
-}
-~~~~
-
-@subsubsection occt_draw_hist_mod modified
-
-*modified* command returns the shapes Modified from the given shape in the given history. All modified shapes are put into a compound. If the shape has not been modified, the resulting compound will be empty. Note that if the shape has been modified into a single shape only, it will be returned without enclosure into the compound.
-
-Syntax:
-~~~~
-modified        : modified modified_shapes history shape
-~~~~
-
-Example:
-~~~~
-box b 10 10 10
-explode b e
-fillet r b 2 b_1
-
-savehistory fillet_hist
-
-explode b f
-
-modified m3 fillet_hist b_3
-modified m5 fillet_hist b_5
-~~~~
-
-@subsubsection occt_draw_hist_gen generated
-
-*generated* command returns the shapes Generated from the given shape in the given history. All generated shapes are put into a compound. If no shapes have been generated from the shape, the resulting compound will be empty. Note that; if the shape has generated a single shape only, it will be returned without enclosure into the compound.
-
-Syntax:
-~~~~
-generated       : generated generated_shapes history shape
-~~~~
-
-Example:
-~~~~
-polyline w1 0 0 0 10 0 0 10 10 0
-polyline w2 5 1 10 9 1 10 9 5 10
-
-thrusections r 0 0 w1 w2
-
-savehistory loft_hist
-
-explode w1 e
-explode w2 e
-
-generated g11 loft_hist w1_1
-generated g12 loft_hist w1_2
-generated g21 loft_hist w2_1
-generated g22 loft_hist w2_2
-
-compare g11 g21
-# equal shapes
-
-compare g12 g22
-# equal shapes
-~~~~
-
-@subsubsection occt_draw_hist_extension Enabling Draw history support for the algorithms
-
-Draw History mechanism allows fast and easy enabling of the Draw history support for the OCCT algorithms supporting standard history methods.
-To enable History commands for the algorithm it is necessary to save the history of the algorithm into the session.
-For that, it is necessary to put the following code into the command implementation just after the command is done:
-~~~~
-BRepTest_Objects::SetHistory(ListOfArguments, Algorithm);
-~~~~
-
-Here is the example of how it is done in the command performing Split operation (see implementation of the *bapisplit* command):
-~~~~
-BRepAlgoAPI_Splitter aSplitter;
-// setting arguments
-aSplitter.SetArguments(BOPTest_Objects::Shapes());
-// setting tools
-aSplitter.SetTools(BOPTest_Objects::Tools());
-
-// setting options
-aSplitter.SetRunParallel(BOPTest_Objects::RunParallel());
-aSplitter.SetFuzzyValue(BOPTest_Objects::FuzzyValue());
-aSplitter.SetNonDestructive(BOPTest_Objects::NonDestructive());
-aSplitter.SetGlue(BOPTest_Objects::Glue());
-aSplitter.SetCheckInverted(BOPTest_Objects::CheckInverted());
-aSplitter.SetUseOBB(BOPTest_Objects::UseOBB());
-
-// performing operation
-aSplitter.Build();
-
-// Store the history for the Objects (overwrites the history in the session)
-BRepTest_Objects::SetHistory(BOPTest_Objects::Shapes(), aSplitter);
-// Add the history for the Tools
-BRepTest_Objects::AddHistory(BOPTest_Objects::Tools(), aSplitter);
-~~~~

@subsection occt_draw_7_12  Texture Mapping to a Shape

@@ -11031,24 +10704,24 @@ tinspector [-plugins {name1 ... [nameN] | all}]
           [-select {object | name1 ... [nameN]}]
           [-show {0|1} = 1]
 ~~~~~
-Starts inspection tool.
+Starts tool of inspection.
 Options:
 * *plugins* enters plugins that should be added in the inspector.
-Available names are: *dfbrowser*, *vinspector* and *shapeview*.
-Plugins order will be the same as defined in the arguments.
+Available names are: dfbrowser, vinspector and shapeview.
+Plugins order will be the same as defined in arguments.
 'all' adds all available plugins in the order:
 DFBrowser, VInspector and ShapeView.
-If at the first call this option is not used, 'all' option is applied;
+If at the first call this option is not used, 'all' option is applyed;
 * *activate* activates the plugin in the tool view.
 If at the first call this option is not used, the first plugin is activated;
-* *shape* initializes plugin(s) by the shape object. If 'name' is empty, initializes all plugins;
-* *open* gives the file to the plugin(s). If the plugin is active after open, the content will be updated;
+* *shape* initializes plugin/s by the shape object. If 'name' is empty, initializes all plugins;
+* *open* gives the file to the plugin/s. If the plugin is active, after open, update content will be done;
 * *update* updates content of the active plugin;
 * *select* sets the parameter that should be selected in an active tool view.
-Depending on the active tool the parameter is:
-ShapeView: 'object' is an instance of *TopoDS_Shape TShape*,
-DFBrowser: 'name' is an entry of *TDF_Label* and 'name2' (optionally) for *TDF_Attribute* type name,
-VInspector: 'object' is an instance of *AIS_InteractiveObject*;
+Depending on active tool the parameter is:
+ShapeView: 'object' is an instance of TopoDS_Shape TShape,
+DFBrowser: 'name' is an entry of TDF_Label and name2(optionaly) for TDF_Attribute type name,
+VInspector: 'object' is an instance of AIS_InteractiveObject;
 * *show* sets Inspector view visible or hidden. The first call of this command will show it.

 **Example:** 
--- a/dox/user_guides/inspector/images/3DView.png
+++ b/dox/user_guides/inspector/images/3DView.png
--- a/dox/user_guides/inspector/images/3DView_set_orientation.png
+++ b/dox/user_guides/inspector/images/3DView_set_orientation.png
--- a/dox/user_guides/inspector/images/TStandaloneEXE.png
+++ b/dox/user_guides/inspector/images/TStandaloneEXE.png
--- a/dox/user_guides/inspector/images/TStandaloneEXE_open.png
+++ b/dox/user_guides/inspector/images/TStandaloneEXE_open.png
--- a/dox/user_guides/inspector/images/VStudio_projects.png
+++ b/dox/user_guides/inspector/images/VStudio_projects.png
--- a/dox/user_guides/inspector/images/dfbrowser.png
+++ b/dox/user_guides/inspector/images/dfbrowser.png
--- a/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg
+++ b/dox/user_guides/inspector/images/dfbrowser_selection_in_tree_view.svg
@@ -73,8 +73,8 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="529.17338"
-     inkscape:cy="317.0623"
+     inkscape:cx="128.94698"
+     inkscape:cy="215.23058"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="false"
@@ -85,10 +85,10 @@
     inkscape:showpageshadow="false"
     inkscape:snap-nodes="false"
     inkscape:snap-global="false"
-     inkscape:window-width="1332"
+     inkscape:window-width="1522"
     inkscape:window-height="784"
-     inkscape:window-x="581"
-     inkscape:window-y="97"
+     inkscape:window-x="1725"
+     inkscape:window-y="5"
     inkscape:window-maximized="0" />
  <metadata
     id="metadata3732">
@@ -200,19 +200,5 @@
       inkscape:export-filename="D:\OCCT\master_CR29018\dox\user_guides\inspector\images\selection_in_tree_view.png"
       inkscape:export-xdpi="90"
       inkscape:export-ydpi="90" />
-    <image
-       y="55.529915"
-       x="167.95375"
-       id="image1593"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAIAAABLixI0AAAAA3NCSVQICAjb4U/gAAAAsElEQVQ4
-jcWU4QnEIAyFtWSKCg4hbucmzuQUYufI/fCQeG1VTODer5TCx3tJjA4hKCGBc857zwfFGKFW1tpt
-Ss65FgffUVPHQkQxFlMdS2stxpLMyPQF9AMRG+6ROzYObz9KuVi+qIw5xVjqFnM6mdF+0ZgrkUdz
-NOasiFKulciT/aq4xd7N92t9CP9+27rXM2vxDVH7tN68ORXx05P9+3Vv7nfv283mCJRSKSU+SFgf
-ylJCrIGwaxIAAAAASUVORK5CYII=
-"
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="6.6145835"
-       width="6.6145835" />
  </g>
 </svg>
--- a/dox/user_guides/inspector/images/drawexe_tinspector.png
+++ b/dox/user_guides/inspector/images/drawexe_tinspector.png
--- a/dox/user_guides/inspector/images/preferences.png
+++ b/dox/user_guides/inspector/images/preferences.png
--- a/dox/user_guides/inspector/images/property_panel_item_selection.svg
+++ b/dox/user_guides/inspector/images/property_panel_item_selection.svg
@@ -57,9 +57,9 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="585.11712"
-     inkscape:cy="337.7975"
+     inkscape:zoom="1"
+     inkscape:cx="314.86686"
+     inkscape:cy="103.10687"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="false"
@@ -70,8 +70,8 @@
     fit-margin-bottom="0"
     inkscape:window-width="1252"
     inkscape:window-height="826"
-     inkscape:window-x="276"
-     inkscape:window-y="50"
+     inkscape:window-x="2069"
+     inkscape:window-y="98"
     inkscape:window-maximized="0" />
  <metadata
     id="metadata3933">
@@ -81,7 +81,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -155,19 +155,5 @@
       inkscape:export-filename="D:\OCCT\master_CR29018\dox\user_guides\inspector\images\selection_in_tree_view.png"
       inkscape:export-xdpi="90"
       inkscape:export-ydpi="90" />
-    <image
-       y="102.39896"
-       x="62.498363"
-       id="image5982"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAIAAABLixI0AAAAA3NCSVQICAjb4U/gAAAAsElEQVQ4
-jcWU4QnEIAyFtWSKCg4hbucmzuQUYufI/fCQeG1VTODer5TCx3tJjA4hKCGBc857zwfFGKFW1tpt
-Ss65FgffUVPHQkQxFlMdS2stxpLMyPQF9AMRG+6ROzYObz9KuVi+qIw5xVjqFnM6mdF+0ZgrkUdz
-NOasiFKulciT/aq4xd7N92t9CP9+27rXM2vxDVH7tN68ORXx05P9+3Vv7nfv283mCJRSKSU+SFgf
-ylJCrIGwaxIAAAAASUVORK5CYII=
-"
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="6.6145835"
-       width="6.6145835" />
  </g>
 </svg>
--- a/dox/user_guides/inspector/images/search.png
+++ b/dox/user_guides/inspector/images/search.png
--- a/dox/user_guides/inspector/images/shapeview.png
+++ b/dox/user_guides/inspector/images/shapeview.png
--- a/dox/user_guides/inspector/images/shapeview_tree_columns.png
+++ b/dox/user_guides/inspector/images/shapeview_tree_columns.png
--- a/dox/user_guides/inspector/images/treeview_preferences.svg
+++ b/dox/user_guides/inspector/images/treeview_preferences.svg
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="165.36458mm"
-   height="99.483337mm"
-   viewBox="0 0 165.36458 99.483337"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="treeview_preferences.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient920"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1;"
-         offset="0"
-         id="stop918" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="237.05748"
-     inkscape:cy="217.01184"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1336"
-     inkscape:window-height="850"
-     inkscape:window-x="276"
-     inkscape:window-y="52"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showborder="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-208.35938,-140.66904)">
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4147-9"
-       width="164.83542"
-       height="98.95417"
-       x="208.62396"
-       y="140.93362"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#e3f4d7;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4159-1"
-       width="155.83388"
-       height="89.326508"
-       x="212.62471"
-       y="145.50125"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.42238337;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-1-1"
-       width="40.466312"
-       height="11.316654"
-       x="280.74753"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.42572066;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-1-5-9"
-       width="41.108295"
-       height="11.316654"
-       x="321.21384"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="291.19687"
-       y="156.27933"
-       id="text5675-5"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3"
-         x="291.19687"
-         y="156.27933"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="331.87143"
-       y="156.27933"
-       id="text5679-5"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0"
-         x="331.87143"
-         y="156.27933"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_4</tspan></text>
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.97454143;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-7-0"
-       width="145.13353"
-       height="68.954567"
-       x="217.1886"
-       y="160.74771"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5293566;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4195-1-1-3"
-       width="63.558933"
-       height="11.316654"
-       x="217.1886"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="243.21165"
-       y="156.4707"
-       id="text5675-5-2"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3-2"
-         x="243.21165"
-         y="156.4707"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Name</tspan></text>
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8"
-       width="63.558926"
-       height="80.271225"
-       x="217.1886"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-8"
-       width="40.466305"
-       height="80.271225"
-       x="280.74753"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52916667;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-8-8"
-       width="41.108303"
-       height="80.271225"
-       x="321.21384"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1"
-       width="63.558929"
-       height="11.316656"
-       x="217.1886"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-0"
-       width="40.466309"
-       height="11.316656"
-       x="280.74753"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-7"
-       width="41.108307"
-       height="11.316656"
-       x="321.21384"
-       y="149.43106"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44990167;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5"
-       width="38.957039"
-       height="58.495327"
-       x="307.89423"
-       y="158.80739"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="174.62115"
-       id="text5675-5-4"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3-6"
-         x="317.94843"
-         y="174.62115"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.78735"
-       y="165.06331"
-       id="text5675-5-2-9"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5677-3-2-1"
-         x="317.78735"
-         y="165.06331"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Name</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="184.37038"
-       id="text5679-5-9"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2"
-         x="317.94843"
-         y="184.37038"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_2</tspan></text>
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8"
-       width="38.957031"
-       height="9.7492247"
-       x="307.89423"
-       y="158.80739"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-8"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="168.55661"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-7"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="178.30583"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-4"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="188.05505"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-2"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="197.80428"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1984375;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.29879999;stroke-opacity:1"
-       id="rect4157-5-8-1-8-71"
-       width="38.957035"
-       height="9.7492256"
-       x="307.89423"
-       y="207.5535"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <image
-       y="170.78539"
-       x="310.04617"
-       id="image1119"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAA3NCSVQICAjb4U/gAAAAi0lEQVQ4 jWOccOIbA7mAiWydI0Lz+yd3yNR8bHHblvbEL2+fk6z52OK2uye2W8VW8ghL4tP8/skdNOfBdSpb eBFw9sWtc3dOyIHrx6MTi2ar2GpeYUmIfvw6GRgYGDGT569vX3ZPzH335A4DAwMenVhsZmBgYOPi cc2fLCSjgl8ndpuJB0MieQ4bzQCA/UWjCjrjVAAAAABJRU5ErkJggg== "
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="5.2916665"
-       width="5.2916665" />
-    <image
-       y="161.03616"
-       x="310.04617"
-       id="image1119-4"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAA3NCSVQICAjb4U/gAAAAi0lEQVQ4 jWOccOIbA7mAiWydI0Lz+yd3yNR8bHHblvbEL2+fk6z52OK2uye2W8VW8ghL4tP8/skdNOfBdSpb eBFw9sWtc3dOyIHrx6MTi2ar2GpeYUmIfvw6GRgYGDGT569vX3ZPzH335A4DAwMenVhsZmBgYOPi cc2fLCSjgl8ndpuJB0MieQ4bzQCA/UWjCjrjVAAAAABJRU5ErkJggg== "
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="5.2916665"
-       width="5.2916665" />
-    <image
-       y="200.03305"
-       x="310.04617"
-       id="image1119-7"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAA3NCSVQICAjb4U/gAAAAi0lEQVQ4 jWOccOIbA7mAiWydI0Lz+yd3yNR8bHHblvbEL2+fk6z52OK2uye2W8VW8ghL4tP8/skdNOfBdSpb eBFw9sWtc3dOyIHrx6MTi2ar2GpeYUmIfvw6GRgYGDGT569vX3ZPzH335A4DAwMenVhsZmBgYOPi cc2fLCSjgl8ndpuJB0MieQ4bzQCA/UWjCjrjVAAAAABJRU5ErkJggg== "
-       style="image-rendering:optimizeSpeed"
-       preserveAspectRatio="none"
-       height="5.2916665"
-       width="5.2916665" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="194.1196"
-       id="text5679-5-9-2"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2-3"
-         x="317.94843"
-         y="194.1196"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_3</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="203.86882"
-       id="text5679-5-9-4"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2-9"
-         x="317.94843"
-         y="203.86882"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_4</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:3.38666677px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.28222224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="317.94843"
-       y="213.61804"
-       id="text5679-5-9-9"
-       inkscape:export-filename="F:\OCC\master_CR29018\dox\user_guides\inspector\images\3DView.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan5681-0-2-4"
-         x="317.94843"
-         y="213.61804"
-         style="font-size:3.88055563px;line-height:1.25;stroke-width:0.28222224px">Column_5</tspan></text>
-  </g>
-</svg>
--- a/dox/user_guides/inspector/images/vinspector.png
+++ b/dox/user_guides/inspector/images/vinspector.png
--- a/dox/user_guides/inspector/images/vinspector_tree_columns.png
+++ b/dox/user_guides/inspector/images/vinspector_tree_columns.png
--- a/dox/user_guides/inspector/inspector.md
+++ b/dox/user_guides/inspector/inspector.md
@@ -5,39 +5,41 @@ Inspector  {#occt_user_guides__inspector}
 
@section occt_inspector_1 Introduction

-This manual explains how to use the Inspector.
+This manual explains how to use Inspector.

@subsection occt_inspector_1_1 Overview
-Inspector is a Qt-based library that provides functionality to interactively inspect low-level content of the OCAF data model, OCCT viewer and Modeling Data.
+Inspector is a Qt-based library that provides functionality to interactively inspect low-level content of the OCAF data model, OCCT viewer and Modelisation Data.
 This component is aimed to assist the developers of OCCT-based applications to debug the problematic situations that occur in their applications.

 Inspector has a plugin-oriented architecture. The current release contains the following plugins:

 | Plugin | OCCT component | Root class of OCCT investigated component |
 | :----- | :----- | :----- |
-| @ref occt_inspector_2_2 "DFBrowser"| OCAF | *TDocStd_Application* |
-| @ref occt_inspector_2_3 "VInspector"| Visualization | *AIS_InteractiveContext* |
-| @ref occt_inspector_2_4 "ShapeView"| Modeling Data | *TopoDS_Shape* |
+| @ref occt_inspector_2_2 "DFBrowser"| OCAF | TDocStd_Application |
+| @ref occt_inspector_2_3 "VInspector"| Visualization | AIS_InteractiveContext |
+| @ref occt_inspector_2_4 "ShapeView"| Modelisation Data | TopoDS_Shape |


 Each plugin implements logic of a corresponding OCCT component.

-Each of the listed plugins is embedded in the common framework, thus it is possible to manage, which plugins should be loaded by the Inspector, and to extend their number by implementing a new plugin.
+Each of the listed plugins is embeded in the common framework.
+The user is able to manage which plugins should be loaded by Inspector.
+Also he can extend number of plugins by implementing a new plugin.


@subsection occt_inspector_1_3 Getting started

 There are two launch modes:
-1. Launch **TInspectorEXE** executable sample. For more details see @ref occt_inspector_4_1 "TInspectorEXE" section;
-2. Launch DRAW, load plugin INSPECTOR, and use *tinspector* command.
-   For more details see @ref occt_inspector_4_2 "Launch in DRAW Test Harness" section.
+1. Launch **TInspectorEXE** executable sample. For more details see @ref occt_inspector_6 "TInspectorEXE" section;
+2. Launch DRAW, load plugin INSPECTOR, and use **tinspector** command.
+   For more details see @ref occt_inspector_7 "Launch in DRAW Test Harness" section.


-Note. If you have no Inspector library in your build directory, please, make sure that OCCT is compiled with *BUILD_Inspector* 
-option ON. For more details see @ref occt_inspector_5 "Build procedure".
+Note. If you have no Inspector library in your build directory, please make sure that OCCT is compiled with *BUILD_Inspector* 
+option ON. For more details see @ref occt_inspector_4 "Build procedure".


-@section occt_inspector_2 Inspector Plugins
+@section occt_inspector_2 Inspector

@subsection occt_inspector_2_1 Overview

@@ -53,9 +55,9 @@ Inspector consists of the following components:

@figure{dfbrowser.png, "DFBrowser"}

-This plugin visualizes the content of *TDocStd_Application* in a tree view. It shows application documents, 
-the hierarchy of *TDF_Labels*, the content of *TDF_Attributes* and interconnection between attributes (e.g. references).
-Additionally there is a 3D view to visualize *TopoDS_Shape* elements stored in the document.
+This plugin visualizes content of TDocStd_Application in a tree view. It shows documents of the application,
+hierarchy of TDF_Labels, content of TDF_Attributes and interconnection between attributes (e.g. references).
+Additionally it has 3D view to visualize TopoDS_Shape elements stored in the document.

@subsubsection occt_inspector_2_2_2 Elements

@@ -67,95 +69,96 @@ Each OCAF element has own tree view item:

 | Type | Tree item | Text | Description |
 | :----- | :----- | :----- | :----- |
-| *TDocStd_Application* | Application | *TDocStd_Application* | The root of tree view. Its children are documents.|
-| *TDocStd_Document* | Document | entry : name | A child of *Application* item. Its children are *Label* and *Attribute* items.<br> Text view is an entry of the root label and the value of *TDataStd_Name* attribute for the label if it exists. |
-| *TDF_Label* | Label | entry : name | A child of a *Document* or another *Label* item. Its children and text view are the same as for Document item. |
-| *TDF_Attribute* | Attribute | attribute type [additional information] | A child of a *Label*. It has no children. <br> Text view is the attribute type *(DynamicType()->Name()* of *TDF_Attribute*) and additional information (a combination of attribute values). |
+| TDocStd_Application | Application | TDocStd_Application | It is the root of tree view. Children are documents.|
+| TDocStd_Document | Document | entry : name | It is a child of Application item. Children are Labels and Attributes items.<br> Text view is an entry of the root label and the value of TDataStd_Name attribute for the label if it exists. |
+| TDF_Label | Label | entry : name | It is a child of a Document or another Label item. Children and text view are the same as for Document item. |
+| TDF_Attribute | Attribute | attribute type [additional information] | It is a child of a Label. It has no children. <br> Text view is the attribute type (DynamicType()->Name() of TDF_Attribute) and additional information (a combination of attribute values) |


-Additional information about TDF_Attributes:
+Additional information of TDF_Attributes:

 | Type | Text |
 | :----- | :----- |
-| *TDocStd_Owner* | [storage format] |
-| *TDataStd_AsciiString*,<br> *TDataStd_Name*,<br> *TDataStd_Real*,<br> other *Simple* type attributes | [value] |
-| *TDataStd_BooleanList*,<br> *TDataStd_ExtStringList*,<br> other *List* attributes | [value_1 ... value_n] |
-| *TDataStd_BooleanArray*,<br> *TDataStd_ByteArray*,<br> other *Array* type attributes | [value_1 ... value_n] |
-| *TDataStd_TreeNode* | [tree node ID  ==> Father()->Label()] (if it has a father) or <br> [tree node ID <== First()->Label()] (if it has NO father)|
-| *TDataStd_TreeNode(XDE)* | [XDE tree node ID  ==> Father()->Label()] (if it has a father), <br> [XDE tree Node ID <== label_1, ..., label_n] (if it has NO father)|
-| *TNaming_NamedShape* | [shape type : evolution] |
-| *TNaming_UsedShapes* | [map extent] |
+| TDocStd_Owner | [storage format] |
+| TDataStd_AsciiString,<br> TDataStd_Name,<br> TDataStd_Real,<br> @ref occt_attribute_simple_types "other Simple types" | [value] |
+| TDataStd_BooleanList,<br> TDataStd_ExtStringList,<br> @ref occt_attribute_list_types "other List types" | [value_1 ... value_n] |
+| TDataStd_BooleanArray,<br> TDataStd_ByteArray,<br> @ref occt_attribute_array_types "other Array types" | [value_1 ... value_n] |
+| TDataStd_TreeNode | [tree node ID  ==> Father()->Label()] (if it has father) or <br> [tree node ID <== First()->Label()] (if it has NO father)|
+| TDataStd_TreeNode(XDE) | [@ref occt_attribute_xde_tree_node_id "XDE tree node ID"  ==> Father()->Label()] (if it has father), <br> [@ref occt_attribute_xde_tree_node_id "XDE tree Node ID" <== label_1, ..., label_n] (if it has NO father)|
+| TNaming_NamedShape | [shape type : evolution] |
+| TNaming_UsedShapes | [map extent] |


 Custom color of items:

 | OCAF element Type | Color |
 | :----- | :----- |
-| *TDF_Label* | <b>dark green</b>, if the label has *TDataStd_Name* attribute, <br><b>light grey</b> if the label is empty (has no attributes on all levels of  hierarchy),<br> <b>black</b> otherwise. |
-| *TNaming_NamedShape* | <b>dark gray</b> for *TopAbs_FORWARD* orientation of *TopoDS_Shape*, <br> <b>gray</b> for *TopAbs_REVERSED* orientation of *TopoDS_Shape*, <br> <b>black</b> for other orientation. |
+| TDF_Label | <b>dark green</b>, if the label has TDataStd_Name attribute, <br><b>light grey</b> if the label is empty (has no attributes on all levels of hierarchy),<br> <b>black</b> otherwise |
+| TNaming_NamedShape | <b>dark gray</b> for TopAbs_FORWARD orientation of TopoDS_Shape, <br> <b>gray</b> for TopAbs_REVERSED orientation of TopoDS_Shape, <br> <b>black</b> for other orientation |


-Context pop-up menu:
+Context popup menu:
 | Action | Functionality |
 | :----- | :----- |
-| Expand | Expands the next two levels under the selected item. |
-| Expand All | Expands the whole tree of the selected item. |
-| Collapse All | Collapses the whole tree of the selected item. |
+| Expand | Expands the next two levels under the selected item |
+| Expand All | Expands the whole tree of the selected item |
+| Collapse All | Collapses the whole tree of the selected item |


 <b>Property Panel</b>

-Property panel is used to display the content of *Label* or *Attribute* tree view items or Search result view.
-The information is usually shown in one or several tables.
+Property panel is used to display content of Label or Attribute tree view items.
+This control is used for content of Label or Attribute tree view items or Search result view.
+Information is usually shown in one or several tables.

-*TDF_Attribute* has the following content in the Property Panel:
+TDF_Attribute has the following content in Property Panel:

 <table>
 <tr><th>Type</th><th>Description</th><th>Content</th></tr>
-<tr><td><i>TDF_Label</i></td>
+<tr><td>TDF_Label</td>
    <td> a table of [entry or attribute name, value]</td>
    <td>@figure{property_panel_label.png, "",140}</td></tr>
-<tr><td><i>TDocStd_Owner</i>,<br> Simple type attributes, <br> List type attributes</td>
+<tr><td>TDocStd_Owner,<br> @ref occt_attribute_simple_types "Simple types", <br> @ref occt_attribute_list_types "List types"</td>
    <td>a table of [method name, value]</td>
    <td>@figure{property_panel_simple_type.png, "",140}</td></tr>
-<tr><td><i>TDataStd_BooleanArray</i>,<br> <i>TDataStd_ByteArray</i>,<br> other Array type attributes</td>
-    <td>2 controls: <br> - a table of [array bound, value], <br> - a table of [method name, value] </td>
+<tr><td>TDataStd_BooleanArray,<br> TDataStd_ByteArray,<br> @ref occt_attribute_array_types "other Array types"</td>
+    <td>2 controls: <br>  * a table of [array bound, value], <br>  * table of [method name, value]</td>
    <td>@figure{property_panel_array.png, "",140}</td></tr>
-<tr><td><i>TDataStd_TreeNode</i></td>
-    <td>2 controls: <br> - a table of [Tree ID, value] (visible only if Tree ID() != ID() ), <br> - a tree view of tree nodes starting from *Root()* of the tree node. The current tree node has <b>dark blue</b> text.</td>
+<tr><td>TDataStd_TreeNode</td>
+    <td>2 controls: <br>  * a table of [Tree ID, value] (visible only if Tree ID() != ID()), <br>  * a tree view of tree nodes starting from Root() of the tree node. The current tree node has <b>dark blue</b> text.</td>
    <td>@figure{property_panel_tree_node.png, "",140} </td></tr>
-<tr><td><i>TDataStd_NamedData</i></td>
+<tr><td>TDataStd_NamedData</td>
    <td>tab bar of attribute elements, each tab has a table of [name, value]</td>
    <td>@figure{property_panel_named_data.png, "",140}</td></tr>
-<tr><td><i>TNaming_UsedShapes</i></td>
-    <td>a table of all shapes handled by the framework</td>
+<tr><td>TNaming_UsedShapes</td>
+    <td>a table of all  the shapes handled by the framework</td>
    <td>@figure{property_panel_tnaming_used_shapes.png, "",140}</td></tr>
-<tr><td><i>TNaming_NamedShape</i></td>
-    <td>2 controls: <br> - a table of [method name, value] including CurrentShape/OriginalShape methods result of <i>TNaming_Tools</i>, <br> - an evolution table. <br> Tables contain buttons for @ref occt_shape_export "TopoDS_Shape export".</td>
+<tr><td>TNaming_NamedShape</td>
+    <td>2 controls: <br>  * a table of [method name, value] including CurrentShape/OriginalShape methods result of TNaming_Tools, <br>  * an evolution table. <br> Tables contain buttons for @ref occt_shape_export "TopoDS_Shape export".</td>
    <td>@figure{property_panel_tnaming_named_shape.png, "",140}</td></tr>
-<tr><td><i>TNaming_Naming</i></td>
-    <td>2 controls: <br> - a table of <i>TNaming_Name</i> values,<br> - a table of [method name, value]</td>
+<tr><td>TNaming_Naming</td>
+    <td>2 controls: <br>  * a table of TNaming_Name vlaues,<br>  * a table of [method name, value]</td>
    <td>@figure{property_panel_tnaming_naming.png, "",140}</td></tr>
 </table>


 <b>Dump view</b>

-@figure{dump_attribute.png, "Dump of TDF_Attribute",200}
+@figure{dump_attribute.png, "Dump of TDF_Attribute"}

-Dump view shows the result of <b>TDF_Attribute::Dump()</b> or <b>TDF_Label::Dump()</b> of the selected tree view item.
+Dump view shows result of <b>TDF_Attribute::Dump()</b> or <b>TDF_Label::Dump()</b> of selected tree view item.

 <b>3D view</b>

-3D View visualizes *TopoDS_Shape* elements of OCAF attribute via AIS facilities.
+3D View visualizes TopoDS_Shape elements of OCAF attribute via AIS facilities.

-DFBrowser creates two kinds of presentations depending on the selection place:
+DFBrowser creates two kinds presentations depending on the selection place:

 <table>
-<tr><th>Kind</th><th>Source object</th><th>Visualization properties</th><th>View</th></tr>
+<tr><th>Kind</th><th>Source object</th><th>Visualization propeties</th><th>View</th></tr>
 <tr><td>Main presentation</td>
-    <td>Tree view item:<br> *TPrsStd_AISPresentation*,<br> *TNaming_NamedShape*,<br> *TNaming_Naming*</td>
-    <td>Color: a default color for shape type of the current *TopoDS_Shape*.</td>
+    <td>Tree view item:<br> TPrsStd_AISPresentation,<br> TNaming_NamedShape,<br> TNaming_Naming</td>
+    <td>Color: a default color for shape type of the current TopoDS_Shape</td>
    <td>@figure{display_main_presentation.png, "",100}</td></tr>
 <tr><td>Additional presentation</td>
    <td>References in Property panel</td>
@@ -168,8 +171,8 @@ DFBrowser creates two kinds of presentations depending on the selection place:
 <b>Tree Navigation</b>

 Tree Navigation shows a path to the item selected in the tree view.
-The path is a sequence of label entries and attribute type names.
-Each element in the path is selectable - simply click on it to select the corresponding tree view item.
+The path is a sequence of label entries and attribute type name.
+Each element in the path is selectable - the user can click on it to select the corresponding tree view item.

 Navigation control has buttons to go to the previous and the next selected tree view items.

@@ -181,14 +184,14 @@ Update button synchronizes content of tree view to the current content of OCAF d
 <b>Search</b>

 The user can search OCAF element by typing:
-  * *TDF_Label* entry,
-  * *TDF_Attribute* name,
-  * *TDataStd_Name* and *TDataStd_Comment* attributes value.
+  * TDF_Label entry,
+  * TDF_Attribute name,
+  * TDataStd_Name and TDataStd_Comment attributes value.

-@figure{search.png,"Search",360}
+@figure{search.png,"Search"}

 As soon as the user confirms the typed criteria, the Property panel is filled by all satisfied values.
-The user can click a value to highlight the corresponding tree view item. By double click the item will be selected.
+The user can click a value to hightligt the corresponding tree view item. By double click the item will be selected.


@subsubsection occt_inspector_2_2_3 Elements cooperation
@@ -196,22 +199,22 @@ The user can click a value to highlight the corresponding tree view item. By dou
 <b>Tree item selection</b>

 Selection of tree view item updates content of the following controls:
-  * Navigation line;
-  * Property Panel;
-  * 3D View (if it is possible to create an interactive presentation);
-  * Dump View.
+  * Navigation line
+  * Property Panel
+  * 3D View (if it is possible to create an interactive presentation)
+  * Dump View

@figure{dfbrowser_selection_in_tree_view.svg,"",360}

 <b>Property Panel item selection </b>

-If the property panel shows content of *TDF_Label*:
-  * selection of the table row highlights the corresponding item in the tree view,
-  * double click on the table row selects this item in the tree view.
+If property panel shows content of TDF_Label:
+  * selection of the table row hightlights the corresponding item in tree view,
+  * double click on the table row selects this item in tree view.

-If the property panel shows content of *TDF_Attribute* that has reference to another attribute, selection of this reference:
-  * highlights the referenced item in the tree view,
-  * displays additional presentation in the 3D view if it can be created.
+If property panel shows content of TDF_Attribute that has reference to another attribute, selection of this reference:
+  * highlights the referenced item in TreeView,
+  * displays additional presentation in 3D view if it can be created.

@figure{property_panel_item_selection.svg,"",360}

@@ -219,28 +222,28 @@ Attributes having references:

 | Type | Reference | Additional presentation
 | :----- | :----- | :----- |
-| *TDF_Reference* | *TDF_Label* | |
-| *TDataStd_ReferenceArray*, <br> *TDataStd_ReferenceList*, <br> *TNaming_Naming* | One or several *TDF_Label* in a container. | |
-| *TDataStd_TreeNode* | *TDF_Label* | |
-| *TNaming_NamedShape* | *TDF_Label* in Evolution table |  *TopoDS_Shapes* selected in the property panel tables. |
-| *TNaming_UsedShapes* | one or several *TNaming_NamedShape* | *TopoDS_Shapes* of the selected *TNaming_NamedShape*. |
+| TDF_Reference | TDF_Label | |
+| TDataStd_ReferenceArray, <br> TDataStd_ReferenceList, <br> TNaming_Naming | one or several TDF_Label in a container | |
+| TDataStd_TreeNode | TDF_Label | |
+| TNaming_NamedShape | TDF_Label in Evolution table | selected TopoDS_Shapes in property panel tables |
+| TNaming_UsedShapes | one or several TNaming_NamedShape | TopoDS_Shapes of selected TNaming_NamedShape |


@subsubsection occt_shape_export TopoDS_Shape export

-Property panel of *TNaming_NamedShape* attribute has controls to export *TopoDS_Shape* to:
-  * BREP. **Save file** dialog is open to enter the result file name,
-  * @ref occt_inspector_2_4 "ShapeView" plugin. The dialog for exporting element to ShapeView allows activating this plugin immediately.
+Property panel of TNaming_NamedShape attribute has controls to export TopoDS_Shape to:
+  * BREP. The save file dialog is started to enter the result file name,
+  * @ref occt_inspector_2_4 "ShapeView" plugin. Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediatelly.


@subsection occt_inspector_2_3 VInspector Plugin

@subsubsection occt_inspector_2_3_1 Overview

-@figure{vinspector.png, "VInspector",360}
+@figure{vinspector.png, "VInspector"}

-This plugin visualizes interactive objects displayed in *AIS_InteractiveContext* in a tree view with computed selection
-components for each presentation. It shows the selected elements in the context and allows selecting these elements.
+It visualizes interactive objects displayed in AIS_InteractiveContext in a tree view with columputed selection
+components for each presentation. It shows the selected elements in the context and allows to select these elements.

@subsubsection occt_inspector_2_3_2 Elements

@@ -248,85 +251,81 @@ components for each presentation. It shows the selected elements in the context

 <b>Presentations tree view</b>

-This view shows presentations and selection computed on them. Also, the view has columns with information about the state of visualization elements.
+It shows presentations and selection computed of them. Also, the view has columns with information about state of visualization elements.

 VInspector tree items.

 | Type | Description |
 | :----- | :----- |
-| *AIS_InteractiveContext* | The root of tree view. Its children are interactive objects obtained by *DisplayedObjects* and *ErasedObjects* methods.|
-| *AIS_InteractiveObject* | A child of *AIS_InteractiveContext* item. Its children are *SelectMgr_Selection* obtained by iteration on *CurrentSelection*.  |
-| *SelectMgr_Selection* | A child of *AIS_InteractiveObject*. Its children are *SelectMgr_SensitiveEntity* obtaining by iteration on *Sensitive*. |
-| *SelectMgr_SensitiveEntity* | A child of *SelectMgr_Selection*. Its children are *SelectMgr_SensitiveEntity* obtaining by iteration on *OwnerId*. |
-| *SelectBasics_EntityOwner* | A child of *SelectMgr_SensitiveEntity*. It has no children. |
+| AIS_InteractiveContext | It is the root of tree view. Children are interactive objects obtained by *DisplayedObjects* and *ErasedObjects* methods.|
+| AIS_InteractiveObject | It is a child of AIS_InteractiveContext item. Children are SelectMgr_Selection obtained by iteration on *CurrentSelection*  |
+| SelectMgr_Selection | It is a child of AIS_InteractiveObject. Children are SelectMgr_SensitiveEntity obtaining by iteration on *Sensitive* |
+| SelectMgr_SensitiveEntity | It is a child of SelectMgr_Selection. Children are SelectMgr_SensitiveEntity obtaining by iteration on *OwnerId* |
+| SelectBasics_EntityOwner | It is a child SelectMgr_SensitiveEntity. It has no children. |


 Custom color of tree view items:

 | OCAF element Type | Column | What | Color |
 | :----- | :----- | :----- | :----- |
-| *AIS_InteractiveObject* | 0 | Text | <b>dark gray</b> in *ErasedObjects* list of *AIS_InteractiveContext*,<br> <b>black</b> otherwise |
-| *AIS_InteractiveObject*, <br> *SelectMgr_SensitiveEntity*, <br> *SelectBasics_EntityOwner*| 1 | Background | <b>dark blue</b>, if there is a selected owner under the item, <br> <b>black</b> otherwise |
-| *SelectMgr_Selection*,<br> *SelectMgr_SensitiveEntity*,<br> *electBasics_EntityOwner* | all | Text | <b>dark gray</b>, if *SelectionState* of *SelectMgr_Selection* is not *SelectMgr_SOS_Activated*,<br> <b>black</b> otherwise |
+| AIS_InteractiveObject | 0 | Text | <b>dark gray</b>, it is in *ErasedObjects* list of AIS_InteractiveContext,<br> <b>black</b> otherwise |
+| AIS_InteractiveObject, <br> SelectMgr_SensitiveEntity, <br> SelectBasics_EntityOwner| 1 | Background | <b>dark blue</b>, if there is a selected owner under the item, <br> <b>black</b> otherwise |
+| SelectMgr_Selection,<br> SelectMgr_SensitiveEntity,<br> SelectBasics_EntityOwner| all | Text | <b>dark gray</b>, if *SelectionState* of SelectMgr_Selection is not *SelectMgr_SOS_Activated*,<br> <b>black</b> otherwise |


 Context popup menu in tree view:
 | Action | Item | Functionality |
 | :----- | :----- | :----- |
-| Export to ShapeView | *AIS_InteractiveObject* | Exports *TopoDS_Shape* of the *AIS_Interactive* presentation to ShapeView plugin. <br> It should be *AIS_Shape* presentation and ShapeView plugin should be registered in Inspector<br> Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediately. |
-| Show | *AIS_InteractiveObject* | Displays presentation in *AIS_InteractiveContext*. |
-| Hide | *AIS_InteractiveObject* | Erases presentation from *AIS_InteractiveContext*. |
+| Export to ShapeView | AIS_InteractiveObject | Exports TopoDS_Shape of AIS_Interactive presentation to ShapeView plugin. <br> It should be AIS_Shape presentation and ShapeView plugin should be registered in Inspector<br> Dialog about exporting element to ShapeView is shown with a possibility to activate this plugin immediatelly. |
+| Show | AIS_InteractiveObject | *Display* presentation in AIS_InteractiveContext |
+| Hide | AIS_InteractiveObject | *Erase* presentation from AIS_InteractiveContext |

 <b>Update</b>

-This button synchronizes the plugin content with the current state of *AIS_InteractiveContext* and updates the presence of items and their current selection.
+It synchronizes content of the plugin to the current state of AIS_InteractiveContext.
+It updates the presence of items and the current selection for the items.

 <b>Selection controls</b>

-Selection controls switch on/off the possibility to set selection in the context from VInspector plugin.
+Selection controls switch on/off the posibility to set selection in the context from VInspector plugin.

 | Action | Tree view item | Functionality |
 | :----- | :----- | :----- |
-| Select Presentations | *AIS_InteractiveObject* | Calls *AddOrRemoveSelected* of interactive object for the selected item. |
-| Select Owners | *SelectMgr_EntityOwner* or <br> *SelectMgr_SensitiveEntity* | Calls *AddOrRemoveSelected* of *SelectMgr_EntityOwner* for the selected item. |
+| Select Presentations | AIS_InteractiveObject | Calls *AddOrRemoveSelected* of interactive object for the selected item |
+| Select Owners | SelectMgr_EntityOwner or <br> SelectMgr_SensitiveEntity | Calls *AddOrRemoveSelected* of SelectMgr_EntityOwner for the selected item |

-Please, note that the initial selection in the context will be cleared.
+Please note, that the initial selection in context will be cleared.
 If the button is toggled, the button selection is active. Only one button may be toggled at the moment.


 <b>History view</b>

-At present, the History view is under implementation and may be used only in a custom application where Inspector is loaded.
+At present the History view is under implementation and may be used only in a custom application where Inspector is loaded.

-To fill this view, *VInspectorAPI_CallBack* should be redefined in the application and send signals about some actions applied to the context.
-After that, the call back should be given as a parameter in the plugin.
+To fill this view, VInspectorAPI_CallBack should be redefined in the application and send signals about some actions applyed to context.
+After, the call back should be given as parameter in the plugin.
 If done, new items will be created in the history view for each action.

@subsubsection occt_inspector_2_3_3 Elements cooperation

-*VInspector* marks the presentations currently selected in *AIS_InteractiveContext* with a blue background in tree items. Use **Update** button to synchronize VInspector selected items state to the context.
+Vinspector markes current selected presentations in AIS_InteractiveContext with blue background in tree items. Use "Update" button to synchronize VInspector selected items state to the context.

-It is also possible to perform selection in the context using "Selection controls" VInspector feature. However, this operation should be performed carefully as
-it clears the current selection in *AIS_InteractiveContext*.
+It is also possible to perform selection in context using "Selection controls" VInspector. However, it should be performed carefully as
+it clears the current selection in AIS_InteractiveContext.

 Selection change:
 | From | To | Action | Result |
 | :----- | :----- | :----- | :----- |
-| *AIS_InteractiveContext* | VInspector | Performs selection in *AIS_InteractiveContext*. | Click **Update** button in VInspector and check **Selection** column: <br> *AIS_InteractiveContext* item contains some selected objects, <br> the value of some *AIS_InteractiveObject* is filled if they are selected for this presentation or its entity owner. |
-| VInspector | *AIS_InteractiveContext* | Activates one of Selection controls and selects one or several elements in the tree view. | The objects become selected in *AIS_InteractiveContext*. |
-
-@subsubsection occt_inspector_2_3_4 VInspector tree view columns
-
-Use context pop-up menu on the tree view header to select, which columns should be displayed.
-@figure{vinspector_tree_columns.png, "Vinspector tree header context menu",360}
+| AIS_InteractiveContext | VInspector | perform selection in AIS_InteractiveContext | Click "Update" button in VInspector and check "Selection" column: <br> AIS_InteractiveContext item has anount of selected objects,<br> some of AIS_InteractiveObject have filled value if it selection happens for this presentation or entity owner of it |
+| VInspector | AIS_InteractiveContext | activate one of Selection controls and select one or several elements in tree view | The objects become selected in AIS_InteractiveContext |

@subsection occt_inspector_2_4 ShapeView Plugin

@subsubsection occt_inspector_2_4_1 Overview

-@figure{shapeview.png, "ShapeView",360}
+@figure{shapeview.png, "ShapeView"}

-This plugin visualizes content of *TopoDS_Shape* in a tree view.
+This plugin visualizes content of TopoDS_Shape in a tree view.

@subsubsection occt_inspector_2_4_2 Elements

@@ -334,147 +333,99 @@ This plugin visualizes content of *TopoDS_Shape* in a tree view.

 <b>TopoDS_Shape View</b>

-The view elements are *TopoDS_Shape* objects.
-The shape is exploded into sub-shapes using *TopoDS_Iterator* of the *TopoDS_Shape*.
-Children sub-shapes are presented in the view as children of the initial shape.
-By iterating recursively through all shapes we obtain a tree view of items shown in the ShapeView.
+Elements of the view are TopoDS_Shape objects.
+This shape is exploded into sub-shapes using TopoDS_Iterator of the TopoDS_Shape.
+Child sub-shapes are presented in the view as children of the initial shape.
+Iterating recursively by all shapes we obtain a tree view of items shown in the ShapeView.

-The columns of the View show some information about *TopoDS_Shape* of the item.
-The first column allows changing the visibility of the item shape in the 3D view.

-Context pop-up menu in tree view:
+Columns of the View show some information about TopoDS_Shape of the item.
+The most informative column is the last column of TopoDS_Vertex and TopoDS_Edge shape types.
+
+For TopoDS_Vertex it contains the point coordinates,
+
+for TopoDS_Edge it contains the first and the last point coordinates, the edge length and some other parameters.
+
+
+Context popup menu in tree view:
 | Action | Functionality |
 | :----- | :----- |
-| Load BREP file | Opens the selected file and appends the resulting *TopoDS_Shape* into the tree view. |
-| Remove all shape items | Clears tree view. |
-| BREP view | Shows the text view with BREP content of the selected item. Creates the BREP file in a temporary directory of the plugin. |
-| Close All BREP views | Closes all opened text views. |
-| BREP directory | Displays the folder, where temporary BREP files have been stored. |
+| Load BREP file | Opens selected file and appends the result TopoDS_Shape into tree view |
+| Remove all shape items | Clears tree view |
+| BREP view | Shows text view with BREP content of the selected item. It creates BREP file in temporary directory of the plugin. |
+| Close All BREP views | Closes all opened text views |
+| BREP directory | Displays folder where temporary BREP files have been stored.  |

@subsubsection occt_inspector_2_4_3 Elements cooperation

-Selection of one or several items in *TopoDS_Shape* View creates its *AIS_Shape* presentation and displays it in the 3D View.
+Selection of one or several items in TopoDS_Shape View creates AIS_Shape presentation for it and displays it in the 3D View.

-@subsubsection occt_inspector_2_4_4 ShapeView tree view columns
-
-Use context pop-up menu on the tree view header to select, which columns should be displayed.
-@figure{shapeview_tree_columns.png, "ShapeView tree header context menu",360}


@section occt_inspector_3 Common controls
+@subsection occt_inspector_3_1 3D View

-@subsection occt_inspector_3_1 Tree View
+@subsubsection occt_inspector_3_1_1 Overview

-This control shows presentation hierarchy of the investigated OCCT element, e.g. *TDocStd_Application* for DFBrowser, see @ref occt_inspector_1_1 "Overview".
-The first column contains the name, other columns are informative.
+@figure{3DView.png, "3D View"}

-The tree view has a context menu with plugin-specific actions.
-
-@subsubsection occt_inspector_3_1_1 Tree View preferences
-
-It is possible to define visibility and width of columns.
-This option is available in a view that contains more than one column,
- e.g. @ref occt_inspector_2_3_4 "VInspector tree view columns"
- and @ref occt_inspector_2_4_4 "ShapeView tree view columns".
-
-@figure{treeview_preferences.svg, "Preferences schema",360}
+Control for OCCT 3D viewer. It creates visualization view components with possibilities to perform some
+user actions for the view.


-@subsection occt_inspector_3_2 3D View
+@subsubsection occt_inspector_3_1_2 Elements

-@subsubsection occt_inspector_3_2_1 Overview
+@figure{3DView_elements.svg,"3DView Elements"}

-@figure{3DView.png, "3D View",360}
-
-This control for OCCT 3D viewer creates visualization view components and allows performing some user actions in the view.
-
-
-@subsubsection occt_inspector_3_2_2 Elements
-
-@figure{3DView_elements.svg,"3DView Elements",360}
-
-3D View contains the following elements:
+3D View contains:
 | Element | Functionality |
 | :----- | :----- |
-| 3D view | V3d viewer with mouse events processing. |
-| Context | Allows choosing another context that should be used in the plugin. The following contexts are available:<br> **Own** - the context of this view, <br> **External** - the context of the @ref occt_inspector_4_3 "external application", which initializes the plugin, <br> **None** - the visualization is not performed at all (useful if the presentation is too complex). |
-| Multi/Single | The buttons define what to do with the previously displayed objects: <br> **Multi** displays new presentations together with already displayed ones, <br> **Single** removes all previously displayed presentations. |
-| Clean | Removes all displayed presentations. |
-| Fit All,<br> Fit Area,<br> Zoom,<br> Pan,<br> Rotation | Scene manipulation actions<br> (Fit All is checkable. If checked(by double click), display/hide of new objects will perform **Fit All** of the scene.) |
-| Display Mode | Sets *AIS_Shading* or *AIS_WireFrame* display mode for all presentations. |
-
-Context popup menu:
-| Action | Functionality |
-| :----- | :----- |
-| Set View Orientation | Shows the list of available *V3d_View* projections. Selection of an item with change the view. |
-
-@figure{3DView_set_orientation.png,"Set view orientation",360}
-
-@subsubsection occt_inspector_3_2_3 3D View preferences.
-View preferences store the current view orientation.
-
-@subsection occt_inspector_3_3 Preferences context menu
-
-@figure{preferences.png,"Plugin preferences",360}
-
-Context menu contains:
-| Element | Functionality |
-| :----- | :----- |
-| Tree Level Line,<br> PropertyPanel,<br> Dump, <br> View| Names of dock widgets in the active plugin. If the button is checked, dock widget is visible. |
-| Store Preferences | Creates ".tinspector.xml" preferences file with the current settings for each plugin.<br> This file is created in TEMP/TMP directory (by default) or in a user-defined directory. |
-| Remove Preferences | Removes preferences file. After the Inspector is restarted, default values will be applied. |
+| 3D view | V3d viewer with mouse events processing |
+| Context | choice of another context that should be used in the plugin. <br> It is possible to use the next contexts:<br> Own - context of this view, <br> External - context come in parameters which intializes plugin, <br> None - do not perform visualization at all |
+| Multi/Single | Buttons defined what to do with the previous displayed objects: <br> Multi displays new presentations in additional to already displayed, <br> Single removes all previuos displayed presentations |
+| Clean | Removes all displayed presentations |
+| Fit All,<br> Fit Area,<br> Zoom,<br> Pan,<br> Rotation | Scene manipulation actions |
+| Display Mode | Sets *AIS_Shading* or *AIS_WireFrame* display mode for all presentations |


-The following controls have store/restore preferences:
-| Element | Preferences |
-| :----- | :----- |
-| Geometry| Inspector window size and position. <br>State of dockable widgets : visibility, position, size.|
-| @ref occt_inspector_3_1_1 "Tree View preferences"| Columns visible in the tree view and their width. |
-| @ref occt_inspector_3_2_3 "3D View preferences"| 3D view camera direction. |
+@section occt_inspector_6 TInspectorEXE sample

-@section occt_inspector_4 Getting Started
+Inspector functionality can be tried using this sample.

-@subsection occt_inspector_4_1 TInspectorEXE sample
+Use *inspector.bat* script file placed in binary directory of OCCT to launch it.

-This sample allows trying Inspector functionality.
-
-Use *inspector.bat* script file placed in a binary directory of OCCT to launch it.
-
-This script accepts the names of plugin's DLL that should be loaded. By default it loads all plugins described above.
+This script accepts the names of plugin's DLL that should be loaded. By default it loads all described above plugins.


-@figure{TStandaloneEXE.png, "TStandaloneEXE",360}
+@figure{TStandaloneEXE.png, "TStandaloneEXE"}

-Click on the Open button shows the dialog to select a file.
-@figure{TStandaloneEXE_open.png, "",360}
+Click on the Open button shows the dialog to select a file. The user is able to select one of the sample files or load own one.
+@figure{TStandaloneEXE_open.png, ""}

-Depending on the active plugin, it is possible to select the following files in the dialog:<br>
- DFBRowser: OCAF document or STEP files;
- VInspector: BREP files;
- ShapeView: BREP files.
+Depending on the active plugin, the following files should be selected in the dialog:
+OCAF document or STEP files for DFBRowser and BREP files for VInspector and ShapeView plugins.

-Click the file name in the proposed directory and enter it manually or using **Browse** button.
+It is possible to click the file name in the proposed directory, enter it manually or using Browser button.
+The last Loading icon becomes enabled if file name is correct.

-By default, TInspectorEXE opens the following files for plugins:
+
+By default TInspectorEXE opens the next files for plugins:
 | Plugin DLL library name | Files |
 | :----- | :----- |
 | TKDFBrowser | step/screw.step |
 | TKVInspector | occ/hammer.brep |
 | TKShapeView | occ/face1.brep, <br> occ/face2.brep |

-These files are found relatively to *CSF_OCCTDataPath*.
+These files are found relatively *CSF_OCCTDataPath*.

-@subsubsection occt_inspector_4_1_1 TInspectorEXE preferences
-The application stores recently loaded files. On the application start, the last file is activated.
-**Open file** dialog contains recently loaded files.
-Selection of a new file updates the container of recently loaded files and rewrites preferences.

-Source code of *TIspectorEXE* is a good sample for @ref occt_inspector_4_3 "using the Inspector in a custom application".
+Source code of TIspectorEXE is a good sample for @ref occt_inspector_8 "Using Inspector in a custom application".

-@subsection occt_inspector_4_2 How to launch the Inspector in DRAW Test Harness

-*TKToolsDraw* plugin provides DRAW commands for Qt tools. Use *INSPECTOR* parameter of @ref occt_draw_1_3_3 "pload" 
-command to download the commands of this library. It contains *tinspector* command to start Inspector under DRAW.
+@section occt_inspector_7 Launch in DRAW Test Harness
+
+TKToolsDraw plugin is created to provide DRAW commands for Qt tools. Use INSPECTOR parameter of @ref occt_draw_1_3_3 "pload" 
+command to download commands of this library. It contains tinspector command to start Inspector under DRAW.
 See more detailed description of the @ref occt_draw_13_1 "tinspector" command.

 The simple code to start Inspector with all plugins loaded:
@@ -484,31 +435,26 @@ pload INSPECTOR
 tinspector
 ~~~~~

-@figure{drawexe_tinspector.png,"tinspector",360}
+@figure{drawexe_tinspector.png,"tinspector"}

-This command does the following:
- all available Plugins are presented in the Inspector. These are @ref occt_inspector_2_2 "DFBrowser", @ref occt_inspector_2_3 "VInspector" and  @ref occt_inspector_2_4 "ShapeView";
- DFBrowser is the active plugin;
- OCAF tree is empty.
+Result of this command is the next:
+- all available Plugins are presented in the Inspector. These are @ref occt_inspector_2_2 "DFBrowser", @ref occt_inspector_2_3 "VInspector" and  @ref occt_inspector_2_4 "ShapeView".
+- DFBrowser is an active plugin
+- tree of OCAF is empty.

-After this, we should create objects in DRAW and update *tinspector*.
-The examples of using Inspector in DRAW can be found in OCCT source directory /tests/tools.
+After, we should create objects in DRAW and update tinspector.

-@subsection occt_inspector_4_3 How to use the Inspector in a custom application
+@section occt_inspector_8 Using in a custom application

-The example of using the Inspector in a custom application is presented in OCCT qt sample - <b>FuncDemo</b>.
-For building qt samples, switch on *BUILD_SAMPLES_QT* variable in @ref build_cmake_conf "Configuration process".
-
-In general, the following steps should be taken:
-* Set dependencies to OCCT and Qt in the application (Header and Link);
-* Create an instance of *TInspector_Communicator*;
-* Register the plugins of interest in the communicator by DLL library name;
-* Initialize the communicator with objects that will be investigated;
-* Set visible true for the communicator.
+To use Inspector in an application, the next steps should be done:
+* Set dependencies to OCCT and Qt in application (Header and Link)
+* Create an instance of TInspector_Communicator.
+* Register plugins of interest in the communicator by DLL library name
+* Initialize communicator with objects that will be investigated
+* Set visible true for commumicator


-
-Here is an example of C++ implementation:
+C++ code is similar:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}

 #include <inspector/TInspector_Communicator.hxx>
@@ -533,56 +479,100 @@ void CreateInspector()
  }
  MyTCommunicator->SetVisible (true);
 }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Give one the following objects for a plugin using a container of parameters:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 | Plugin | to be initialized by |
 | :----- | :----- |
-| *TKDFBrowser* | *TDocStd_Application* |
-| *TKVInspector* | *AIS_InteractiveContext* |
-| *TKShapeView* | *TopoDS_TShape* |
+| TKDFBrowser | TDocStd_Application |
+| TKVInspector | AIS_InteractiveContext |
+| TKShapeView | TopoDS_TShape |


-@section occt_inspector_5 Build procedure

-
-@subsection occt_inspector_5_1 Building with CMake within OCCT
+@section occt_inspector_4 Build procedure

 By default the Inspector compilation is off.
-To compile it, set the *BUILD_Inspector* flag to "ON". See @ref build_cmake_conf "Configuration process".
+To compile it, set the <b>BUILD_Inspector</b> flag to "ON". See @ref build_cmake_conf "Configuration process".

-When this option is switched ON, MS Visual Studio project has an additional tree of folders:
+When this option is switched On, MS Visual Studio project has an additional tree of folders:

-@figure{VStudio_projects.png,"Inspector packages in MS Visual Studio",160}
+@figure{VStudio_projects.png,"Inspector packages in MS Visual Studio"}


-@section occt_inspector_6 Sources and packaging
+@section occt_inspector_5 Sources and packaging

 OCCT sources are extended by the /tools directory.

-Distribution of plugin packages :
-| Source packages | Plugin |
+Distribution of packages participated in plugins:
+| Sources packages| Plugin |
 | :----- | :----- |
-| *DFBrowser*, <br> *DFBrowserPane*, <br> *DFBrowserPaneXDE*, <br> *TKDFBrowser* | DFBrowser |
-| *VInspector*, <br> *TKVInspector*  | VInspector |
-| *ShapeView*, <br> *TKShapeView* | ShapeView |
+| DFBrowser, <br> DFBrowserPane, <br> DFBrowserPaneXDE, <br> TKDFBrowser | DFBrowser |
+| VInspector, <br> TKVInspector  | VInspector |
+| ShapeView, <br> TKShapeView | ShapeView |

 Other packages:
-| Source packages| Used in |
+| Sources packages| Used in |
 | :----- | :----- |
-| *TInspectorAPI*, <br> *TKInspectorAPI* | Interface for connection to plugin. |
-| *TreeModel*, <br> *TKTreeView* | Items-oriented model to simplify work with GUI tree control. |
-| *View*, <br> *TKView* | 3D View component. |
-| *TInspector*, <br> *TKTInspector*  | Inspector window, where plugins are placed. |
-| *ToolsDraw*, <br> *TKToolsDraw* | Plugin for DRAW to start Inspector. |
+| TInspectorAPI, <br> TKInspectorAPI | Iterface for connection to plugin. |
+| TreeModel, <br> TKTreeView | Items-oriented model to simplify work with GUI tree control. |
+| View, <br> TKView | 3D View component |
+| TInspector, <br> TKTInspector  | Inspector window where plugins are placed |
+| ToolsDraw, <br> TKToolsDraw | Plugin for DRAW to start Inspector |


-In MSVC studio, a separate folder contains Inspector projects.
+In MSVC studio the separate folder contains Inspector projects.

-@section occt_inspector_7 Glossary
-* **Component** -- a part of OCCT , e.g. OCAF, VISUALIZATION, MODELING and others. 
-* **Plugin** -- a library that is loaded in some executable/library. Here, the plugins are:
+@section occt_inspector_9 Glossary
+* **Component** -- OCCT part, e.g. OCAF, VISUALIZATION, MODELING and others. 
+* **Plugin** -- library that is loaded in some executable/library. Here, the plugins are:
  * DFBrowser,
  * ShapeView,
  * VInspector.
+
+@subsection occt_attribute_simple_types TDF_Attribute Simple types
+Types where the content is a single value
+
+| Type | Kind of value |
+| :----- | :----- |
+| TDataStd_AsciiString | TDataStd_AsciiString |
+| TDataStd_Comment | TCollection_ExtendedString |
+| TDataStd_Integer | Standard_Integer |
+| TDataStd_Name | TCollection_ExtendedString |
+| TDataStd_Real | Standard_Real |
+| TDF_Reference | TDF_Label |
+| TDF_TagSource | Standard_Integer |
+
+
+@subsection occt_attribute_list_types TDF_Attribute List types
+
+| Type | Kind of value (container of) |
+| :----- | :----- |
+| TDataStd_BooleanList | Standard_Boolean |
+| TDataStd_ExtStringList | TCollection_ExtendedString |
+| TDataStd_IntegerList | Standard_Integer |
+| TDataStd_RealList | Standard_Real |
+| TDataStd_ReferenceList | TDF_Label |
+
+@subsection occt_attribute_array_types TDF_Attribute Array types
+
+| Type | Kind of value (container of) |
+| :----- | :----- |
+| TDataStd_BooleanArray | Standard_Boolean |
+| TDataStd_ByteArray | Standard_Byte |
+| TDataStd_ExtStringArray | TCollection_ExtendedString |
+| TDataStd_IntegerArray | Standard_Integer |
+| TDataStd_RealArray | Standard_Real |
+| TDataStd_ReferenceArray | TDF_Label |
+
+@subsection occt_attribute_xde_tree_node_id XDE tree node ID description
+| GUID | Text |
+| :----- | :----- |
+| XCAFDoc::ShapeRefGUID() | Shape Instance Link |
+| XCAFDoc::ColorRefGUID (XCAFDoc_ColorGen) | Generic Color Link |
+| XCAFDoc::ColorRefGUID (XCAFDoc_ColorSurf) | Surface Color Link |
+| XCAFDoc::ColorRefGUID (XCAFDoc_ColorCurv) | Curve Color Link |
+| XCAFDoc::DimTolRefGUID() | DGT Link |
+| XCAFDoc::DatumRefGUID() | Datum Link |
+| XCAFDoc::MaterialRefGUID() | Material Link |
+
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im001.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im001.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im002.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im002.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im003.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im003.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im004.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im004.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im005.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im005.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im006.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im006.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im007.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im007.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im008.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im008.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im009.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im009.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im010.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im010.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im011.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im011.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im012.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im012.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im013.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im013.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im014.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im014.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im015.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im015.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im016.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im016.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im017.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im017.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im018.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im018.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im019.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im019.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im020.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im020.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im021.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im021.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im022.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im022.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im023.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im023.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im024.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im024.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im025.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im025.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im026.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im026.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im027.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im027.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im028.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im028.png
--- a/dox/user_guides/modeling_algos/images/modeling_algos_rf_im029.png
+++ b/dox/user_guides/modeling_algos/images/modeling_algos_rf_im029.png
--- a/dox/user_guides/modeling_algos/modeling_algos.md
+++ b/dox/user_guides/modeling_algos/modeling_algos.md
@@ -1283,118 +1283,15 @@ Standard_DomainError::Raise
 TopoDS_Edge E = ME; 
 ~~~~~

-
-@subsection occt_modalg_hist History support
-
-All topological API algorithms support the history of shape modifications (or just History) for their arguments.
-Generally, the history is available for the following types of sub-shapes of input shapes:
-* Vertex;
-* Edge;
-* Face.
-
-Some algorithms also support the history for Solids.
-
-The history information consists of the following information:
-* Information about Deleted shapes;
-* Information about Modified shapes;
-* Information about Generated shapes.
-
-The History is filled basing on the result of the operation. History cannot return any shapes not contained in the result.
-If the result of the operation is an empty shape, all input shapes will be considered as Deleted and none will have Modified and Generated shapes.
-
-The history information can be accessed by the API methods:
-* *Standard_Boolean IsDeleted(const TopoDS_Shape& theS)* - to check if the shape has been Deleted during the operation;
-* *const TopTools_ListOfShape& Modified(const TopoDS_Shape& theS)* - to get the shapes Modified from the given shape;
-* *const TopTools_ListOfShape& Generated(const TopoDS_Shape& theS)* - to get the shapes Generated from the given shape.
-
-@subsubsection occt_modalg_hist_del Deleted shapes
-
-The shape is considered as Deleted during the operation if all of the following conditions are met:
-* The shape is a part of the argument shapes of the operation;
-* The result shape does not contain the shape itself;
-* The result shape does not contain any of the splits of the shape.
-
-For example, in the CUT operation between two intersecting solids all vertices/edges/faces located completely inside the Tool solid will be Deleted during the operation.
-
-@subsubsection occt_modalg_hist_mod Modified shapes
-
-The shape is considered as Modified during the operation if the result shape contains the splits of the shape, not the shape itself. The shape can be modified only into the shapes with the same dimension.
-The splits of the shape contained in the result shape are Modified from the shape.
-The Modified shapes are created from the sub-shapes of the input shapes and, generally, repeat their geometry.
-
-The list of Modified elements will contain only those contributing to the result of the operation. If the list is empty, the shape has not been modified and it is necessary to check if it has been Deleted.
-
-For example, after translation of the shape in any direction all its sub-shapes will be modified into their translated copies.
-
-@subsubsection occt_modalg_hist_gen Generated shapes
-
-The shapes contained in the result shape are considered as Generated from the input shape if they were produced during the operation and have a different dimension from the shapes from which they were created.
-
-The list of Generated elements will contain only those included in the result of the operation. If the list is empty, no new shapes have been Generated from the shape.
-
-For example, extrusion of the edge in some direction will create a face. This face will be generated from the edge.
-
-@subsubsection occt_modalg_hist_tool BRepTools_History
-
-*BRepTools_History* is the general History tool intended for unification of the histories of different algorithms.
-
-*BRepTools_History* can be created from any algorithm supporting the standard history methods *(IsDeleted(), Modified()* and *Generated())*:
-~~~~
-// The arguments of the operation
-TopoDS_Shape aS = ...;
-
-// Perform transformation on the shape
-gp_Trsf aTrsf;
-aTrsf.SetTranslationPart(gp_Vec(0, 0, 1));
-BRepBuilderAPI_Transform aTransformer(aS, aTrsf); // Transformation API algorithm
-const TopoDS_Shape& aRes = aTransformer.Shape();
-
-// Create the translation history object
-TopTools_ListOfShape anArguments;
-anArguments.Append(aS);
-BRepTools_History aHistory(anArguments, aTransformer);
-~~~~
-
-*BRepTools_History* also allows merging histories. Thus, if you have two or more subsequent operations you can get one final history combined from histories of these operations:
-
-~~~~
-Handle(BRepTools_History) aHist1 = ...; // History of first operation
-Handle(BRepTools_History) aHist2 = ...; // History of second operation
-~~~~
-
-It is possible to merge the second history into the first one:
-~~~~
-aHist1->Merge(aHist2);
-~~~~
-
-Or create the new history keeping the two histories unmodified:
-~~~~
-Handle(BRepTools_History) aResHistory = new BRepTools_History;
-aResHistory->Merge(aHist1);
-aResHistory->Merge(aHist2);
-~~~~
-
-The possibilities of Merging histories and history creation from the API algorithms allow providing easy History support for the new algorithms.
-
-@subsubsection occt_modalg_hist_draw DRAW history support
-
-DRAW History support for the algorithms is provided by three basic commands:
-* *isdeleted*; 
-* *modified*;
-* *generated*.
-
-For more information on the Draw History mechanism please refer to the corresponding chapter in the Draw users guide - @ref occt_draw_hist "History commands".
-
-
@section occt_modalg_3 Standard  Topological Objects

 The following  standard topological objects can be created:
-  * Vertices;
-  * Edges;
-  * Faces;
-  * Wires;
-  * Polygonal wires;
-  * Shells;
+  * Vertices
+  * Edges
+  * Faces
+  * Wires
+  * Polygonal wires
+  * Shells
  * Solids.

 There are two root classes for their construction and modification: 
@@ -3138,180 +3035,3 @@ Meshing covers a shape with a triangular mesh. Other than hidden line removal, y

 You can obtain information on the shape by first exploring it. To access triangulation of a face in the shape later, use *BRepTool::Triangulation*. To access a polygon, which is the approximation of an edge of the face, use *BRepTool::PolygonOnTriangulation*.

-
-@section occt_modalg_defeaturing 3D Model Defeaturing
-
-The Open CASCADE Technology Defeaturing algorithm is intended for removal of the unwanted parts or features from the model. These parts can be holes, protrusions, gaps, chamfers, fillets, etc.
-
-Feature detection is not performed, and all features to be removed should be defined by the user. The input shape is not modified during Defeaturing, the new shape is built in the result.
-
-On the API level the Defeaturing algorithm is implemented in the *BRepAlgoAPI_Defeaturing* class. At input the algorithm accepts the shape to remove the features from and the features (one or many) to be removed from the shape.
-Currently, the input shape should be either SOLID, or COMPSOLID, or COMPOUND of SOLIDs.
-The features to be removed are defined by the sets of faces forming them. It does not matter how the feature faces are given: as separate faces or their collections. The faces should belong to the initial shape, else they are ignored.
-
-The actual features removal is performed by the low-level *BOPAlgo_RemoveFeatures* algorithm. On the API level, all inputs are passed into the tool and the method *BOPAlgo_RemoveFeatures::Perform()* is called.
-
-Before removing features, all faces to be removed from the shape are sorted into connected blocks - each block represents a single feature to be removed.
-The features are removed from the shape one by one, which allows removing all possible features even if there are some problems with their removal (e.g. due to incorrect input data).
-
-The removed feature is filled by the extension of the faces adjacent to it. In general, the algorithm removing a single feature from the shape goes as follows:
-* Find the faces adjacent to the feature;
-* Extend the adjacent faces to cover the feature;
-* Trim the extended faces by the bounds of the original face (except for the bounds common with the feature), so that they cover the feature only;
-* Rebuild the solids with reconstructed adjacent faces avoiding the feature faces.
-
-If the single feature removal was successful, the result shape is overwritten with the new shape, otherwise the results are not kept, and the warning is given.
-Either way the process continues with the next feature.
-
-The Defeaturing algorithm has the following options:
-* History support;
-
-and the options available from base class (*BOPAlgo_Options*):
-* Error/Warning reporting system;
-* Parallel processing mode.
-
-Note that the other options of the base class are not supported here and will have no effect.
-
-<b>History support</b> allows tracking modification of the input shape in terms of Modified, IsDeleted and Generated. By default, the history is collected, but it is possible to disable it using the method *TrackHistory(false)*.
-On the low-level the history information is collected by the history tool *BRepTools_History*, which can be accessed through the method *BOPAlgo_RemoveFeatures::History()*. 
-
-<b>Error/Warning reporting system</b> allows obtaining the extended overview of the Errors/Warnings occurred during the operation. As soon as any error appears, the algorithm stops working. The warnings allow continuing the job and informing the user that something went wrong. The algorithm returns the following errors/warnings:
-* *BOPAlgo_AlertUnsupportedType* - the alert will be given as an error if the input shape does not contain any solids, and as a warning if the input shape contains not only solids, but also other shapes;
-* *BOPAlgo_AlertNoFacesToRemove* - the error alert is given in case there are no faces to remove from the shape (nothing to do);
-* *BOPAlgo_AlertUnableToRemoveTheFeature* - the warning alert is given to inform the user the removal of the feature is not possible. The algorithm will still try to remove the other features;
-* *BOPAlgo_AlertRemoveFeaturesFailed* - the error alert is given in case if the operation was aborted by the unknown reason.
-
-For more information on the error/warning reporting system please see the chapter @ref occt_algorithms_ers "Errors and warnings reporting system" of Boolean operations user guide.
-
-<b>Parallel processing mode</b> - allows running the algorithm in parallel mode obtaining the result faster.
-
-The algorithm has certain limitations:
-* Intersection of the surfaces of the connected faces adjacent to the feature should not be empty. It means, that such faces should not be tangent to each other. 
-If the intersection of the adjacent faces will be empty, the algorithm will be unable to trim the faces correctly and, most likely, the feature will not be removed.
-* The algorithm does not process the INTERNAL parts of the solids, they are simply removed during reconstruction.
-
-Note, that for successful removal of the feature, the extended faces adjacent to the feature should cover the feature completely, otherwise the solids will not be rebuild. 
-Take a look at the simple shape on the image below:
-@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im001.png,"",220}
-
-Removal of all three faces of the gap is not going to work, because there will be no face to fill the transverse part of the step.
-Although, removal of only two faces, keeping one of the transverse faces, will fill the gap with the kept face:
-<table align="center">
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im002.png,"Keeping the right transverse face",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im003.png,"Keeping the left transverse face",220}</td>
-</tr>
-</table>
-
-@subsection occt_modalg_defeaturing_usage Usage
-
-Here is the example of usage of the *BRepAlgoAPI_Defeaturing* algorithm on the C++ level:
-~~~~
-TopoDS_Shape aSolid = ...;               // Input shape to remove the features from
-TopTools_ListOfShape aFeatures = ...;    // Features to remove from the shape
-Standard_Boolean bRunParallel = ...;     // Parallel processing mode
-Standard_Boolean isHistoryNeeded = ...;  // History support
-
-BRepAlgoAPI_Defeaturing aDF;             // Defeaturing algorithm
-aDF.SetShape(aSolid);                    // Set the shape
-aDF.AddFacesToRemove(aFaces);            // Add faces to remove
-aDF.SetRunParallel(bRunParallel);        // Define the processing mode (parallel or single)
-aDF.TrackHistory(isHistoryNeeded);       // Define whether to track the shapes modifications
-aDF.Build();                             // Perform the operation
-if (!aDF.IsDone())                       // Check for the errors
-{
-  // error treatment
-  Standard_SStream aSStream;
-  aDF.DumpErrors(aSStream);
-  return;
-}
-if (aDF.HasWarnings())                   // Check for the warnings
-{
-  // warnings treatment
-  Standard_SStream aSStream;
-  aDF.DumpWarnings(aSStream);
-}
-const TopoDS_Shape& aResult = aDF.Shape(); // Result shape
-~~~~
-
-Use the API history methods to track the history of a shape:
-~~~~
-// Obtain modification of the shape
-const TopTools_ListOfShape& BRepAlgoAPI_Defeaturing::Modified(const TopoDS_Shape& theS);
-
-// Obtain shapes generated from the shape
-const TopTools_ListOfShape& BRepAlgoAPI_Defeaturing::Generated(const TopoDS_Shape& theS);
-
-// Check if the shape is removed or not
-Standard_Boolean BRepAlgoAPI_Defeaturing::IsDeleted(const TopoDS_Shape& theS);
-~~~~
-
-The command <b>removefeatures</b> allows using the Defeaturing algorithm on the Draw level.
-
-The @ref occt_draw_hist "standard history commands" can be used to track the history of shape modification during Defeaturing. 
-
-For more details on commands above, refer to the @ref occt_draw_defeaturing "Defeaturing commands" of the Draw test harness user guide.
-
-@subsection occt_modalg_defeaturing_examples Examples
-
-Here are the examples of defeaturing of the ANC101 model:
-
-@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im004.png,"ANC101 model",220}</td>
-
-<table align="center">
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im005.png,"Removing the cylindrical protrusion",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im006.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im007.png,"Removing the cylindrical holes",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im008.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im009.png,"Removing the cylindrical holes",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im010.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im011.png,"Removing the small gaps in the front",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im012.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im013.png,"Removing the gaps in the front completely",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im014.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im015.png,"Removing the cylindrical protrusion",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im016.png,"Result",220}</td></td>
-</tr>
-</table>
-
-Here are the few examples of defeaturing of the model containing boxes with blends:
-
-@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im017.png,"Box blend model",220}</td>
-
-<table align="center">
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im018.png,"Removing the blend",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im019.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im020.png,"Removing the blend",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im021.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im022.png,"Removing the blend",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im023.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im024.png,"Removing the blend",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im025.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im026.png,"Removing the blend",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im027.png,"Result",220}</td></td>
-</tr>
-<tr>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im028.png,"Removing the blend",220}</td>
-  <td>@figure{/user_guides/modeling_algos/images/modeling_algos_rf_im029.png,"Result",220}</td></td>
-</tr>
-</table>
--- a/dox/user_guides/modeling_data/images/modeling_data_image015.png
+++ b/dox/user_guides/modeling_data/images/modeling_data_image015.png
--- a/dox/user_guides/modeling_data/modeling_data.md
+++ b/dox/user_guides/modeling_data/modeling_data.md
@@ -1294,100 +1294,3 @@ The following sample code reads a shape from ASCII file and writes it to a binar
  }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-@section occt_modat_6 Bounding boxes
-
-Bounding boxes are used in many OCCT algorithms. The most common use is as a filter avoiding check of excess interferences between pairs of shapes (check of interferences between bounding boxes is much simpler then between shapes and if they do not interfere then there is no point in searching interferences between the corresponding shapes).
-Generally, bounding boxes can be divided into two main types: 
-  - axis-aligned bounding box (AABB) is the box whose edges are parallel to the axes of the World Coordinate System (WCS);
-  - oriented BndBox (OBB) is defined in its own coordinate system that can be rotated with respect to the WCS.
-Indeed, an AABB is a specific case of OBB.<br>
-
-The image below illustrates the example, when using OBB is better than AABB. 
-
-@figure{/user_guides/modeling_data/images/modeling_data_image015.png,"Illustrating the problem with AABB.",320}
-
-AABBs in this picture are interfered. Therefore, many OCCT algorithms will spend much time to interfere the shapes. However, if we check OBBs, which are not interfered, then searching of interferences between the shapes will not be necessary. At that, creation and analysis of OBBs takes significantly more time than the analogical operations with AABB.
-
-Later in this section, the bounding boxes having the smallest surface area will be called *optimal*.
-
-In OCCT, bounding boxes are defined in *Bnd* package. *Bnd_Box* class defines AABB, *Bnd_OBB* class defines OBB. These classes contain the following common methods (this list is not complete; see the documentation about the corresponding class for detailed information):
-
-  - *IsVoid* method indicates whether the bounding box is empty (uninitialized).
-  - *SetVoid* method clears the existing bounding box.
-  - *Enlarge(...)* extends the current bounding box.
-  - *Add(...)* extends the bounding box as necessary to include the object (a point, a shape, etc.) passed as the argument.
-  - *IsOut(...)* checks whether the argument is inside/outside of the current BndBox.
-  
-BRepBndLib class contains methods for creation of bounding boxes (both AABB and OBB) from the shapes.
-
-@subsection occt_modat_6_1 Brief description of some algorithms working with OBB
-
-@subsubsection occt_modat_6_1_1 Creation of OBB from set of points
-
-The algorithm is described in <a href="http://www.idt.mdh.se/~tla/publ/FastOBBs.pdf">"Fast Computation of Tight Fitting Oriented Bounding Boxes" by Thomas Larsson and Linus Källberg</a>. It includes the following steps:
-
-<span>1.</span> Choose \f$ N_{a} (N_{a} \geq 3) \f$ initial axes.<br>
-<span>2.</span> Project every given point to the every chosen (in item 1) axis. At that, "minimal" and "maximal" points of every axis (i.e. point having minimal and maximal parameter (correspondingly) of the projection to this axis) are chosen. I.e. \f$ 2*N_{a} \f$ points will be held and this set can contain equal points. Later (unless otherwise specified) in this algorithm we will work with these \f$ 2*N_{a} \f$ points only.<br>
-<span>3.</span> Choose one pair of points among all pairs of "minimal" and "maximal" points of every axis (from item 1), with two furthest points. Let \f$ p_{0} \f$  and \f$ p_{1} \f$  be the "minimal" and "maximal" point of this pair.<br>
-<span>4.</span> Create an axis \f$ \mathbf{e_{0}}\left \{ \overrightarrow{p_{0}p_{1}} \right \} \f$ (i.e. having direction \f$ \overrightarrow{p_{0}p_{1}} \f$ ).<br>
-<span>5.</span> Choose the point \f$ p_{2} \f$ (from the set defined in item 2) which is in the maximal distance from the infinite line directed along \f$ \mathbf{e_{0}} \f$ axis.<br>
-
-Further, let us consider the triangle \f$ T_{0}\left \langle p_{0}, p_{1}, p_{2} \right \rangle \f$ (i.e. having vertices \f$ p_{0}, p_{1} \f$ and \f$ p_{2} \f$). Namely:
-
-<span>6.</span> Create new axes: \f$ \mathbf{e_{1}}\left \{ \overrightarrow{p_{1}p_{2}} \right \} \f$, \f$ \mathbf{e_{2}}\left \{ \overrightarrow{p_{2}p_{0}} \right \} \f$, \f$ \mathbf{n}\left \{ \overrightarrow{\mathbf{e_{0}}} \times \overrightarrow{\mathbf{e_{1}}}  \right \} \f$, \f$ \mathbf{m_{0}}\left \{ \overrightarrow{\mathbf{e_{0}}} \times \overrightarrow{\mathbf{n}}  \right \} \f$, \f$ \mathbf{m_{1}}\left \{ \overrightarrow{\mathbf{e_{1}}} \times \overrightarrow{\mathbf{n}}  \right \} \f$, \f$ \mathbf{m_{2}}\left \{ \overrightarrow{\mathbf{e_{2}}} \times \overrightarrow{\mathbf{n}}  \right \} \f$.<br>
-<span>7.</span> Create OBBs based on the following axis: \f$ \left \{ \mathbf{e_{0}} \vdots \mathbf{m_{0}} \vdots \mathbf{n} \right \} \f$, \f$ \left \{ \mathbf{e_{1}} \vdots \mathbf{m_{1}} \vdots \mathbf{n} \right \} \f$ and \f$ \left \{ \mathbf{e_{2}} \vdots \mathbf{m_{2}} \vdots \mathbf{n} \right \} \f$ . Choose optimal OBB.<br>
-<span>8.</span> Choose the points \f$ q_{0} \f$ and \f$ q_{1} \f$ (from the set defined in item 2), which are in maximal distance from the plane of the triangle \f$ T_{0} \f$ (from both sides of this plane). At that, \f$ q_{0} \f$ has minimal coordinate along the axis \f$ \mathbf{n} \f$, \f$ q_{1} \f$ has a maximal coordinate.<br>
-<span>9.</span> Repeat the step 6...7 for the triangles \f$ T_{1}\left \langle p_{0}, p_{1}, q_{0} \right \rangle \f$, \f$ T_{2}\left \langle p_{1}, p_{2}, q_{0} \right \rangle \f$, \f$ T_{3}\left \langle p_{0}, p_{2}, q_{0} \right \rangle \f$, \f$ T_{4}\left \langle p_{0}, p_{1}, q_{1} \right \rangle \f$, \f$ T_{5}\left \langle p_{1}, p_{2}, q_{1} \right \rangle \f$, \f$ T_{6}\left \langle p_{0}, p_{2}, q_{1} \right \rangle \f$.<br>
-<span>10.</span> Compute the center of OBB and its half dimensions.<br>
-<span>11.</span> Create OBB using the center, axes and half dimensions.<br>
-
-This algorithm is implemented in the *Bnd_OBB::ReBuild(...)* method.
-
-@subsubsection occt_modat_6_1_2 Creation of OBB based on Axes of inertia
-
-The algorithm contains the following steps:
-1. Calculate three inertia axes, which will be the axes of the OBB.
-2. Transform the source object *(TopoDS_Shape)* into the local coordinate system based on the axes from item 1.
-3. Create an AABB for the shape obtained in the item 2.
-4. Compute the center of AABB and its half dimensions.
-5. Transform the center into the WCS.
-6. Create OBB using the center, axes and half dimensions.
-
-@subsubsection occt_modat_6_1_3 Method IsOut for a point
-
-1. Project the point to each axis.
-2. Check, whether the absolute value of the projection parameter greater than the correspond half-dimension. In this case, *IsOut* method will return TRUE.
-
-@subsubsection occt_modat_6_1_4 Method IsOut for another OBB
-
-According to the <a href="http://www.jkh.me/files/tutorials/Separating%20Axis%20Theorem%20for%20Oriented%20Bounding%20Boxes.pdf">"Separating Axis Theorem for Oriented Bounding Boxes"</a>, it is necessary to check the 15 separating axes: 6 axes of the boxes and 9 are their cross products.<br>
-The algorithm of analyzing axis \f$ \mathbf{l} \f$ is following:
-1. Compute the "length" according to the formula: \f$ L_{j}=\sum_{i=0}^{2}{H_{i}\cdot \left | \overrightarrow{\mathbf{a_{i}}} \cdot \overrightarrow{\mathbf{l}} \right |} \f$. Here, \f$ \mathbf{a_{i}} \f$ is an i-th axis (X-axis, Y-axis, Z-axis) of j-th BndBox (j=1...2). \f$ H_{i} \f$ is a half-dimension along i-th axis.
-2. If \f$ \left |\overrightarrow{C_{1}C_{2}} \cdot \overrightarrow{\mathbf{l}}  \right | > L_{1}+L_{2} \f$ (where \f$ C_{j} \f$ is the center of j-th OBB) then the considered OBBs are not interfered in terms of the axis \f$ \mathbf{l} \f$.
-
-If OBBs are not interfered in terms of at least one axis (of 15) then they are not interfered at all.
-
-@subsubsection occt_modat_6_1_5 Method Add for point or another bounding box
-
-Create a new OBB (see the section @ref occt_modat_6_1_1) based on the source point and all vertices of the given bounding boxes.
-
-@subsection occt_modat_6_2 Add a shape
-
-Method *BRepBndLib::AddOBB(...)* allows creating the bounding box from a complex object *(TopoDS_Shape)*. This method uses both algorithms described in the sections @ref occt_modat_6_1_1 and sections @ref occt_modat_6_1_2.
-
-The first algorithm is used if the outer shell of the shape can be represented by a set of points contained in it. Namely, only the following elements are the source of set of points:
-
-  - Nodes of triangulation;
-  - Nodes of *Poly_Polygon3D*;
-  - Vertices of edges with a linear 3D-curve lying in the planar face;
-  - Vertices of edges with a linear 3D-curve if the source shape does not contain a more complex topological structure (e.g. the source shape is a compound of edges);
-  - Vertices if the source shape does not contain a more complex topological structure (e.g. the source shape is a compound of vertices).
-
-If the required set of points cannot be extracted then the algorithm from section @ref occt_modat_6_1_2 is used for OBB creation.
-
-The package *BRepBndLib* contains methods *BRepBndLib::Add(...), BRepBndLib::AddClose(...)* and *BRepBndLib::AddOptimal(...)* for creation of AABB of a shape. See the reference manual for the detailed information.
-
-@subsection occt_modat_6_3 Limitations of algorithm for OBB creation.
-
-1. The algorithm described in the section @ref occt_modat_6_1_1 works significantly better (finds resulting OBB with less surface area) and faster than the algorithm from the section @ref occt_modat_6_1_2. Nevertheless, (in general) the result returned by both algorithms is not always optimal (i.e. sometimes another OBB exists with a smaller surface area). Moreover, the first method does not allow computing OBBs of shapes with a complex geometry.
-2. Currently, the algorithm of OBB creation is implemented for objects in 3D space only.
--- a/dox/user_guides/ocaf/ocaf.md
+++ b/dox/user_guides/ocaf/ocaf.md
@@ -440,9 +440,6 @@ current.Add (INT); // INT is now attached to current
 current.Add (INT); // causes failure 
 TDF_Label attach = INT->Label(); 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Note. There is an exception from this rule for some sub-set of Standard attributes. See for details chapter 6.Standard Attributes.
-
@subsubsection occt_ocaf_3_5_4 Testing the attachment to a label

 You can test whether an attribute is attached to a label or not by using *TDF_Attribute::IsA* with the GUID of the attribute as an argument. In the example below, you test whether the current label has an integer attribute, and then, if that is so, how many attributes are attached to it. *TDataStd_Integer::GetID* provides the GUID argument needed by the method IsAttribute. 
@@ -1105,30 +1102,6 @@ Standard attributes are ready-to-use attributes, which allow creating and modify

 All attributes inherit class *TDF_Attribute*, so, each attribute has its own GUID and standard methods for attribute creation, manipulation, getting access to the data framework. 

-### Attributes supporting several attributes of the same type on the same label
-
-By default only one attribute of the same type on the same lable is supported. For example, you can set only one TDataStd_Real attribute
-on the same label.  This limitation was removed for some predefined sub-set of standard attributes by adding so called 'user defined ID' 
-feature to the attribute. 
-The listed below attributes received this new feature:
-
-  * **TDataStd_AsciiString**
-  * **TDataStd_Integer**
-  * **TDataStd_Name**
-  * **TDataStd_Real**
-  * **TDataStd_BooleanArray**
-  * **TDataStd_BooleanList**
-  * **TDataStd_ByteArray**
-  * **TDataStd_ExtStringArray**
-  * **TDataStd_ExtStringList**
-  * **TDataStd_IntegerArray**
-  * **TDataStd_IntegerList**
-  * **TDataStd_RealArray**
-  * **TDataStd_RealList**
-  * **TDataStd_ReferenceArray**
-  * **TDataStd_ReferenceList**
-
-See for details paragraph 6.4.

@subsection occt_ocaf_6_2 Services common to all attributes

@@ -1255,60 +1228,6 @@ It is possible to describe any model by means of standard OCAF attributes.
  Most of the models may be implemented using only standard OCAF attributes. 
  Some other models need special treatment and require implementation of new OCAF attributes.

-
- @subsection occt_ocaf_6_4 Standard Attributes with User Defined GUID
-
- The listed above attributes allow to set at the same Label as many attributes of the same type as you want thanks to specific user's ID.
- Let's consider it on the example of the TDataStd_Real attribute. The previous version of the attribute allowed to set the attribute using 
- static method Set in next way:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-static Handle(TDataStd_Real) Set (const TDF_Label& label, const Standard_Real value);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- This is a default form which is kept by the attribute. It uses the default GUID for the attribute identification - TDataStd_Real::GetID(). 
- In case if you want to use the new feature (user defined Real attribute), for example to define several attributes which should keep a value 
- of the same type - Standard_Real, but to be associated with different user's notions (or objects) the new static method Set should be used. 
- In our example we will define two Real attributes which presents two customer's objects - Density and Volume and will be put on the same Label.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-#define DENSITY Standard_GUID("12e9454b-6dbc-11d4-b9c8-0060b0ee2810")
-#define VOLUME  Standard_GUID("161595c0-3628-4737-915a-c160ce94c6f7")
-
-TDF_Label aLabel = ...;
-
-// Real attribute type with user defined GUID associated with user's object "Density"
-TDataStd_Real::Set(aLabel, DENSITY, 1.2);
-
-// Real attribute type with user defined GUID associated with user's object "Volume"
-TDataStd_Real::Set(aLabel, VOLUME, 185.5);
-
- To find an user defined Real attribute just use a corresponding GUID:
-Handle (TDataStd_Real) anAtt;
-aLabel.FindAttribute (DENSITY, anAtt);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  @subsection occt_ocaf_6_4_1  Creation Attributes with User Defined GUID.
-
- You can create a new instance of an attribute with user define GUID and add it to label in two ways.
- 1. Using static method Set(). For example:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    TDF_Label aLabel = ...;
-    Standard_Integer aValue = ...;
-    Standard_GUID aGuid = TDataStd_Integer::GetID();
-    TDataStd_Integer::Set(aLabel, aGuid, aValue);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- 2. Using the default constructor
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    Handle(TDataStd_Integer) anInt = new TDataStd_Integer();
-    anInt->SetID(aGuid);
-    aLabel.Add(anInt);
-    anInt->Set(aValue);
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
    
@section occt_ocaf_7 Visualization Attributes

--- a/dox/user_guides/visualization/visualization.md
+++ b/dox/user_guides/visualization/visualization.md
@@ -138,7 +138,7 @@ Selectable object stores information about all created selection modes and sensi
 All successors of a selectable object must implement the method that splits its presentation into sensitive entities according to the given mode. The computed entities are arranged in one selection and added to the list of all selections of this object. No selection will be removed from the list until the object is deleted permanently.

 For all standard OCCT shapes, zero mode is supposed to select the whole object (but it may be redefined easily in the custom object). For example, the standard OCCT selection mechanism and *AIS_Shape* determine the following modes:
-  - 0 -- selection of the entire object *(AIS_Shape)*;
+  - 0 -- selection of entire object (AIS_Shape);
  - 1 -- selection of the vertices;
  - 2 -- selection of the edges;
  - 3 -- selection of the wires;
@@ -635,7 +635,7 @@ The conception of instancing operates the object hierarchy as follows:

 Classes *AIS_ConnectedInteractive* and *AIS_MultipleConnectedInteractive* are used to implement this conception.

-*AIS_ConnectedInteractive* is an object instance, which reuses the geometry of the connected object but has its own transformation and visibility flag. This connection is propagated down to *OpenGl* level, namely to *OpenGl_Structure*. *OpenGl_Structure* can be connected only to a single other structure.
+*AIS_ConnectedInteractive* is an object instance, which reuses the geometry of the connected object but has its own transformation, material, visibility flag, etc. This connection is propagated down to *OpenGl* level, namely to *OpenGl_Structure*. *OpenGl_Structure* can be connected only to a single other structure.

 *AIS_ConnectedInteractive* can be referenced to any *AIS_InteractiveObject* in general. When it is referenced to another *AIS_ConnectedInteractive*, it just copies the reference.

@@ -765,10 +765,10 @@ theCtx->SetDisplayMode (2, true);
 The Local Selection is defined by index (Selection Mode). The Selection Modes implemented by a specific interactive object and their meaning should be checked within the documentation of this class.
 See, for example, *MeshVS_SelectionModeFlags* for *MeshVS_Mesh* object.

-*AIS_Shape* is the most used interactive object. It provides API to manage selection operations on the constituent elements of shapes (selection of vertices, edges, faces, etc.). The Selection Mode for a specific shape type (*TopAbs_ShapeEnum*) is returned by method *AIS_Shape::SelectionMode()*.
+The interactive object, which is used the most by applications, is *AIS_Shape*. Consequently, there are standard functions, which allow you to easily prepare selection operations on the constituent elements of shapes (selection of vertices, edges, faces, etc.). The Selection Mode for a specific shape type (*TopAbs_ShapeEnum*) is returned by method *AIS_Shape::SelectionMode()*.

-The method *AIS_InteractiveObject::Display()* without a Selection Mode argument activates the default Selection Mode of the object.
-The methods *AIS_InteractiveContext::Activate()* and *AIS_InteractiveContext::Deactivate()* activate and deactivate a specific Selection Mode.
+The function *AIS_InteractiveObject::Display* (without argument taking Selection Mode) activates the object's default Selection Mode.
+The functions *AIS_InteractiveContext::Activate* and *AIS_InteractiveContext::Deactivate* activate and deactivate specific Selection Mode.

 More than one Selection Mode can be activated at the same time (but default 0 mode for selecting entire object is exclusive - it cannot be combined with others).
 The list of active modes can be retrieved using function *AIS_InteractiveContext::ActivatedModes*.
@@ -843,8 +843,8 @@ After using the *Select* and *ShiftSelect* functions, you can explore the list o
  * *AIS_InteractiveContext::NextSelected* -- moves the iterator to the next position;
  * *AIS_InteractiveContext::SelectedOwner* -- returns an entity at the current iterator position.

-The owner object *SelectMgr_EntityOwner* is a key object identifying the selectable entity in the viewer (returned by methods *AIS_InteractiveContext::DetectedOwner* and *AIS_InteractiveContext::SelectedOwner*).
-The Interactive Object itself can be retrieved by method *SelectMgr_EntityOwner::Selectable*, while identifying a sub-part depends on the type of Interactive Object.
+The owner object *SelectMgr_EntityOwner* is a key object identifying selectable entitiy in the viewer (returned by methods *AIS_InteractiveContext::DetectedOwner* and *AIS_InteractiveContext::SelectedOwner*).
+The Interactive Object itself can be retrieved by method *SelectMgr_EntityOwner::Selectable*, while identifying sub-part depends on type of Interactive Object.
 In case of *AIS_Shape*, the (sub)shape is returned by method *StdSelect_BRepOwner::Shape*.

 #### Example
@@ -1121,9 +1121,9 @@ The root is the top of a structure hierarchy or structure network. The attribute
  * Have a type, a scale factor, and a color,
  * Have a size, shape, and orientation independent of transformations.
 * **Triangulation**
-  * Has at least three vertices,
-  * Has nodal normals defined for shading,
-  * Has interior attributes -- style, color, front and back material, texture and reflection ratio.
+  * Have at least three vertices,
+  * Have nodal normals defined for shading,
+  * Have interior attributes -- style, color, front and back material, texture and reflection ratio,
 * **Polylines** or **Segments**
  * Have two or more vertices,
  * Have the following attributes -- type, width scale factor, color.
@@ -1196,7 +1196,7 @@ aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());

@subsubsection occt_visu_4_2_5 Text primitive

-*TKOpenGL* toolkit renders text labels using texture fonts. *Graphic3d* text primitives have the following features:
+TKOpenGL toolkit renders text labels using texture fonts. *Graphic3d* text primitives have the following features:
  * fixed size (non-zoomable) or zoomable,
  * can be rotated to any angle in the view plane,
  * support unicode charset.
@@ -1213,16 +1213,8 @@ void Graphic3d_Group::Text (const Standard_CString theText,
                            const Graphic3d_VerticalTextAlignment theVta,
                            const Standard_Boolean theToEvalMinMax);
 ~~~~~
-
-The meaning of these parameters is as follows: 
-* *theText* - the text string,
-* *thePoint* - the three-dimensional position of the text,
-* *theHeight* - the text height,
-* *theAngle* - the text orientation (at the moment, this parameter has no effect, but you can specify the text orientation through the *Graphic3d_AspectText3d* attributes).
-* *theTp* defines the text path,
-* *theHta* - the horizontal alignment of the text,
-* *theVta* - the vertical alignment of the text.
-
+*theText* parameter is the text string, *thePoint* is the three-dimensional position of the text, *theHeight* is the text height, *theAngle* is the orientation of the text (at the moment, this parameter has no effect, but you can specify the text orientation through  the *Graphic3d_AspectText3d* attributes).
+*theTp* parameter defines the text path, *theHta* is the horizontal alignment of the text, *theVta* is the vertical alignment of the text.
 You can pass FALSE as *theToEvalMinMax* if you do not want the graphic3d structure boundaries to be affected by the text position.

 **Note** that the text orientation angle can be defined by *Graphic3d_AspectText3d* attributes.
--- a/dox/user_guides/xde/xde.md
+++ b/dox/user_guides/xde/xde.md
@@ -91,18 +91,18 @@ XDE can read and write colors and layers assigned to shapes or their subparts (d
  
 @figure{/user_guides/xde/images/xde_image006.png,"Colors and Layers",240}

-@subsection occt_xde_1_7 Geometric Dimensions & Tolerances (GD\&T)
+@subsection occt_xde_1_7 Geometric Dimensions & Tolerances (GD&T)

-GD\&T are a type of Product and Manufacturing Information (PMI) that can be either computed automatically by a CAD system,
+GD&T are a type of Product and Manufacturing Information (PMI) that can be either computed automatically by a CAD system,
 or entered manually by the user. For detailed information use <a href="https://www.cax-if.org/documents/rec_pracs_pmi_v40.pdf">CAx-IF Recommended Practices
 for the Representation and Presentation of Product Manufacturing Information (PMI) (AP242)</a>

-XDE can read and write GD\&T data of the following types:
+XDE can read and write GD&T data of the following types:
 * dimensions, such as distance, length, radius and so on;
 * geometric tolerances;
-* datums, i.e theoretically exact geometric references, such as point, line or plane, to which toleranced features are related.
+* datums, i.e a theoretically exact geometric references, such as point, line or plane, to which toleranced features are related.

-XDE supports two presentations of GD\&T data:
+XDE supports two presentations of GD&T data:
 * semantic presentation, i.e. data is stored in a machine-consumable way and includes all information required to understand the
  specification without the aid of any presentation elements;
 * tessellated presentation, i.e. data is displayed in a human-readable way.
@@ -116,7 +116,7 @@ XDE provides capabilities for adding, editing and removing clipping planes.

@subsection occt_xde_1_9 Saved views

-XDE supports reading from STEP views. Views allow saving information about camera parameters (position, direction, zoom factor, etc.)
+XDE supports reading from STEP views. Views allow to save information about camera parameters (position, direction, zoom factor, etc.)
 and visible shapes, PMIs, used clipping planes and notes. Currently, XDE supports saving of clipping planes in XBF format only.

 XDE provides the following view management capabilities:
@@ -660,42 +660,42 @@ To remove a Color and all the references to it (so that the related shapes will
 myColors->RemoveColor(ColLabel); 
 ~~~~~

-@subsection occt_xde_2_7 Geometric Dimensions & Tolerances (GD\&T)
+@subsection occt_xde_2_7 Geometric Dimensions & Tolerances (GD&T)

-XDE can read and write GD\&T assigned to shapes or their subparts (down to the level of faces and edges) to and from STEP formats. 
+XDE can read and write GD&T assigned to shapes or their subparts (down to the level of faces and edges) to and from STEP formats. 

-In an XDE document, GD\&T are managed by the class *XCAFDoc_DimTolTool*. It works basing on the same principles as ShapeTool works with Shapes. This tool can be provided on the Main Label or on any sub-label. The GD\&T entities themselves are defined as the following sub-classes of *TDF_Attribute*:
+In an XDE document, GD&T are managed by the class *XCAFDoc_DimTolTool*. It works basing on the same principles as ShapeTool works with Shapes. This tool can be provided on the Main Label or on any sub-label. The GD&T entities themselves are defined as the following sub-classes of *TDF_Attribute*:
  * *XCAFDoc_Dimension* - for dimensions;
  * *XCAFDoc_GeomTolerance* - for geometric tolerances;
  * *XCAFDoc_Datum* - for geometric tolerance Datums.
-A GD\&T type is identified by the attributes listed above, i.e. *XCAFDoc_DimTolTool* methods working with particular entity types check 
+A GD&T type is identified by the attributes listed above, i.e. *XCAFDoc_DimTolTool* methods working with particular entity types check 
 for presence of the corresponding attributes in passed labels. One can use methods of *XCAFDoc_DimTolTool* beginning with 'Is' for this purpose.
 
-GD\&T entities are stored in a child of the starting document label 0.1.4. 
-Each GD\&T entity then corresponds to the dedicated label, the property itself is one of access classes:
+GD&T entities are stored in a child of the starting document label 0.1.4. 
+Each GD&T entity then corresponds to the dedicated label, the property itself is one of access classes:
  * *XCAFDimTolObject_DimensionObject* - for dimensions;
  * *XCAFDimTolObject_GeomToleranceObject* - for geometric tolerances;
  * *XCAFDimTolObject_DatumObject* - for geometric tolerance Datums.

-GD\&Ts and Shapes are related by Graph Nodes. 
+GD&Ts and Shapes are related to by Graph Nodes. 

 These definitions are common to various exchange formats, at least for STEP. 

@subsubsection occt_xde_2_7_1 Initialization
-To query, edit, or initialize a Document to handle GD\&Ts of XCAF, use: 
+To query, edit, or initialize a Document to handle GD&Ts of XCAF, use: 
 ~~~~~
 Handle(XCAFDoc_DimTolTool) myDimTolTool = 
 XCAFDoc_DocumentTool::DimTolTool(Doc->Main()); 
 ~~~~~
-This call can be used at any time. When it is used for the first time, a relevant structure is added to the document. This definition is used for all later GD\&T calls and is not repeated for them. 
+This call can be used at any time. When it is used for the first time, a relevant structure is added to the document. This definition is used for all later GD&T calls and is not repeated for them. 

-@subsubsection occt_xde_2_7_2 Adding a GD\&T
-*XCAFDoc_DimTolTool* provides methods to create GD\&T 'empty' entities:
+@subsubsection occt_xde_2_7_2 Adding a GD&T
+*XCAFDoc_DimTolTool* provides methods to create GD&T 'empty' entities:
  * *AddDimension* - for a new dimension;
  * *AddGeomTolerance* - for a new geometric tolerance;
  * *AddDatum* - for a new geometric tolerance datum.

-All methods create a sub-label for the corresponding GD\&T entity of the tool master label and attach an attribute specific for the
+All methods create a sub-label for the corresponding GD&T entity of the tool master label and attach an attribute specific for the
 created entity.

 Here is an example of adding a new dimension:
@@ -706,11 +706,11 @@ if (!aDimLabel.IsNull())
  // error processing
 }
 ~~~~~
-A similar approach can be used for other GD\&T types.
+A similar approach can be used for other GD&T types.

-@subsubsection occt_xde_2_7_3 Editing a GD\&T
-A newly added GD\&T entity is empty. To set its data a corresponding access object should be used as it is demonstrated
-below, where the dimension becomes a linear distance between two points.
+@subsubsection occt_xde_2_7_3 Editing a GD&T
+A newly added GD&T entity is empty. To set its data a corresponding access object should be used as it is demonstrated
+below, where the dimension becomes the linear distance between two points.
 ~~~~~
 Handle(XCAFDoc_Dimension) aDimAttr;
 aDimLabel.FindAttribute(XCAFDoc_Dimension::GetID(), aDimAttr);
@@ -726,13 +726,13 @@ if (!aDimAttr.IsNull())
  aDimAttr->SetObject(aDimObject);
 }
 ~~~~~
-A similar approach can be used for other GD\&T types.
+A similar approach can be used for other GD&T types.

-@subsubsection occt_xde_2_7_4 Linking GD\&Ts
-To link a GD\&T entity with other OCAF labels (e.g. representing shapes) one should use the following methods:
+@subsubsection occt_xde_2_7_4 Linking GD&Ts
+To link a GD&T entity with other OCAF labels (e.g. representing shapes) one should use the following methods:
  * *SetDimension* - for dimensions;
  * *SetGeomTolerance* - for geometric tolerances;
-  * *SetDatum* - for geometric tolerance datums.
+  * SetDatum - for geometric tolerance datums.

 These methods can take a single label or a sequence of labels. All previous links will be removed.

@@ -748,20 +748,20 @@ aDGTTool->SetDimension(aShapes1, aShapes2, aDimLabel);

 In addition, a special method *SetDatumToGeomTol* should be used to link a datum with a geometric tolerance.

-@subsubsection occt_xde_2_7_5 Finding GD\&Ts and reference shapes
+@subsubsection occt_xde_2_7_5 Finding GD&Ts and reference shapes

-*XCAFDimTolObjects_Tool* class provides basic capabilities for searching GD\&Ts linked to shapes.
-The tool provides sequences of dimensions, geometric tolerances and datums linked with a shape. A series of related datums is also returned for geometric tolerances.
+*XCAFDimTolObjects_Tool* class provides basic capabilities for searching GD&Ts linked to shapes.
+Using the tool one can get sequences of dimensions, geometric tolerances and datums linked with a shape. A series of related datums is also returned for geometric tolerances.

-To get reference shapes for a GD\&T entity one can use *GetRefShapeLabel* from *XCAFDoc_DimTolTool*.
+To get reference shapes for a GD&T entity one can use *GetRefShapeLabel* from *XCAFDoc_DimTolTool*.

 *XCAFDoc_DimTolTool* provides methods to get lists of all dimensions, geometric tolerances and datums.

@subsubsection occt_xde_2_7_6 Storing custom data
-Every GD\&T entity in XDE is represented as a label with attached attribute identifying entity type. All specific data is
+Every GD&T entity in XDE is represented as a label with attached attribute identifying entity type. All specific data is
 stored in sub-labels in standard OCAF attributes, such as *TDataStd_Integer*, *TDataStd_IntegerArray*, *TDataStd_RealArray* and so on.
 Sub-label tags are reserved for internal use and cannot be used for storing custom data. The following tag ranges are reserved for
-GD\&T entities:
+GD&T entities:
  * 1 - 17 - for dimensions;
  * 1 - 17 - for geometric tolerances;
  * 1 - 19 - for datums.
@@ -798,7 +798,7 @@ if (!myClipPlaneTool->RemoveClippingPlane(aClipPlnLbl))
 ~~~~~
 The plane will not be removed if it is referenced in at least one view.

-To change the clipping plane and its name use *UpdateClippingPlane* method, e.g.:
+To change clipping plane and its name use *UpdateClippingPlane* method, e.g.:
 ~~~~~
 gp_Pln aPln = ...
 myClipPlaneTool->UpdateClippingPlane(aClipPlnLbl, aPln, "New name of plane");
@@ -810,7 +810,7 @@ Standard_Boolean aCapping = ...
 myClipPlaneTool->SetCapping(aClipPlnLbl, aCapping);
 ~~~~~

-*XCAFDoc_ClippingPlaneTool* can be used to get all clipping plane labels and to check if a label belongs to the *ClippingPlane table*, e.g.:
+*XCAFDoc_ClippingPlaneTool* can be used to get all clipping plane labels and to check if a label belongs to the ClippingPlane table, e.g.:
 ~~~~~
 TDF_LabelSequence aClipPlaneLbls;
 myClipPlaneTool->GetClippingPlanes(aClipPlaneLbls);
@@ -834,7 +834,7 @@ for (TDF_LabelSequence::Iterator anIt(aClipPlaneLbls); anIt.More(); anIt.Next())

@subsection occt_xde_2_9 Saved views

-In an XDE document, Views are managed by the class *XCAFDoc_ViewTool*. It works basing on the same principles as ShapeTool works with Shapes. This tool can be provided on the Main Label or on any sub-label. Views are stored in a child of the starting document label 0.1.7, where a view itself is defined as *XCAFDoc_View* sub-class of *TDF_Attribute*. Views and selected shapes, clipping planes, GD\&Ts and notes are related by Graph Nodes.
+In an XDE document, Views are managed by the class *XCAFDoc_ViewTool*. It works basing on the same principles as ShapeTool works with Shapes. This tool can be provided on the Main Label or on any sub-label. Views are stored in a child of the starting document label 0.1.7, where a view itself is defined as *XCAFDoc_View* sub-class of *TDF_Attribute*. Views and selected shapes, clipping planes, GD&Ts and notes are related to by Graph Nodes.

 To query, edit, or initialize a Document to handle views of XCAF, use: 
 ~~~~~
@@ -864,7 +864,7 @@ if (!aViewAttr.IsNull())
 }
 ~~~~~ 

-To set shapes, clipping planes, GD\&Ts and notes selected for the view use one of overloaded *SetView* methods of *XCAFDoc_ViewTool*. 
+To set shapes, clipping planes, GD&Ts and notes selected for the view use one of overloaded *SetView* methods of *XCAFDoc_ViewTool*. 
 To set only clipping planes one should use *SetClippingPlanes* method.
 ~~~~~
 TDF_LabelSequence aShapes; ...
@@ -891,26 +891,23 @@ for (TDF_LabelSequence::Iterator anIt(aViewLbls); anIt.More(); anIt.Next())
 }
 ~~~~~

-To get shapes, clipping planes, GD\&Ts or notes associated with a particular view use the following methods:
+To get shapes, clipping planes, GD&Ts or notes associated with a particular view use the following methods:
  * *GetRefShapeLabel* - returns a sequence of associated shape labels;
  * *GetRefGDTLabel* - returns a sequence of associated GDT labels;
  * *GetRefClippingPlaneLabel* - returns a sequence of associated clipping plane labels;
  * *GetRefNoteLabel* - returns a sequence of associated note labels;
  * *GetRefAnnotationLabel* - returns a sequence of associated annotated labels.

-And vice versa, to get views that display a particular clipping plane, GD\&T or note use the following methods:
-  * *GetViewLabelsForShape* - returns a sequence of view labels associated with a shape;
-  * *GetViewLabelsForGDT* - returns a sequence of view labels associated with a GD\&T;
-  * *GetViewLabelsForClippingPlane* - returns a sequence of view labels associated with a clipping plane;
-  * *GetViewLabelsForNote* - returns a sequence of view labels associated with a note;
-  * *GetViewLabelsForAnnotation* - returns a sequence of view labels associated with an annotated label.
+And vice versa, to get views that display a particular clipping plane, GD&T or note use the following methods:
+  * *GetViewLabelsForShape* - returns a sequence of associated view labels for a shape;
+  * *GetViewLabelsForGDT* - returns a sequence of associated view labels for a GD&T;
+  * *GetViewLabelsForClippingPlane* - returns a sequence of associated view labels for a clipping plane;
+  * *GetViewLabelsForNote* - returns a sequence of associated view labels for a note;
+  * *GetViewLabelsForAnnotation* - returns a sequence of associated view labels for an annotated label.

@subsection occt_xde_2_10 Custom notes

-In an XDE document, custom notes are managed by the class *XCAFDoc_NotesTool*. 
-It works basing on the same principles as ShapeTool works with Shapes. 
-This tool can be provided on the Main Label or on any sub-label. 
-The Property itself is defined as sub-class of *XCAFDoc_Note* abstract class, which is a sub-class of *TDF_Attribute* one. 
+In an XDE document, custom notes are managed by the class *XCAFDoc_NotesTool*. It works basing on the same principles as ShapeTool works with Shapes. This tool can be provided on the Main Label or on any sub-label. The Property itself is defined as sub-class of *XCAFDoc_Note* abstract class, which is a sub-class of *TDF_Attribute* one. 

 Custom notes are stored in a child of the *XCAFDoc_NotesTool* label, at label 0.1.9.1. Each note then corresponds to a dedicated label. A note may be attached to a document item identified by a label, a sub-shape identified by integer index or an attribute identified by GUID. Annotations are stored in a child of the *XCAFDoc_NotesTool* label, at label 0.1.9.2.
 Notes binding is done through *XCAFDoc_GraphNode* attribute.
@@ -952,26 +949,6 @@ if (!myCommentNote.IsNull()) {
  myCommentNote->Set("New comment");
 }
 ~~~~~
-In order to edit auxiliary note data such as text and attachment position, plane for rendering and tesselated presentation,
-one should use a transfer object *XCAFNoteObjects_NoteObject* by GetObject and SetObject methods of *XCAFDoc_Note* class.
-*XCAFNoteObjects_NoteObject* class provides the following functionality:
- HasPlane, GetPlane and SetPlane methods test, get and set plane for note rendering
- HasPoint, GetPoint and SetPoint methods test, get and set note attachment position on the annotated object
- HasPointText, GetPointText, SetPointText methods test, get and set test position
- GetPresentation and SetPresentation methods allow to test for and specify tesselated presentation
-
-After getting, the transfer object can be edited and set back to the note:
-~~~~~
-Handle(XCAFNoteObjects_NoteObject) aNoteObj = myNote->GetObject();
-if (!aNoteObj.IsNull())
-{
-  gp_Pnt aPntTxt (...);
-  aNoteObj->SetPointText (aPntTxt);
-  TopoDS_Shape aS = ...;
-  aNoteObj->SetPresentation (aS);
-  myNote->SetObject (aNoteObj);
-}
-~~~~~

@subsubsection occt_xde_2_10_4 Adding Notes

@@ -1065,7 +1042,7 @@ The same can be said for Viewing: presentations can be defined from Shapes and C

 There are several important points to consider: 
  * Previously defined Readers and Writers for dealing with Shapes only, whether Standard or Advanced, remain unchanged in their form and in their dependencies. In addition, functions other than mapping are also unchanged.
-  * XDE provides mapping with data other than Shapes. Names, Colors, Layers, GD\&T, Clipping planes, Views, Validation Properties (Centroid, Volume, Area), and Assembly Structure are hierarchic with rigid motion. Currently, Clipping planes and Views writing supported for XBF format only.
+  * XDE provides mapping with data other than Shapes. Names, Colors, Layers, GD&T, Clipping planes, Views, Validation Properties (Centroid, Volume, Area), and Assembly Structure are hierarchic with rigid motion. Currently, Clipping planes and Views writing supported for XBF format only.
  * XDE mapping is relevant for use within the Advanced level of Data Exchanges, rather than Standard ones, because a higher level of information is better suited to a higher quality of shapes. In addition, this allows to avoid the multiplicity of combinations between various options. Note that this choice is not one of architecture but of practical usage and packaging.
  * Reader and Writer classes for XDE are generally used like those for Shapes. However, their use is adapted to manage a Document rather than a Shape.
  
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
msv	280a080587	The test case "perf modalg bug453_2" has been corrected. Now the area is computed the same on both Linux and Windows.	2017-10-26 11:04:57 +03:00
msv	c3d250cc97	# reduce enlarging by half to avoid regressions on some blend tests.	2017-10-25 17:49:10 +03:00
msv	07045ddcf5	0029257: GeomPlate generates surface in unexpected place Treatment of the parameter EnlargeCoeff in the constructor of GeomPlate_MakeApprox has been corrected. Now the bounds of the result surface are correctly enlarged. The new draw command 'pullupface' has been implemented to check behavior of GeomPlate.	2017-10-24 20:48:07 +03:00