Test for 0024251: Command checkshape does not report a problem on first call after fixshape

CMakeLists.txt

@@ -365,9 +365,6 @@ if (WIN32)
   set (USE_D3D OFF CACHE BOOL "${USE_D3D_DESCR}")
 endif()
 
-set (USE_QT_TOOLS OFF CACHE BOOL "${USE_QT_TOOLS_DESCR}")
-set (USE_QT4 ON CACHE BOOL "${USE_QT4}")
-
 # Enable/Disable the floating point exceptions (FPE) during runtime.
 if (NOT BUILD_ENABLE_FPE_SIGNAL_HANDLER)
   set (BUILD_ENABLE_FPE_SIGNAL_HANDLER OFF CACHE BOOL "${BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR}" FORCE)
@@ -561,27 +558,6 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
 endif()
 
-# FFmpeg
-# search for CSF_FFmpeg variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED (CSF_FFmpeg CAN_USE_FFMPEG)
-
-if (CAN_USE_FFMPEG)
-  set (USE_FFMPEG OFF CACHE BOOL "${USE_FFMPEG_DESCR}")
-
-  if (USE_FFMPEG)
-    add_definitions (-DHAVE_FFMPEG)
-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/ffmpeg")
-  else()
-    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FFMPEG")
-    OCCT_CHECK_AND_UNSET ("INSTALL_FFMPEG")
-  endif()
-else()
-  OCCT_CHECK_AND_UNSET ("USE_FFMPEG")
-
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FFMPEG")
-  OCCT_CHECK_AND_UNSET ("INSTALL_FFMPEG")
-endif()
-
 # OpenGL ES 2.0
 if (WIN32 AND CAN_USE_GLES2)
   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
@@ -715,7 +691,7 @@ if (3RDPARTY_INCLUDE_DIRS)
 endif()
 
 # include <cmake binary folder>/inc
-include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE})
+include_directories (${CMAKE_BINARY_DIR}/inc)
 
 if (3RDPARTY_LIBRARY_DIRS AND BUILD_SHARED_LIBS)
   list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
@@ -756,7 +732,7 @@ string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
 message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")
 
 # collect all the headers to <binary dir>/inc folder
-COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}" "${CMAKE_SOURCE_DIR}/src" "${INSTALL_DIR_INCLUDE}")
+COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}")
 
 string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
 message (STATUS "Info: \(${CURRENT_TIME}\) End the collecting")
@@ -773,33 +749,6 @@ else()
   set (SCRIPT_EXT sh)
 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 (NOT USE_QT_TOOLS)
-  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 folder
-  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  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}/${INSTALL_DIR_INCLUDE}" "${BUILD_TOOL_TOOLKITS}" "${CMAKE_SOURCE_DIR}/tools" "tools")
-  include_directories (${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/tools)
-
-
-  # check qt 3rdparty path
-  add_definitions (-DHAVE_QT)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt5")
-  message (STATUS "Info: Qt is used by OCCT")
-endif()
-
 # OCCT samples
 # get absolute path from INSTALL_DIR
 set (INSTALL_DIR_ABSOLUTE "${INSTALL_DIR}")
@@ -942,14 +891,8 @@ if (MSVC AND 3RDPARTY_DLL_DIRS)
   endif()
 endif()
 
-# include patched toolkit projects or original ones
-if (BUILD_TOOL_TOOLKITS)
-  foreach (BUILD_TOOL_TOOLKIT ${BUILD_TOOL_TOOLKITS})
-    OCCT_ADD_SUBDIRECTORY ("tools/${BUILD_TOOL_TOOLKIT}")
-  endforeach()
-endif()
-
 message (STATUS "Info: \(${CURRENT_TIME}\) OCCT toolkits processed")
+
 # samples do not support patch usage
 if (BUILD_MODULE_MfcSamples)
   set (OCCT_ROOT ${CMAKE_SOURCE_DIR})
@@ -976,22 +919,6 @@ if (BUILD_MODULE_UwpSample)
   add_subdirectory(samples/xaml)
 endif()
 
-if (BUILD_TOOL_TOOLKITS)
-  # copy tinspector script to install script folder
-  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/dfbrowser.${SCRIPT_EXT}")
-    install (FILES "${BUILD_PATCH}/adm/templates/dfbrowser.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
-            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-  else()
-    install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/dfbrowser.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
-            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-  endif()
-
-  set (BUILD_SAMPLE_TOOLKITS TInspectorEXE)
-  foreach (BUILD_SAMPLE_TOOL_TOOLKIT ${BUILD_SAMPLE_TOOLKITS})
-    OCCT_ADD_SUBDIRECTORY ("samples/tools/${BUILD_SAMPLE_TOOL_TOOLKIT}")
-  endforeach()
-endif()
-
 # Prepare variables for configuration of OpenCASCADE cmake config file
 set (OCCT_MODULES_ENABLED)
 set (OCCT_LIBRARIES)

adm/TOOLS

@@ -1,4 +0,0 @@
-TModelingData TKShapeView
-TVisualization TKView TKVInspector
-TApplicationFramework TKTreeModel TKTInspectorAPI TKDFBrowser
-TTool TKTInspector TKToolsDraw

adm/UDLIST

@@ -347,6 +347,8 @@ n StepToGeom
 n StepToTopoDS
 n StepVisual
 n StlAPI
+n StlMesh
+n StlTransfer
 n TopoDSToStep
 n Transfer
 n TransferBRep

adm/cmake/3rdparty_macro.cmake

@@ -139,17 +139,6 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
                                                                                 PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
                                                                                 CMAKE_FIND_ROOT_PATH_BOTH
                                                                                 NO_DEFAULT_PATH)
-          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-            # find directory recursive
-            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
-            if (NOT "${SUBDIR_NAME}" STREQUAL "")
-              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                                                           PATHS "${SUBDIR_NAME}"
-                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                           CMAKE_FIND_ROOT_PATH_BOTH
-                                                           NO_DEFAULT_PATH)
-            endif()
-          endif()
         else()
           find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
                                                                                 PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
@@ -186,16 +175,6 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                                PATH_SUFFIXES bin  win${COMPILER_BITNESS}/${COMPILER}/bin
                                                                                NO_DEFAULT_PATH)
-            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-              # find directory recursive
-              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin SUBDIR_NAME)
-              if (NOT "${SUBDIR_NAME}" STREQUAL "")
-                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                                                             PATHS "${SUBDIR_NAME}"
-                                                             PATH_SUFFIXES bin
-                                                             NO_DEFAULT_PATH)
-              endif()
-            endif()
           else()
             find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
           endif()
@@ -227,7 +206,6 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
         if (WIN32)
           set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${3RDPARTY_${PRODUCT_NAME}_DLL_DIRS}")
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
         else()
           set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
         endif()

adm/cmake/ffmpeg.cmake

@@ -1,228 +0,0 @@
-# FFmpeg
-
-if (NOT DEFINED INSTALL_FFMPEG)
-  set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")
-endif()
-
-if (NOT DEFINED 3RDPARTY_FFMPEG_DIR)
-  set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
-endif()
-
-# include occt macros. compiler_bitness, os_wiht_bit, compiler
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-# specify FFMPEG folder in connection with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_FFMPEG_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FFMPEG FFMPEG_DIR_NAME)
-    if (FFMPEG_DIR_NAME)
-      set (3RDPARTY_FFMPEG_DIR "${3RDPARTY_DIR}/${FFMPEG_DIR_NAME}" CACHE PATH "The directory containing FFmpeg" FORCE)
-    endif()
-  endif()
-else()
-endif()
-
-# define required FFMPEG variables
-if (NOT DEFINED 3RDPARTY_FFMPEG_INCLUDE_DIR)
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
-endif()
-
-if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
-  set (3RDPARTY_FFMPEG_LIBRARY               "" CACHE FILEPATH "FFmpeg framework" FORCE)
-endif()
-
-if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
-  set (3RDPARTY_FFMPEG_LIBRARY_DIR           "" CACHE PATH "The directory containing FFmpeg framework")
-endif()
-
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_FFMPEG_DLL OR NOT 3RDPARTY_FFMPEG_DLL_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR}")
-    set (3RDPARTY_FFMPEG_DLL                 "" CACHE FILEPATH "FFmpeg shared libraries" FORCE)
-  endif()
-endif()
-
-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
-    set (3RDPARTY_FFMPEG_DLL_DIR               "" CACHE PATH "The directory containing FFmpeg shared libraries")
-  endif()
-endif()
-
-# check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY FILEPATH "the path to FFmpeg framework")
-
-  if (3RDPARTY_FFMPEG_LIBRARY AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY}")
-    get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY}" PATH)
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
-  else()
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR PATH "The directory containing FFmpeg libraries")
-  endif()
-
-  if (WIN32)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL FILEPATH "the path to FFmpeg shared libraries")
-
-    if (3RDPARTY_FFMPEG_DLL AND EXISTS "${3RDPARTY_FFMPEG_DLL}")
-      get_filename_component (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL}" PATH)
-      set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
-    else()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR PATH "The directory containing FFmpeg shared libraries")
-    endif()
-  endif()
-endif()
-
-# header
-if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-  set (HEADER_NAMES avutil.h libavutil/avutil.h)
-
-  # set 3RDPARTY_FFMPEG_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_INCLUDE_DIR
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR "3RDPARTY_FFMPEG_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
-
-  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_FFMPEG_DIR}
-                                                 PATH_SUFFIXES include
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
-                                                 NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATH_SUFFIXES include
-                                                 CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-endif()
-
-if (3RDPARTY_FFMPEG_INCLUDE_DIR AND EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_INCLUDE_DIR)
-
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
-endif()
-
-# library
-if (NOT 3RDPARTY_FFMPEG_LIBRARY OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY}")
-  set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
-
-  set (FFMPEG_PATH_SUFFIXES lib)
-  if (ANDROID)
-    set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
-  elseif(APPLE)
-    set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
-  endif()
-
-  # set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
-  set (3RDPARTY_FFMPEG_LIBRARY "3RDPARTY_FFMPEG_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library" FORCE)
-
-  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    find_library (3RDPARTY_FFMPEG_LIBRARY NAMES avutil
-                  PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR}" "${3RDPARTY_FFMPEG_DIR}"
-                  PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
-                  CMAKE_FIND_ROOT_PATH_BOTH
-                  NO_DEFAULT_PATH)
-  else()
-    find_library (3RDPARTY_FFMPEG_LIBRARY NAMES avutil
-                  PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
-                  CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-
-  if (3RDPARTY_FFMPEG_LIBRARY AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY}")
-    get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY}" PATH)
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR}" CACHE PATH "The directory containing FFmpeg library" FORCE)
-  else()
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR "" CACHE PATH "The directory containing FFmpeg library" FORCE)
-  endif()
-endif()
-
-if (3RDPARTY_FFMPEG_LIBRARY_DIR AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
-  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_LIBRARY_DIR)
-
-  set (3RDPARTY_FFMPEG_LIBRARY "" CACHE FILEPATH "The path to FFmpeg library" FORCE)
-endif()
-
-# shared library
-if (WIN32)
-  if (NOT 3RDPARTY_FFMPEG_DLL OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL}")
-
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-    set (3RDPARTY_FFMPEG_DLL "3RDPARTY_FFMPEG_DLL-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library" FORCE)
-
-    # find FFmpeg shared library
-    file (GLOB 3RDPARTY_FFMPEG_DLL "${3RDPARTY_FFMPEG_DIR}/bin/avutil[-][0-9]*")
-
-    if (3RDPARTY_FFMPEG_DLL AND EXISTS "${3RDPARTY_FFMPEG_DLL}")
-      set (3RDPARTY_FFMPEG_DLL "${3RDPARTY_FFMPEG_DLL}" CACHE FILEPATH "FFmpeg shared library" FORCE)
-      get_filename_component (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL}" PATH)
-      set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR}" CACHE PATH "The directory containing FFmpeg library" FORCE)
-    else()
-      set (3RDPARTY_FFMPEG_DLL_DIR "" CACHE PATH "The directory containing FFmpeg shared library" FORCE)
-    endif()
-  endif()
-
-  if (3RDPARTY_FFMPEG_DLL_DIR OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR}")
-    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_DLL_DIR)
-  endif()
-endif()
-
-# install instructions
-if (INSTALL_FFMPEG)
-  OCCT_MAKE_OS_WITH_BITNESS()
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-
-  if (WIN32)
-    if (DEFINED INSTALL_BIN_DIR)
-      install (FILES "${3RDPARTY_FFMPEG_DLL}" DESTINATION "${INSTALL_BIN_DIR}")
-    else()
-      install (FILES "${3RDPARTY_FFMPEG_DLL}"
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-      install (FILES "${3RDPARTY_FFMPEG_DLL}"
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-      install (FILES "${3RDPARTY_FFMPEG_DLL}"
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-    endif()
-  else()
-    get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY} REALPATH)
-    get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY} NAME)
-
-    if (DEFINED INSTALL_LIB_DIR)
-      install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-               DESTINATION "${INSTALL_LIB_DIR}"
-               RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-    else()
-      install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-               RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-      install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-               RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-      install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-               RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-    endif()
-  endif()
-
-  set (USED_3RDPARTY_FFMPEG_DIR "")
-else()
-  # the library directory for using by the executable
-  if (WIN32)
-    set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR})
-  else()
-    set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR})
-  endif()
-endif()
-
-# unset all redundant variables
-OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
-OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
-OCCT_CHECK_AND_UNSET (FFMPEG_DIR)
-
-mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY 3RDPARTY_FFMPEG_DLL)

adm/cmake/occt_csf.cmake

@@ -24,13 +24,6 @@ else()
   set (CSF_FREETYPE)
 endif()
 
-# FFmpeg
-if (USE_FFMPEG)
-  set (CSF_FFmpeg "avcodec avformat swscale avutil")
-else()
-  set (CSF_FFmpeg)
-endif()
-
 # FREEIMAGE
 if (USE_FREEIMAGE)
   set (CSF_FreeImagePlus "freeimage")

adm/cmake/occt_macros.cmake

@@ -106,34 +106,6 @@ function (SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
   set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
 endfunction()
 
-function (FIND_SUBDIRECTORY ROOT_DIRECTORY DIRECTORY_SUFFIX SUBDIRECTORY_NAME)
-  #message("Trying to find directory with suffix ${DIRECTORY_SUFFIX} in ${ROOT_DIRECTORY}")
-  SUBDIRECTORY_NAMES ("${ROOT_DIRECTORY}" SUBDIR_NAME_LIST)
-  #message("Subdirectories: ${SUBDIR_NAME_LIST}")
-
-  #set(${SUBDIRECTORY_NAME} "${SUBDIR_NAME_LIST}" PARENT_SCOPE)
-
-  foreach (SUBDIR_NAME ${SUBDIR_NAME_LIST})
-    #message("Subdir: ${SUBDIR_NAME}, ${DIRECTORY_SUFFIX}")
-    # REGEX failed if the directory name contains '++' combination, so we replace it
-    string(REPLACE "++" "\\+\\+" SUBDIR_NAME_ESCAPED ${SUBDIR_NAME})
-    string (REGEX MATCH "${SUBDIR_NAME_ESCAPED}" DOES_PATH_CONTAIN "${DIRECTORY_SUFFIX}")
-    if (DOES_PATH_CONTAIN)
-      set(${SUBDIRECTORY_NAME} "${ROOT_DIRECTORY}/${SUBDIR_NAME}" PARENT_SCOPE)
-      #message("Subdirectory is found: ${SUBDIRECTORY_NAME}")
-      BREAK()
-    else()
-      #message("Check directory: ${ROOT_DIRECTORY}/${SUBDIR_NAME}")
-      FIND_SUBDIRECTORY ("${ROOT_DIRECTORY}/${SUBDIR_NAME}" "${DIRECTORY_SUFFIX}" SUBDIR_REC_NAME)
-      if (NOT "${SUBDIR_REC_NAME}" STREQUAL "")
-        set(${SUBDIRECTORY_NAME} "${SUBDIR_REC_NAME}" PARENT_SCOPE)
-        #message("Subdirectory is found: ${SUBDIRECTORY_NAME}")
-        BREAK()
-      endif()
-    endif()
-  endforeach()
-endfunction()
-
 function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)
 
   if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}")
@@ -222,7 +194,7 @@ macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME
   install(FILES "${OCCT_BINARY_DIR}/${BUILD_NAME}" DESTINATION  "${DESTINATION_PATH}" RENAME ${INSTALL_NAME})
 endmacro()
 
-macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS OCCT_COLLECT_SOURCE_DIR OCCT_INSTALL_DIR_PREFIX)
+macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS)
   set (OCCT_USED_PACKAGES)
 
   # consider patched header.in template
@@ -238,8 +210,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     set (OCCT_TOOLKIT_PACKAGES)
     if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
       file (STRINGS "${BUILD_PATCH}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
-    elseif (EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_USED_TOOLKIT}/PACKAGES")
-      file (STRINGS "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
     endif()
 
     list (APPEND OCCT_USED_PACKAGES ${OCCT_TOOLKIT_PACKAGES})
@@ -257,10 +229,10 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
   foreach (OCCT_PACKAGE ${OCCT_USED_PACKAGES})
     if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES")
       file (STRINGS "${BUILD_PATCH}/src/${OCCT_PACKAGE}/FILES" OCCT_ALL_FILE_NAMES)
-    elseif (EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/FILES")
-      file (STRINGS "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/FILES" OCCT_ALL_FILE_NAMES)
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" OCCT_ALL_FILE_NAMES)
     else()
-      message (WARNING "FILES has not been found in ${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}")
+      message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}")
       continue()
     endif()
 
@@ -268,13 +240,13 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
 
     # emit warnings if there is unprocessed headers
-    file (GLOB OCCT_ALL_FILES_IN_DIR "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/*.*")
+    file (GLOB OCCT_ALL_FILES_IN_DIR "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/*.*")
     file (GLOB OCCT_ALL_FILES_IN_PATCH_DIR "${BUILD_PATCH}/src/${OCCT_PACKAGE}/*.*")
 
     # use patched header files
     foreach (OCCT_FILE_IN_PATCH_DIR ${OCCT_ALL_FILES_IN_PATCH_DIR})
       get_filename_component (OCCT_FILE_IN_PATCH_DIR_NAME ${OCCT_FILE_IN_PATCH_DIR} NAME)
-      list (REMOVE_ITEM OCCT_ALL_FILES_IN_DIR "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/${OCCT_FILE_IN_PATCH_DIR_NAME}")
+      list (REMOVE_ITEM OCCT_ALL_FILES_IN_DIR "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${OCCT_FILE_IN_PATCH_DIR_NAME}")
       list (APPEND OCCT_ALL_FILES_IN_DIR "${OCCT_FILE_IN_PATCH_DIR}")
     endforeach()
 
@@ -315,7 +287,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
       endforeach()
 
       if (NOT OCCT_FILE_IN_DIR_STATUS)
-        message (STATUS "Warning. File ${OCCT_FILE_IN_DIR} is not listed in ${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/FILES")
+        message (STATUS "Warning. File ${OCCT_FILE_IN_DIR} is not listed in ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
 
         string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
         if (IS_HEADER_FOUND)
@@ -332,10 +304,10 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
   foreach (OCCT_HEADER_FILE ${OCCT_HEADER_FILES_COMPLETE})
     get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
     set (OCCT_HEADER_FILE_CONTENT "#include \"${OCCT_HEADER_FILE}\"")
-    configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" @ONLY)
+    configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
   endforeach()
   
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${OCCT_INSTALL_DIR_PREFIX}")
+  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR_INCLUDE}")
   
   string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
   message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
@@ -347,7 +319,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     
     list (FIND OCCT_USED_PACKAGES ${PACKAGE_NAME} IS_HEADER_FOUND)
     if (NOT ${IS_HEADER_FOUND} EQUAL -1)
-      if (NOT EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
+      if (NOT EXISTS "${CMAKE_SOURCE_DIR}/src/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
         message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not presented in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
         file (REMOVE "${OCCT_HEADER_FILE_OLD}")
       else()
@@ -518,24 +490,6 @@ function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
   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)
 

adm/cmake/occt_toolkit.cmake

@@ -287,14 +287,6 @@ if (BUILD_SHARED_LIBS)
   target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
 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)
-    add_definitions("-DOCCT_NO_DEPRECATED")
-    message (STATUS "Warning: internal deprecation warnings by Standard_DEPRECATED have been disabled due to old gcc version being used")
-  endif()
-endif()
-
 # use Cotire to accelerate build via usage of precompiled headers
 if (BUILD_USE_PCH)
   if (WIN32)
@@ -316,7 +308,6 @@ if (BUILD_USE_PCH)
 
   # workaround for old gcc
   if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    add_definitions("-D__STDC_CONSTANT_MACROS")
     add_definitions("-D__STDC_FORMAT_MACROS")
   endif()
 

adm/cmake/occt_toolkit_tool.cmake

@@ -1,298 +0,0 @@
-# script for each OCCT tool toolkit
-
-# Qt dependencies
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/qt5_macro)
-
-FIND_QT5_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}/bind/${PROJECT_NAME}.pdb
-             CONFIGURATIONS Debug
-             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})
-    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}")
-

adm/cmake/qt5.cmake

@@ -1,22 +0,0 @@
-#qt
-
-#looking for 3RDPARTY_QT_DIR variable used later in qt5_macro.cmake
-if (${USE_QT4})
-  SET(CSF_QtCore "QtCore")
-  THIRDPARTY_PRODUCT("QT" "" "CSF_QtCore" "d")
-else()
-  SET(CSF_Qt5Core "Qt5Core")
-  THIRDPARTY_PRODUCT("QT" "" "CSF_Qt5Core" "d")
-endif()
-
-list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_INCLUDE_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)
-UNSET (${3RDPARTY_QT_INCLUDE_DIR} CACHE)
-UNSET (${3RDPARTY_QT_LIBRARY} CACHE)
-UNSET (${3RDPARTY_QT_LIBRARY_DIR} CACHE)
-
-set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")

adm/cmake/qt5_macro.cmake

@@ -1,68 +0,0 @@
-#qt
-
-macro (FIND_QT5_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-
-  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
-    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})
-  if (USE_QT4)
-    # Now we can apply standard CMake finder for Qt. We do this mostly
-    # to have qt5_wrap_cpp() function available
-    find_package(Qt4)
-    #message (STATUS "Qt cmake configuration at directory ${Qt4DIR}")
-
-    set(PROJECT_INCLUDES ${QT_INCLUDES})
-    if (WIN32)
-      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")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so")
-    endif(WIN32)
-  else()
-    # Now we can apply standard CMake finder for Qt4. We do this mostly
-    # to have qt5_wrap_cpp() function available
-    find_package(Qt5 REQUIRED COMPONENTS Widgets)
-    #message (STATUS "Qt cmake configuration at directory ${Qt5DIR}")
-
-    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}")
-    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}")
-    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}")
-  endif()
-endmacro()
-
-
-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 (USE_QT4)
-      qt4_wrap_cpp(MOC_FILE ${FILE})
-    else()
-      qt5_wrap_cpp(MOC_FILE ${FILE})
-    endif()
-    #message (STATUS "... Info: next MOC file ${MOC_FILE}")
-
-  endforeach (FILE)
-
-endmacro()
-
-macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
-  if(EXISTS "${RESOURCE_FILE_NAME}")
-    if (USE_QT4)
-      qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
-      # suppress some GCC warnings coming from source files generated from .qrc resources
-      if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-      endif()
-    else()
-      qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
-    endif()
-  endif()
-endmacro()

adm/cmake/vardescr.cmake

@@ -82,7 +82,6 @@ endmacro()
 INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
 INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
 INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
-INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
 INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
 INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
 INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
@@ -137,10 +136,6 @@ set (3RDPARTY_DIR_DESCR
 third-party product have been found - corresponding CMake variables will be specified
 (VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
 
-set (USE_FFMPEG_DESCR
-"Indicates whether FFmpeg framework is used or not. FFmpeg stands for
-multimedia data handling, open-source software libraries used for video encoding and decoding.")
-
 set (USE_FREEIMAGE_DESCR
 "Indicates whether Freeimage product should be used in OCCT visualization
 module for support of popular graphics image formats (PNG, BMP etc)")
@@ -172,11 +167,6 @@ set (USE_GLX_DESCR "Indicates whether X11 OpenGl on OSX is used or not")
 
 set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
 
-set (BUILD_QT_TOOLS_DESCR "Indicates whether OCCT tools should be build or not")
-
-set (USE_QT_TOOLS_DESCR "Indicates whether OCCT tools should be used or not
-The tools will be searched in third-party directory or may be set manually")
-
 macro (BUILD_MODULE MODULE_NAME)
   set (ENABLE_MODULE TRUE)
   set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")

adm/genconfdeps.tcl

@@ -119,21 +119,6 @@ proc wokdep:SearchHeader {theHeader} {
   if { [file exists "$aPath"] } {
     return "$aPath"
   }
-
-  if { "$::tcl_platform(os)" == "Linux" } {
-    if { "$::ARCH" == "64" } {
-      set aPath "/usr/include/x86_64-linux-gnu/${theHeader}"
-      if { [file exists "$aPath"] } {
-        return "$aPath"
-      }
-    } else {
-      set aPath "/usr/include/i386-linux-gnu/${theHeader}"
-      if { [file exists "$aPath"] } {
-        return "$aPath"
-      }
-    }
-  }
-
   return ""
 }
 

adm/gendoc.tcl

@@ -70,7 +70,7 @@ proc gendoc {args} {
   set DOCLABEL                  ""
   set VERB_MODE                 "NO"
   set SEARCH_MODE               "none"
-  set MATHJAX_LOCATION          "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1"
+  set MATHJAX_LOCATION          "https://cdn.mathjax.org/mathjax/latest"
   set mathjax_js_name           "MathJax.js"
   set DOCTYPE_COMBO_FLAG        0
   set GENMODE_COMBO_FLAG        0
@@ -303,6 +303,13 @@ proc gendoc {args} {
 
   puts ""
 
+  # Clean logfiles
+  set DOXYLOG [OCCDoc_GetRootDir]/doc/doxygen_warnings_and_errors.log
+  set PDFLOG  [OCCDoc_GetRootDir]/doc/pdflatex_warnings_and_errors.log
+
+  file delete -force $PDFLOG
+  file delete -force $DOXYLOG
+  
   # Start main activities
   if { $GEN_MODE != "PDF_ONLY" } {
     if { [OCCDoc_GetProdRootDir] == ""} {
@@ -323,15 +330,15 @@ proc gendoc {args} {
       }
     }
   } else {
-    puts "Generating OCCT User Guides in PDF format..."
+    puts "Generating OCCT User Guides in PDF format...\n"
     foreach pdf $DOCFILES {
 
-      puts "\nInfo: Processing file $pdf"
+      puts "Info: Processing file $pdf\n"
 
       # Some values are hardcoded because they are related only to PDF generation
       OCCDoc_Main "OVERVIEW" [list $pdf] {} "PDF_ONLY" $VERB_MODE "none" $MATHJAX_LOCATION "NO" $DOXYGEN_PATH $GRAPHVIZ_PATH $INKSCAPE_PATH $HHC_PATH
     }
-    puts "\n[clock format [clock seconds] -format {%Y-%m-%d %H:%M}] Generation completed."
+    puts "[clock format [clock seconds] -format {%Y-%m-%d %H:%M}] Generation completed."
   }
 }
 
@@ -458,31 +465,23 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
   set starttimestamp [clock format [clock seconds] -format {%Y-%m-%d %H:%M}]
 
   if { ($generatorMode == "HTML_ONLY") || ($docType == "REFMAN") } {
-    set LOGPREFIX "html_"
     puts "$starttimestamp Generating HTML files..."
 
     # Copy index file to provide fast access to HTML documentation
     file copy -force $INDIR/resources/index.html $DOCDIR/index.html
   } elseif { $generatorMode == "CHM_ONLY" } {
-    set LOGPREFIX "chm_"
     puts "$starttimestamp Generating CHM file..."
   } elseif { $generatorMode == "PDF_ONLY" } {
-    set LOGPREFIX "[file rootname [file tail [lindex $docfiles 0]]]_"
     puts "$starttimestamp Generating PDF file..."
   }
 
-  # Clean logfiles  
-  set DOXYLOG $OUTDIR/${LOGPREFIX}doxygen_err.log
-  set DOXYOUT $OUTDIR/${LOGPREFIX}doxygen_out.log
-  file delete -force $DOXYLOG
-  file delete -force $DOXYOUT
-
-  set RESULT [catch {exec $DOXYGEN_PATH $DOXYFILE >> $DOXYOUT} DOX_ERROR] 
+  set DOXYLOG $OUTDIR/doxygen_warnings_and_errors.log
+  set RESULT [catch {exec $DOXYGEN_PATH $DOXYFILE >> $OUTDIR/doxygen_out.log} DOX_ERROR] 
   if {$RESULT != 0} {
     set NbErrors [regexp -all -line {^\s*[^\s]+} $DOX_ERROR]
     if {$NbErrors > 0} {
-      puts "Warning: Doxygen reported $NbErrors messages."
-      puts "See log in $DOXYLOG"
+      puts "\nWarning: Doxygen reported $NbErrors messages."
+      puts "See log in $DOXYLOG\n"
       set DOX_ERROR_FILE [open $DOXYLOG "a"]
       if {$generatorMode == "PDF_ONLY"} {
         puts $DOX_ERROR_FILE "\n===================================================="
@@ -504,7 +503,7 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
     if {[OCCDoc_PostProcessor $DOCDIR] == 0} {
       puts "$curtime Generation completed."
       puts "\nInfo: doxygen log file is located in:"
-      puts "${DOXYOUT}."
+      puts "$OUTDIR/doxygen_out.log."
       puts "\nReference Manual is generated in \n$DOCDIR"
     }
   } elseif { $docType == "OVERVIEW" } {
@@ -571,29 +570,25 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
             puts "Info: Executing $LATEXDIR/Makefile..."
           }
         }
-
-        set PDFLOG $OUTDIR/${LOGPREFIX}pdflatex_err.log
-        set PDFOUT $OUTDIR/${LOGPREFIX}pdflatex_out.log
-        file delete -force $PDFLOG
-        file delete -force $PDFOUT
+        set PDFLOG $OUTDIR/pdflatex_warnings_and_errors.log
 
         if {"$is_win" == "yes"} {
-          set RESULT [catch {eval exec [auto_execok $LATEXDIR/make.bat] >> "$PDFOUT"} LaTeX_ERROR]
+          set RESULT [catch {eval exec [auto_execok $LATEXDIR/make.bat] >> "$OUTDIR/pdflatex_out.log"} LaTeX_ERROR]
         } else {
-          set RESULT [catch {eval exec "make -f $LATEXDIR/Makefile" >> "$PDFOUT"} LaTeX_ERROR]
+          set RESULT [catch {eval exec "make -f $LATEXDIR/Makefile" >> "$OUTDIR/pdflatex_out.log"} LaTeX_ERROR]
 
           # Small workaround for *nix stations
           set prev_loc [pwd]
           cd $LATEXDIR
-          set RESULT [catch {eval exec "pdflatex refman.tex" >> "$PDFOUT"} LaTeX_ERROR]
+          set RESULT [catch {eval exec "pdflatex refman.tex" >> "$OUTDIR/pdflatex_out.log"} LaTeX_ERROR]
           cd $prev_loc
         }
 
         if {$RESULT != 0} {
           set NbErrors [regexp -all -line {^\s*[^\s]+} $LaTeX_ERROR]
           if {$NbErrors > 0} {
-            puts "Warning: PDFLaTeX reported $NbErrors messages.\nSee log in $PDFLOG"
-            set LaTeX_ERROR_FILE [open $PDFLOG "a+"]
+            puts "\nWarning: PDFLaTeX reported $NbErrors messages.\nSee log in $PDFLOG\n"
+            set LaTeX_ERROR_FILE [open $PDFLOG "a"]
             puts $LaTeX_ERROR_FILE "\n===================================================="
             puts $LaTeX_ERROR_FILE "Logfile of file $TEX:"
             puts $LaTeX_ERROR_FILE "====================================================\n"
@@ -626,7 +621,6 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
           set TEX "$PDFNAME"
         }
         file rename -force $LATEXDIR/refman.pdf "$destFolder/$TEX.pdf"
-        puts "Generated $destFolder/$TEX.pdf"
       }
     } elseif { $generatorMode == "CHM_ONLY" } {
       if { [OCCDoc_GetProdRootDir] == ""} {
@@ -638,10 +632,13 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
     cd $INDIR
 
     if { $generatorMode == "HTML_ONLY" } {
-      puts "HTML documentation is generated in \n$DOCDIR"
-    } elseif { $generatorMode == "CHM_ONLY" } {
-      puts "Generated CHM documentation is in \n$OUTDIR/overview.chm"
+      puts "\nHTML documentation is generated in \n$DOCDIR"
     }
+    if { $generatorMode == "CHM_ONLY" } {
+      puts "\nGenerated CHM documentation is in \n$OUTDIR/overview.chm"
+    }
+
+    puts ""
   }
 
   # Remove temporary Doxygen files
@@ -650,6 +647,8 @@ proc OCCDoc_Main {docType {docfiles {}} {modules {}} generatorMode verboseMode s
     file delete $file
   }
 
+  puts "\nPDF files are generated in \n[file normalize $OUTDIR]"
+
   return 0
 }
 

adm/genproj.tcl

@@ -1354,7 +1354,6 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
       set aLibsMap(CSF_TclLibs)    ""
       set aFrmsMap(CSF_TclTkLibs)  "Tk"
       set aLibsMap(CSF_TclTkLibs)  ""
-      set aLibsMap(CSF_QT)         "QtCore QtGui"
     } else {
       if { "$theOS" == "qnx" } {
         # CSF_ThreadLibs - pthread API is part of libc on QNX

adm/templates/OpenCASCADEConfig.cmake.in

@@ -61,7 +61,6 @@ set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
 set (OpenCASCADE_WITH_GL2PS     @USE_GL2PS@)
 set (OpenCASCADE_WITH_TBB       @USE_TBB@)
 set (OpenCASCADE_WITH_VTK       @USE_VTK@)
-set (OpenCASCADE_WITH_FFMPEG    @USE_FFMPEG@)
 set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
 @SET_OpenCASCADE_WITH_D3D@
 @SET_OpenCASCADE_WITH_GLX@

adm/templates/custom.build.bat.in

@@ -14,11 +14,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIRS@"
     set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
     set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
-    set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
 
-    if not "@3RDPARTY_QT_DIR@" == "" (
-      set "QTDIR=@3RDPARTY_QT_DIR@"
-    )
     set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
     set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
 

adm/templates/custom.build.sh.in

@@ -12,11 +12,6 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export GL2PS_DIR="@3RDPARTY_GL2PS_LIBRARY_DIRS@"
     export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
     export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
-    export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
-
-    if [ "x@3RDPARTY_QT_DIR" != "x" ]; then
-      export QTDIR="@3RDPARTY_QT_DIR@"
-    fi
 
     export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
     export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"

adm/templates/custom.install.bat.in

@@ -16,11 +16,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIRS@"
     set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
     set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
-    set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
 
-    if not "@USED_3RDPARTY_QT_DIR@" == "" (
-      set "QTDIR=@USED_3RDPARTY_QT_DIR@"
-    )
     set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
     set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
 

adm/templates/custom.install.sh.in

@@ -12,11 +12,6 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIRS@"
     export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
     export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
-    export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
-
-    if [ "x@USED_3RDPARTY_QT_DIR@" != "x" ]; then
-      export QTDIR="@USED_3RDPARTY_QT_DIR@"
-    fi
 
     export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
     export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"

adm/templates/dfbrowser.bat

@@ -1,7 +0,0 @@
-@echo off
-
-rem Setup environment and launch TInspector
-call "%~dp0env.bat" %1 %2 %3
-
-TInspectorEXE.exe --dfbrowser
-

adm/templates/dfbrowser.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-aCurrentPath="$PWD"
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-
-source "${aScriptPath}/env.sh" "$1"
-
-cd ${aCurrentPath}
-TInspectorEXE --dfbrowser

adm/templates/env.bat

@@ -52,56 +52,6 @@ if /I ["%3"]     == ["relwithdeb"] set "CASDEB=i"
 rem Decode VCVER
 call "%~dp0adm\vcver.bat"
 
-rem ----- Parsing of Visual Studio platform -----
-set "VisualStudioExpressName=VCExpress"
-
-if not "%DevEnvDir%" == "" (
-  rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
-) else if /I "%VCFMT%" == "vc10" (
-  set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
-) else if /I "%VCFMT%" == "vc11" (
-  set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
-  rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
-  rem and has a new name for executable - WDExpress
-  set "VisualStudioExpressName=WDExpress"
-) else if /I "%VCFMT%" == "vc12" (
-  set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
-  set "VisualStudioExpressName=WDExpress"
-) else if /I "%VCFMT%" == "vc14" (
-  set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
-) else if /I "%VCFMT%" == "vc141" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
-  )
-) else (
-  echo Error: wrong VS identifier
-  exit /B
-)
-
-rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
-if /I "%VCFMT%" == "vc10" (
-  set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v100"
-) else if /I "%VCFMT%" == "vc11" (
-  set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v110"
-) else if /I "%VCFMT%" == "vc12" (
-  set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v120"
-) else if /I "%VCFMT%" == "vc14" (
-  set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v140"
-) else if /I "%VCFMT%" == "vc141" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  )
-  set "VCPlatformToolSet=v141"
-) else (
-  echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
-  echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
-  exit
-)
-
 set "CSF_OPT_LIB32D=%CSF_OPT_LIB32%"
 set "CSF_OPT_LIB64D=%CSF_OPT_LIB64%"
 set "CSF_OPT_BIN32D=%CSF_OPT_BIN32%"

adm/templates/env.bat.in

@@ -115,8 +115,6 @@ if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
 if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
 if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
 if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
-if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
-if not ["%QTDIR%"] == [""]             set "PATH=%QTDIR%/bin;%PATH%"
 
 rem ----- Set path to 3rd party and OCCT libraries -----
 if not "%CSF_OCCTBinPath%" == "" (

adm/templates/env.sh.in

@@ -66,14 +66,6 @@ if [ "$VTK_DIR" != "" ]; then
   THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
 fi
 
-if [ "$FFMPEG_DIR" != "" ]; then
-  THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$QTDIR" != "" ]; then
-  THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
-fi
-
 if [ "$TK_DIR" != "$TCL_DIR" ]; then
   if [ "$TK_DIR" != "" ]; then
     export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"

adm/templates/msvc.bat

@@ -10,6 +10,35 @@ if not "%4" == "" (
   set "PRJFILE=%4"
 )
 
+set "VisualStudioExpressName=VCExpress"
+
+if not "%DevEnvDir%" == "" (
+  rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
+) else if /I "%VCFMT%" == "vc8" (
+  set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
+) else if /I "%VCFMT%" == "vc9" (
+  set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
+) else if /I "%VCFMT%" == "vc10" (
+  set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
+) else if /I "%VCFMT%" == "vc11" (
+  set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
+  rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
+  rem and has a new name for executable - WDExpress
+  set "VisualStudioExpressName=WDExpress"
+) else if /I "%VCFMT%" == "vc12" (
+  set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
+  set "VisualStudioExpressName=WDExpress"
+) else if /I "%VCFMT%" == "vc14" (
+  set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
+) else if /I "%VCFMT%" == "vc141" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set DevEnvDir=%%i\Common7\IDE
+  )
+) else (
+  echo Error: wrong VS identifier
+  exit /B
+)
+
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
   start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"

adm/templates/template.vc10x

@@ -110,7 +110,6 @@
       <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\..\..\win32\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
-      <AdditionalOptions>/LARGEADDRESSAWARE %(AdditionalOptions)</AdditionalOptions>
       __VCLNKREL__
     </Link>
   </ItemDefinitionGroup>
@@ -156,7 +155,6 @@
       <ProgramDatabaseFile>..\..\..\win32\__VCVER__\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>..\..\..\win32\__VCVER__\libd\__XQTNAM__.lib</ImportLibrary>
-      <AdditionalOptions>/LARGEADDRESSAWARE %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

dox/CMakeLists.txt

@@ -35,7 +35,7 @@ endif()
 # configuration file for doxygen
 set (OCCT_CONFIG_FOR_DOXYGEN "${OCCT_GENERATED_DOC_DIR}/occt.cfg")
 
-set (3RDPARTY_MATHJAX_RELATIVE_PATH "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1")
+set (3RDPARTY_MATHJAX_RELATIVE_PATH "https://cdn.mathjax.org/mathjax/latest")
 
 configure_file ("${OCCT_OVERVIEW_RESOURCE_DIR}/occt_ug_html.doxyfile" "${OCCT_CONFIG_FOR_DOXYGEN}" COPYONLY)
 

dox/dev_guides/documentation/documentation.md

@@ -38,7 +38,7 @@ Follow the instructions to proceed (define proxy settings if needed, select a mi
 **MathJax** is used for rendering math formulas in browser (HTML and CHM outputs): http://www.mathjax.org.
 
 By default MathJAX scripts and fonts work on-line and no installation of MathJAX is necessary if Internet is accessible.
-If you need to use OCCT documentation while off-line, you can install a local copy of MatJAX, see https://docs.mathjax.org/en/v2.7-latest/start.html#installing-your-own-copy-of-mathjax.
+If you need to use OCCT documentation while off-line, you can install a local copy of MatJAX, see https://docs.mathjax.org/en/v2.6-latest/start.html#installing-your-own-copy-of-mathjax.
 See \ref OCCT_DM_SECTION_A_9 for more details on inserting mathematical expressions. 
 
 @section OCCT_DM_SECTION_2_1 Documentation Generation

dox/dev_guides/upgrade/upgrade.md

@@ -1406,7 +1406,3 @@ In previous versions, *IsPeriodic()* always returned false if *IsClosed()* retur
 The history of the changing of the initial shape was corrected:
 * all shapes created by the algorithm are considered as modified shapes instead of generated ones;
 * method Generated was removed and its calls should be replaced by calls of method History()->Modified.
-
-@subsection upgrade_720_Change_In_RWStl Changes in STL Reader / Writer
-
-Class RWStl now uses class Poly_Triangulation for storing triangular mesh instead of StlMesh data classes; the latter have been removed.

dox/overview/overview.md

@@ -135,9 +135,6 @@ by fully automating techniques as precompiled header usage and single compilatio
 Cotire is included in OCCT repository and used optionally by OCCT CMake scripts to accelerate builds by use of precompiled headers.
 Cotire is licensed under the MIT license (https://github.com/sakra/cotire/blob/master/license).
 
-**FFmpeg** is an Open Source framework supporting various image, video and audio codecs.
-FFmpeg is optionally used by OCCT for video recording, on LGPL conditions (https://www.ffmpeg.org/legal.html).
-
 **MikTEX** is up-to-date implementation of TeX/LaTeX and related programs for Windows. It is used 
 for generation of User and Developer Guides in PDF format. See https://miktex.org for information
 on this tool.
@@ -213,7 +210,6 @@ for which OCCT is certified to work.
 | TCL (for testing tools)    | Tcl/Tk 8.6.3+ http://www.tcl.tk/software/tcltk/download.html <br> or ActiveTcl 8.6 http://www.activestate.com/activetcl/downloads (for Windows)| 
 | Freetype (for text rendering) | FreeType 2.4.11-2.5.5 http://sourceforge.net/projects/freetype/files/ |
 | FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.17.0+ http://sourceforge.net/projects/freeimage/files |
-| FFmpeg (optional, for video recording) | FFmpeg 3.1+ https://www.ffmpeg.org |
 | gl2ps (optional, for export contents of OCCT viewer to vector formats) | gl2ps-1.3.8+  http://geuz.org/gl2ps/ |
 | Intel TBB (optional, for multithreaded algorithms) | TBB 4.x or 5.x http://www.threadingbuildingblocks.org/ |
 | VTK (for VTK Integration Services | VTK 6.1+ http://www.vtk.org/VTK/resources/software.html |

dox/resources/occt_pdf_template.tex

@@ -31,7 +31,6 @@
   \fontseries{bc}\selectfont%
   \color{darkgray}%
 }
-\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
 
 % Page & text layout
 \usepackage{geometry}
@@ -51,12 +50,12 @@
 \makeatletter
 \renewcommand{\paragraph}{%
   \@startsection{paragraph}{4}{0ex}{-1.0ex}{1.0ex}{%
-    \normalfont\normalsize\bfseries\SS@parafont%
+\normalfont\normalsize\bfseries\SS@parafont%
   }%
 }
 \renewcommand{\subparagraph}{%
   \@startsection{subparagraph}{5}{0ex}{-1.0ex}{1.0ex}{%
-    \normalfont\normalsize\bfseries\SS@subparafont%
+\normalfont\normalsize\bfseries\SS@subparafont%
   }%
 }
 \makeatother
@@ -108,12 +107,9 @@
 \newcommand{\clearemptydoublepage}{%
   \newpage{\pagestyle{empty}\cleardoublepage}%
 }
-
-
-%===== C O N T E N T S =====
-
+\n
+%===== C O N T E N T S =====\n
 \begin{document}
-
 % Titlepage & ToC
 \hypersetup{pageanchor=false}
 \pagenumbering{roman}

dox/resources/occt_ug_pdf.doxyfile

@@ -41,7 +41,7 @@ GENERATE_TREEVIEW      = NO
 PREDEFINED             = PDF_ONLY
 GENERATE_LATEX         = YES
 COMPACT_LATEX          = YES
-PDF_HYPERLINKS         = YES
+PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = YES
 LATEX_BATCHMODE        = YES
 LATEX_OUTPUT           = latex

dox/user_guides/draw_test_harness/draw_test_harness.md

@@ -391,7 +391,7 @@ puts ;negative;
 Syntax:                  
 
 
-~~~~~
+~~~~~~
 while condition script 
 for init condition reinit script 
 foreach varname list script 
@@ -2506,7 +2506,7 @@ vdimparam dim1 -textvalue "w_1"
 vdimparam dim1 -autovalue
 ~~~~~
 
-@subsubsection occt_draw_4_4_22 vangleparam
+@subsubsection occt_draw_4_4_22 vdimangleparam
 
 Syntax:
 ~~~~~
@@ -2527,29 +2527,7 @@ vfit
 vangleparam dim1 -type exterior -showarrow first
 ~~~~~
 
-@subsubsection occt_draw_4_4_23 vlengthparam
-
-Syntax:
-~~~~~
-vlengthparam name [-type interior|exterior]
-                  [-showarrow first|second|both|none]
-~~~~~
-
-Sets parameters for length dimension **name**.
-
-**Example:** 
-~~~~~
-vinit
-vpoint p1 20 20 0
-vpoint p2 80 80 0
-vdimension dim1 -length -plane xoy -shapes p1 p2
-vtop
-vfit
-vzoom 0.5
-vlengthparam dim1 -direction ox
-~~~~~
-
-@subsubsection occt_draw_4_4_24 vmovedim
+@subsubsection occt_draw_4_4_23 vmovedim
 
 Syntax:
 ~~~~~

dox/user_guides/visualization/visualization.md

@@ -1508,8 +1508,8 @@ Such an object, for example, can be used for displaying the object and stored in
 
 ~~~~~
 // read the data and create a data source
-Handle(Poly_Triangulation) aSTLMesh = RWStl::ReadFile (aFileName);
-Handle(XSDRAWSTLVRML_DataSource) aDataSource = new XSDRAWSTLVRML_DataSource (aSTLMesh);
+Handle  (StlMesh_Mesh) aSTLMesh = RWStl::ReadFile (aFileName); 
+Handle  (XSDRAWSTLVRML_DataSource) aDataSource = new XSDRAWSTLVRML_DataSource (aSTLMesh); 
 
 // create mesh 
 Handle  (MeshVS_Mesh) aMesh = new MeshVS(); 

genconf

@@ -6,10 +6,8 @@
 # initialize environment
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
 if [ ! -e "${aScriptPath}/env.sh" ]; then 
-  cat ${aScriptPath}/adm/templates/env.sh | sed -e '/__CASROOT__/d' > ${aScriptPath}/env.sh
+cat ${aScriptPath}/adm/templates/env.sh | sed -e '/__CASROOT__/d' > ${aScriptPath}/env.sh
 fi
 
-if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi
-
 # run GUI tool
 tclsh "${aScriptPath}/adm/genconf.tcl"

samples/CSharp/msvc.bat

@@ -10,9 +10,9 @@ set "PRJFILE=%~dp0\CSharp.sln"
 
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
   echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)

samples/CSharp/msvc_D3D.bat

@@ -21,9 +21,9 @@ set "PRJFILE=%~dp0\CSharp_D3D.sln"
 
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
   echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)

samples/mfc/standard/msvc.bat

@@ -10,9 +10,9 @@ set "PRJFILE=%~dp0All-%VCFMT%.sln"
 
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCFMT%^)
   echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)

samples/qt/FuncDemo/msvc.bat

@@ -10,9 +10,9 @@ set "PRJFILE=%~dp0FuncDemo.sln"
 
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
   echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)

samples/qt/IESample/msvc.bat

@@ -10,9 +10,9 @@ set "PRJFILE=%~dp0IESample.sln"
 
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
   echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)

samples/qt/Tutorial/msvc.bat

@@ -10,9 +10,9 @@ set "PRJFILE=%~dp0Tutorial.sln"
 
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
-  start "" "%DevEnvDir%\devenv.exe" "%PRJFILE%"
+  start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
 ) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
-  start "" "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
   echo Check relevant environment variable ^(e.g. VS100COMNTOOLS for vc10^)

samples/tools/TInspectorEXE/CMakeLists.txt

@@ -1,5 +0,0 @@
-project(TInspectorEXE)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_tool)
-
-set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER Samples)

samples/tools/TInspectorEXE/EXTERNLIB

@@ -1 +0,0 @@
-TKTInspector

samples/tools/TInspectorEXE/FILES

@@ -1,5 +0,0 @@
-TInspectorEXE.cxx
-TInspectorEXE_OpenFileDialog.cxx
-TInspectorEXE_OpenFileDialog.hxx
-TInspectorEXE_OpenFileViewModel.cxx
-TInspectorEXE_OpenFileViewModel.hxx

samples/tools/TInspectorEXE/TInspectorEXE.cxx

@@ -1,134 +0,0 @@
-// Created on: 2017-06-16
-// Created by: Natalia ERMOLAEVA
-// Copyright (c) 2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement. 
-
-
-#include <OSD_Environment.hxx>
-#include <TInspectorEXE_OpenFileDialog.hxx>
-#include <TInspector_Communicator.hxx>
-
-#include <QAction>
-#include <QApplication>
-#include <QDir>
-#include <QMainWindow>
-#include <QToolBar>
-
-#include <set>
-
-// =======================================================================
-// function : fileNameInDataDir
-// purpose :
-// =======================================================================
-TCollection_AsciiString fileNameInDataDir(const TCollection_AsciiString& theEnvironmentDir,
-                                              const TCollection_AsciiString& theName)
-{
-  OSD_Environment anEnvironment(theEnvironmentDir);
-  
-  TCollection_AsciiString aFileName = anEnvironment.Value();
-  aFileName += TCollection_AsciiString("/") + theName;
-
-  return aFileName;
-}
-
-// =======================================================================
-// function : setPluginSampleDirectory
-// purpose :
-// =======================================================================
-void setPluginSampleDirectory (const TCollection_AsciiString& theName, TInspector_Communicator* theCommunicator,
-                               TInspectorEXE_OpenButton* theButtonControl)
-{
-  if (theName.IsEqual ("TKDFBrowser"))
-  {
-    theCommunicator->OpenFile (theName, fileNameInDataDir ("CSF_OCCTDataPath", "step/screw.step"));
-    theButtonControl->SetPluginDir (theName, fileNameInDataDir ("CSF_OCCTDataPath", "step"));
-  }
-  else if (theName.IsEqual ("TKShapeView"))
-  {
-    theCommunicator->OpenFile (theName, fileNameInDataDir ("CSF_OCCTDataPath", "occ/hammer.brep"));
-    theButtonControl->SetPluginDir (theName, fileNameInDataDir ("CSF_OCCTDataPath", "occ"));
-  }
-  else if (theName.IsEqual ("TKVInspector"))
-  {
-    theCommunicator->OpenFile (theName, fileNameInDataDir ("CSF_OCCTDataPath", "occ/face1.brep"));
-    theCommunicator->OpenFile (theName, fileNameInDataDir ("CSF_OCCTDataPath", "occ/face2.brep"));
-    theButtonControl->SetPluginDir (theName, fileNameInDataDir ("CSF_OCCTDataPath", "occ"));
-  }
-}
-
-// =======================================================================
-// function : main
-// purpose :
-// =======================================================================
-int main (int argc, char** argv)
-{
-  OSD_Environment anEnvironment ("QTDIR");
-  TCollection_AsciiString aPlugindsDirName = anEnvironment.Value();
-  if (aPlugindsDirName.IsEmpty())
-  {
-    std::cout << "QTDIR is not defined" << std::endl;
-    return 0;
-  }
-  aPlugindsDirName += "/plugins";
-  QApplication::addLibraryPath (aPlugindsDirName.ToCString());
-  QApplication anApp (argc, argv);
-
-  std::set<TCollection_AsciiString> aPlugins;
-  for (int anArgId = 1; anArgId < argc; anArgId++ )
-  {
-    if (!strcmp (argv[anArgId], "--dfbrowser"))
-      aPlugins.insert ("TKDFBrowser");
-
-    if (!strcmp (argv[anArgId], "--shapeview"))
-      aPlugins.insert ("TKShapeView");
-
-    if (!strcmp (argv[anArgId], "--vinspector"))
-      aPlugins.insert ("TKVInspector");
-  }
-  NCollection_List<Handle(Standard_Transient)> aParameters;
-
-  // Create tool communicator
-  TInspector_Communicator* aCommunicator = TInspectorEXE_OpenFileDialog::Communicator();
-  if (!aCommunicator)
-  {
-    std::cout << "Communicator can not be created" << std::endl;
-    return 0;
-  }
-
-  TInspectorEXE_OpenButton* aButtonControl = new TInspectorEXE_OpenButton (0);
-  TCollection_AsciiString anActivatedPluginName;
-  if (aPlugins.empty())
-  {
-    aPlugins.insert("TKDFBrowser");
-    aPlugins.insert("TKShapeView");
-    aPlugins.insert("TKVInspector");
-
-    anActivatedPluginName = "TKDFBrowser";
-  }
-  else
-    anActivatedPluginName = *aPlugins.rbegin();
-
-  for (std::set<TCollection_AsciiString>::const_iterator aPluginIt = aPlugins.begin(); aPluginIt != aPlugins.end(); aPluginIt++)
-  {
-    TCollection_AsciiString aName = *aPluginIt;
-    aCommunicator->RegisterPlugin (aName);
-    aCommunicator->Init (aName, aParameters);
-    setPluginSampleDirectory (aName, aCommunicator, aButtonControl);
-  }
-  aCommunicator->Activate (anActivatedPluginName);
-
-  aCommunicator->SetVisible (true);
-  aCommunicator->SetOpenButton (aButtonControl->StartButton());
-
-  return anApp.exec();
-}

samples/tools/TInspectorEXE/TInspectorEXE.qrc

@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-    <qresource>
-        <file>icons/folder_open.png</file>
-        <file>icons/folder_import.png</file>
-    </qresource>
-</RCC>

samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx

@@ -1,311 +0,0 @@
-// Created on: 2017-06-16
-// Created by: Natalia ERMOLAEVA
-// Copyright (c) 2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement. 
-
-#include <TInspectorEXE_OpenFileDialog.hxx>
-
-#include <TInspector_Communicator.hxx>
-#include <TInspectorEXE_OpenFileViewModel.hxx>
-
-#include <QApplication>
-#include <QCompleter>
-#include <QDir>
-#include <QFileDialog>
-#include <QFileSystemModel>
-#include <QItemSelectionModel>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QLabel>
-#include <QLineEdit>
-#include <QScrollBar>
-#include <QTableView>
-#include <QToolButton>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QWidget>
-
-const int FONT_POINT_SIZE = 18;
-const int ICON_SIZE = 40;
-
-const int OPEN_DIALOG_WIDTH = 550;
-const int OPEN_DIALOG_HEIGHT = 200;
-
-const int MARGIN_DIALOG = 4;
-const int SPACING_DIALOG = 2;
-
-TInspector_Communicator* MyCommunicator;
-
-// =======================================================================
-// function : StartButton
-// purpose :
-// =======================================================================
-QPushButton* TInspectorEXE_OpenButton::StartButton()
-{
-  if (!myStartButton)
-  {
-    myStartButton = new QPushButton();
-    myStartButton->setIcon (QIcon (":/icons/folder_open.png"));
-    connect (myStartButton, SIGNAL (clicked()), this, SLOT (onStartButtonClicked()));
-  }
-  return myStartButton;
-}
-
-// =======================================================================
-// function : onStartButtonClicked
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenButton::onStartButtonClicked()
-{
-  QPushButton* aButton = (QPushButton*)sender();
-  TCollection_AsciiString aPluginName (aButton->objectName().toStdString().c_str());
-  if (aPluginName.IsEmpty())
-    return;
-  
-  QString aDataDirName = QDir::currentPath();
-  if (myDefaultDirs.IsBound (aPluginName))
-    aDataDirName = myDefaultDirs.Find (aPluginName).ToCString();
-
-  QString aFileName = TInspectorEXE_OpenFileDialog::OpenFile (0, aDataDirName);
-  aFileName = QDir().toNativeSeparators (aFileName);
-  if (!aFileName.isEmpty()) {
-    QApplication::setOverrideCursor (Qt::WaitCursor);
-    TInspectorEXE_OpenFileDialog::Communicator()->OpenFile (aPluginName, TCollection_AsciiString (aFileName.toUtf8().data()));
-    QApplication::restoreOverrideCursor();
-  }
-}
-
-// =======================================================================
-// function : changeMargins
-// purpose :
-// =======================================================================
-void changeMargins (QBoxLayout* theLayout)
-{
-  theLayout->setContentsMargins (MARGIN_DIALOG, MARGIN_DIALOG, MARGIN_DIALOG, MARGIN_DIALOG);
-  theLayout->setSpacing (SPACING_DIALOG);
-}
-
-// =======================================================================
-// function : Constructor
-// purpose :
-// =======================================================================
-TInspectorEXE_OpenFileDialog::TInspectorEXE_OpenFileDialog (QWidget* theParent, const QString& theDataDirName)
-: QDialog(theParent), myDataDir (theDataDirName)
-{
-  setWindowTitle (theDataDirName);
-
-  QVBoxLayout* aDialogLay = new QVBoxLayout (this);
-  changeMargins (aDialogLay);
-
-  // Title label
-  QLabel* aTitleLabel = new QLabel (this);
-  aTitleLabel->setText (tr ("Open File"));
-  aDialogLay->addWidget (aTitleLabel);
-
-  // Samples View
-  QGroupBox* aSamplesBox = new QGroupBox (this);
-  aSamplesBox->setTitle (tr ("Samples"));
-  aDialogLay->addWidget (aSamplesBox);
-  QVBoxLayout* aSampleLay = new QVBoxLayout (aSamplesBox);
-  changeMargins (aSampleLay);
-  mySamplesView = createTableView (readSampleNames());
-  aSampleLay->addWidget (mySamplesView);
-
-  // Select file
-  QGroupBox* aSelectFileBox = new QGroupBox (this);
-  aSelectFileBox->setTitle (tr ("Select file"));
-  aDialogLay->addWidget (aSelectFileBox);
-  QGridLayout* aSelectFileLay = new QGridLayout (aSelectFileBox);
-  aSelectFileLay->setContentsMargins (MARGIN_DIALOG, MARGIN_DIALOG, MARGIN_DIALOG, MARGIN_DIALOG);
-
-  mySelectedName = new QLineEdit (aSelectFileBox);
-  QCompleter* aCompleter = new QCompleter();
-  QFileSystemModel* aFileSystemModel = new QFileSystemModel;
-  aFileSystemModel->setRootPath (QDir::rootPath());
-  aCompleter->setModel (aFileSystemModel);
-  mySelectedName->setCompleter (aCompleter);
-  aSelectFileLay->addWidget (mySelectedName, 1, 0);
-
-  QToolButton* aSelectFileBtn = new QToolButton (aSelectFileBox);
-  aSelectFileBtn->setIcon (QIcon (":/icons/folder_open.png"));
-  aSelectFileLay->addWidget (aSelectFileBtn, 1, 1);
-
-  myFolderApplyOpen = new QToolButton (aSelectFileBox);
-  myFolderApplyOpen->setIcon (QIcon (":/icons/folder_import.png"));
-  myFolderApplyOpen->setIconSize (QSize (ICON_SIZE, ICON_SIZE));
-  myFolderApplyOpen->setEnabled (false);
-  aSelectFileLay->addWidget (myFolderApplyOpen, 0, 2, 2, 1);
-
-  connect (mySelectedName, SIGNAL (textChanged (const QString&)),
-           this, SLOT (onNameChanged (const QString&)));
-  connect (aSelectFileBtn, SIGNAL (clicked()), this, SLOT (onSelectClicked()));
-  connect (myFolderApplyOpen, SIGNAL (clicked()), this, SLOT (onApplySelectClicked()));
-
-  resize (OPEN_DIALOG_WIDTH, OPEN_DIALOG_HEIGHT);
-}
-
-// =======================================================================
-// function : OpenFile
-// purpose :
-// =======================================================================
-QString TInspectorEXE_OpenFileDialog::OpenFile (QWidget* theParent, const QString& theDataDirName)
-{
-  QString aFileName;
-  TInspectorEXE_OpenFileDialog* aDialog = new TInspectorEXE_OpenFileDialog(theParent, theDataDirName);
-  if (aDialog->exec() == QDialog::Accepted)
-    aFileName = aDialog->GetFileName();
-
-  return aFileName;
-}
-
-// =======================================================================
-// function : Communicator
-// purpose :
-// =======================================================================
-TInspector_Communicator* TInspectorEXE_OpenFileDialog::Communicator()
-{
-  if (!MyCommunicator)
-    MyCommunicator = new TInspector_Communicator();
-  return MyCommunicator;
-}
-
-// =======================================================================
-// function : onSampleSelectionChanged
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenFileDialog::onSampleSelectionChanged (const QItemSelection& theSelected,
-                                                             const QItemSelection&)
-{
-  QItemSelectionModel* aSelectionModel = (QItemSelectionModel*)sender();
-  if (!aSelectionModel)
-    return;
-  if (theSelected.isEmpty())
-    return;
-
-  QModelIndex anIndex = theSelected.first().indexes().first();
-  if (!anIndex.isValid())
-    return;
-
-  myFileName = aSelectionModel->model()->data (anIndex, Qt::ToolTipRole).toString();
-  accept();
-}
-
-// =======================================================================
-// function : onNameChanged
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenFileDialog::onNameChanged (const QString& theText)
-{
-  QFileInfo aFileInfo (theText);
-  bool anExists = aFileInfo.exists() && aFileInfo.isFile();
-  myFolderApplyOpen->setEnabled (anExists);
-}
-
-// =======================================================================
-// function : onSelectClicked
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenFileDialog::onSelectClicked()
-{
-  QString anEnteredPath;
-  QString aDirName = mySelectedName->text();
-  if (!aDirName.isEmpty())
-  {
-    QDir aDir (aDirName);
-    if (aDir.exists())
-      anEnteredPath = aDirName;
-  }
-
-  QString aFileName = QFileDialog::getOpenFileName (0, "Open document", anEnteredPath);
-
-  if (aFileName.isEmpty())
-    return; // do nothing, left the previous value
-
-  mySelectedName->setText (aFileName);
-  onNameChanged (aFileName);
-}
-
-// =======================================================================
-// function : onApplySelectClicked
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenFileDialog::onApplySelectClicked()
-{
-  myFileName = mySelectedName->text();
-  accept();
-}
-
-// =======================================================================
-// function : createTableView
-// purpose :
-// =======================================================================
-QTableView* TInspectorEXE_OpenFileDialog::createTableView (const QStringList& theFileNames)
-{
-  QTableView* aTableView = new QTableView (this);
-  aTableView->setFrameStyle (QFrame::NoFrame);
-  QPalette aPalette = aTableView->viewport()->palette();
-  QColor aWindowColor = aPalette.color (QPalette::Window);
-  aPalette.setBrush (QPalette::Base, aWindowColor);
-  aTableView->viewport()->setPalette (aPalette);
-
-  aTableView->horizontalHeader()->setVisible (false);
-  aTableView->verticalHeader()->setVisible (false);
-  aTableView->setGridStyle (Qt::NoPen);
-  aTableView->setModel (createModel (theFileNames));
-  aTableView->setItemDelegateForRow (0, new TInspectorEXE_OpenFileItemDelegate (aTableView,
-                                                          aPalette.color (QPalette::Highlight)));
-  aTableView->viewport()->setAttribute (Qt::WA_Hover);
-  int aCellHeight = ICON_SIZE + aTableView->verticalHeader()->defaultSectionSize();
-  aTableView->setRowHeight (0, aCellHeight);
-  int aScrollHeight = aTableView->horizontalScrollBar()->sizeHint().height();
-  aTableView->setMinimumHeight (aCellHeight + aScrollHeight);
-  QItemSelectionModel* aSelectionModel = new QItemSelectionModel (aTableView->model());
-  connect (aSelectionModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)),
-           this, SLOT (onSampleSelectionChanged (const QItemSelection&, const QItemSelection&)));
-  aTableView->setSelectionModel (aSelectionModel);
-
-  return aTableView;
-}
-
-// =======================================================================
-// function : createModel
-// purpose :
-// =======================================================================
-QAbstractItemModel* TInspectorEXE_OpenFileDialog::createModel (const QStringList& theFileNames)
-{
-  TInspectorEXE_OpenFileViewModel* aModel = new TInspectorEXE_OpenFileViewModel (this);
-  aModel->Init (theFileNames);
-  return aModel;
-}
-
-// =======================================================================
-// function : readSampleNames
-// purpose :
-// =======================================================================
-QStringList TInspectorEXE_OpenFileDialog::readSampleNames()
-{
-  QStringList aNames;
-
-  QDir aDir(myDataDir);
-  aDir.setSorting(QDir::Name);
-
-  QFileInfoList aDirEntries = aDir.entryInfoList();
-  for (int aDirId = 0; aDirId < aDirEntries.size(); ++aDirId)
-  {
-    QFileInfo aFileInfo = aDirEntries.at(aDirId);
-    if (aFileInfo.isFile())
-      aNames.append (aFileInfo.absoluteFilePath());
-  }
-  return aNames;
-}

samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.hxx

@@ -1,143 +0,0 @@
-// Created on: 2017-06-16
-// Created by: Natalia ERMOLAEVA
-// Copyright (c) 2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement. 
-
-#ifndef TInspectorEXE_OpenFileDialog_H
-#define TInspectorEXE_OpenFileDialog_H
-
-#include <NCollection_DataMap.hxx>
-#include <TCollection_AsciiString.hxx>
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-#include <QDialog>
-#include <QItemSelection>
-#include <QStringList>
-
-#include <map>
-
-class TInspector_Communicator;
-
-class QAbstractItemModel;
-class QLineEdit;
-class QPushButton;
-class QTableView;
-class QToolButton;
-class QWidget;
-
-//! \class TInspectorEXE_OpenButton
-//! Class that contains push button and the button processing. It obtains a file name from the default or current
-//! directory and gives the name into TInspector communicator
-//! Object name of the button is the name of the plugin to get the default directory, or the current directory is used.
-class TInspectorEXE_OpenButton : public QObject
-{
-  Q_OBJECT
-
-public:
-
-  //! Constructor
-  TInspectorEXE_OpenButton (QObject* theParent) : QObject (theParent), myStartButton (0) {}
-
-  //! Destructor
-  virtual ~TInspectorEXE_OpenButton() {}
-
-  //! Returns the start button, if this is the first call, it creates the button and connect it to the slot
-  QPushButton* StartButton();
-
-  //! Sets the default directory of plugin.
-  void SetPluginDir (const TCollection_AsciiString& thePluginName, const TCollection_AsciiString& theDefaultDir)
-  { myDefaultDirs.Bind (thePluginName, theDefaultDir); }
-
-private slots:
-
-  //! Processes the button click, open default/current directory to select open file, calls OpenFile of communicator
-  void onStartButtonClicked();
-
-private:
-
-  QPushButton* myStartButton; //!< processed button
-  NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString> myDefaultDirs; //!< plugins default directories
-};
-
-//! \class TInspectorEXE_OpenFileDialog
-//! Control that contains table view of samples and line to select a file name from other directory.
-//! Click on element of samples table view calls this sample opening else after entering(or opening) file name
-//! the import becomes active. Click on the button will open selected file if it is possible
-class TInspectorEXE_OpenFileDialog : public QDialog
-{
-  Q_OBJECT
-private:
-
-  //! Constructor
-  TInspectorEXE_OpenFileDialog (QWidget* theParent, const QString& theDataDirName);
-
-public:
-
-  //! Destructor
-  virtual ~TInspectorEXE_OpenFileDialog() Standard_OVERRIDE {}
-
-  //! Opens this file dialog using for samples view the given directory and try to open new file
-  //! \param theParent a parent for the new dialog
-  //! \param theDataDirName path to default samples directory
-  //! \returns a file name from the open file dialog
-  static QString OpenFile (QWidget* theParent, const QString& theDataDirName);
-
-  //! Returns selection name from the dialog
-  QString GetFileName() const { return myFileName; }
-
-  //! Returns communicator, if this is the first call, create a communicator instance
-  static TInspector_Communicator* Communicator();
-
-private slots:
-
-  //! Stores name of selected sample file
-  void onSampleSelectionChanged (const QItemSelection& theSelected, const QItemSelection& theDeselected);
-
-  //! Updates enabling state of Open file button, it is enabled if the file by the entered path exists
-  //! \param theText a file name text in line edit
-  void onNameChanged (const QString& theText);
-
-  //! Open file dialog to select a file name. Fills file name line, enable import button
-  void onSelectClicked();
-
-  //! Accepts open file dialog
-  void onApplySelectClicked();
-
-private:
-
-  //! Creates view of file names in samples directory
-  //! \param theFileNames a container of names
-  //! \return table view
-  QTableView* createTableView (const QStringList& theFileNames);
-
-  //! Creates view model and fills it by the file names
-  //! \param theFileNames a container of names
-  //! \return model
-  QAbstractItemModel* createModel (const QStringList& theFileNames);
-
-  //! Generates container of file names in samples directory
-  //! \return container of names
-  QStringList readSampleNames();
-
-private:
-
-  QString myDataDir; //!< samples directory
-  QString myFileName; //!< result file name
-  QTableView* mySamplesView; //! <view of sample file names
-  QLineEdit* mySelectedName; //!< alternative control to open file
-  QToolButton* myFolderApplyOpen; //! button to open file
-};
-
-#endif

samples/tools/TInspectorEXE/TInspectorEXE_OpenFileViewModel.cxx

@@ -1,75 +0,0 @@
-// Created on: 2017-06-16
-// Created by: Natalia ERMOLAEVA
-// Copyright (c) 2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement. 
-
-#include <TInspectorEXE_OpenFileViewModel.hxx>
-
-#include <QApplication>
-#include <QFileInfo>
-#include <QIcon>
-#include <QPainter>
-
-const int ICON_SIZE = 40;
-
-// =======================================================================
-// function : paint
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenFileItemDelegate::paint (QPainter* thePainter, const QStyleOptionViewItem& theOption,
-                                                const QModelIndex& theIndex) const
-{
-  // highlight cell
-  if (theOption.state & QStyle::State_MouseOver)
-    thePainter->fillRect (theOption.rect, myColor);
-
-  // action icon for all indices before the last one
-  QIcon anIcon (":/icons/folder_import.png");
-  QSize anIconSize (ICON_SIZE, ICON_SIZE);
-  int aWidth = theOption.rect.width();
-  int aCenter = aWidth / 2.;
-  int aHalf = anIconSize.width() / 2.;
-  int aMargin = qApp->style()->pixelMetric (QStyle::PM_HeaderMargin);
-  thePainter->drawPixmap (QRect (theOption.rect.left() + (aCenter - aHalf),
-                          theOption.rect.top() + aMargin,
-                          anIconSize.width(),
-                          anIconSize.height()),
-                          anIcon.pixmap(anIconSize.width(), anIconSize.height()));
-  // default paint
-  QItemDelegate::paint (thePainter, theOption, theIndex);
-}
-
-// =======================================================================
-// function : Init
-// purpose :
-// =======================================================================
-void TInspectorEXE_OpenFileViewModel::Init (const QStringList& theValues)
-{
-  myValues = theValues;
-}
-
-// =======================================================================
-// function : data
-// purpose :
-// =======================================================================
-QVariant TInspectorEXE_OpenFileViewModel::data (const QModelIndex& theIndex, int theRole) const
-{
-  switch (theRole)
-  {
-    case Qt::DisplayRole: return QFileInfo (myValues[theIndex.column()]).fileName();
-    case Qt::ToolTipRole: return myValues[theIndex.column()];
-    case Qt::TextAlignmentRole: return QVariant (Qt::AlignBottom | Qt::AlignHCenter);
-    default: break;
-  }
-  return QVariant();
-}

samples/tools/TInspectorEXE/TInspectorEXE_OpenFileViewModel.hxx

@@ -1,99 +0,0 @@
-// Created on: 2017-06-16
-// Created by: Natalia ERMOLAEVA
-// Copyright (c) 2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement. 
-
-#ifndef TInspectorEXE_OpenFileViewModel_H
-#define TInspectorEXE_OpenFileViewModel_H
-
-#include <Standard_Macro.hxx>
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif
-#include <QAbstractTableModel>
-#include <QStringList>
-#include <QItemDelegate>
-
-class QObject;
-class QPainter;
-
-//! \class TInspectorEXE_OpenFileItemDelegate
-//! Draws large(40x40) icons in cell. The icon background in colored in highlight when mouse is over button
-class TInspectorEXE_OpenFileItemDelegate : public QItemDelegate
-{
-
-public:
-
-  //! Constructor
-  TInspectorEXE_OpenFileItemDelegate (QObject* theParent, const QColor& theHighlightColor)
-  : QItemDelegate (theParent), myColor(theHighlightColor) {}
-
-  //! Destructor
-  virtual ~TInspectorEXE_OpenFileItemDelegate() {}
-
-  //! Draw an icon in the cell
-  //! \param thePainter a painter
-  //! \param theOption a paint options
-  //! \param theIndex a view index
-  virtual void paint (QPainter* thePainter, const QStyleOptionViewItem& theOption,
-                      const QModelIndex& theIndex) const Standard_OVERRIDE;
-
-private:
-
-  QColor myColor; //!< highlight color
-};
-
-//! \class TInspectorEXE_OpenFileViewModel
-//! Table model that visualizes container of string values (file names)
-//! Table orientation is horizontal, it has 1 row, number of columns equals to number of values
-class TInspectorEXE_OpenFileViewModel : public QAbstractTableModel
-{
-
-public:
-
-  //! Constructor
-  TInspectorEXE_OpenFileViewModel (QObject* theParent = 0) : QAbstractTableModel (theParent) {}
-
-  //! Destructor
-  virtual ~TInspectorEXE_OpenFileViewModel() {}
-
-  //! Store values
-  //! \param theValues a container of values to fill model
-  void Init (const QStringList& theValues);
-
-  //! Returns content of the model index for the given role, it is obtained from internal container of values
-  //! It returns value only for DisplayRole.
-  //! \param theIndex a model index
-  //! \param theRole a view role
-  //! \return value intepreted depending on the given role
-  virtual QVariant data (const QModelIndex& theIndex, int theRole = Qt::DisplayRole) const Standard_OVERRIDE;
-
-  //! Returns number of rows
-  //! \param theParent an index of the parent item
-  //! \return an integer value
-  virtual int rowCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE
-  { (void)theParent; return 1; }
-
-  //! Returns number of columns
-  //! \param theParent an index of the parent item
-  //! \return an integer value
-  virtual int columnCount (const QModelIndex& theParent = QModelIndex()) const Standard_OVERRIDE
-  { (void)theParent; return myValues.size(); }
-
-private:
-
-  QStringList myValues; //!< file names
-};
-
-#endif

samples/tools/TStandalone/CMakeLists.txt

@@ -1,127 +0,0 @@
-cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-project (TStandalone)
-
-set (CASROOT "" CACHE PATH "Third party OpenCascade dir" )
-set (3RDPARTY_DIR "" CACHE PATH "Third party dir" )
-set (INSTALL_DIR "" CACHE PATH "Where to install" )
-
-set (USE_QT4 ON CACHE BOOL "${USE_QT4}")
-
-if (NOT "$ENV{CASROOT}" STREQUAL "" AND EXISTS "$ENV{CASROOT}")
-  set (CASROOT "$ENV{CASROOT}")
-  #set (3RDPARTY_OCCT_DIR "${CASROOT}")
-  #message("Environment CASROOT: ${CASROOT}")
-  #message("Environment 3RDPARTY_OCCT_DIR: ${CASROOT}")
-endif()
-
-if (NOT "$ENV{THIRDPARTY_DIR}" STREQUAL ""  AND EXISTS "$ENV{THIRDPARTY_DIR}")
-  set (3RDPARTY_DIR "$ENV{THIRDPARTY_DIR}")
-  message("Environment THIRDPARTY_DIR: ${3RDPARTY_DIR}")
-endif()
-
-if (NOT "$ENV{INSTALL_DIR}" STREQUAL "")
-  set (INSTALL_DIR "$ENV{INSTALL_DIR}")
-  message("Environment INSTALL_DIR: ${INSTALL_DIR}")
-endif()
-
-# Define the next variable to has defined 3rdParties DLL dir variables
-set (BUILD_SHARED_LIBS ON)
-
-set (CASROOT_SOURCE_FILES "${CMAKE_SOURCE_DIR}/../../.."  CACHE PATH "OCCT sources dir to find tools packages" )
-if ("${CASROOT}" STREQUAL "")
-  set (CASROOT "${CASROOT_SOURCE_FILES}/work/install"  CACHE PATH "OCCT sources dir to find tools packages" )
-endif()
-
-macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
-  include (${CASROOT_SOURCE_FILES}/${BEING_INCLUDED_FILE}.cmake)
-endmacro()
-
-macro (OCCT_INCLUDE_CMAKE_FILE_STANDALONE BEING_INCLUDED_FILE)
-  include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake)
-endmacro()
-
-set (ADDITIONAL_DLL_DIR "" CACHE PATH "Additional paths that should be included into PATH" )
-if (NOT "$ENV{ADDITIONAL_DLL_DIR}" STREQUAL "")
-  set (ADDITIONAL_DLL_DIR "$ENV{ADDITIONAL_DLL_DIR}")
-  message("Environment ADDITIONAL_DLL_DIR: ${ADDITIONAL_DLL_DIR}")
-endif()
-
-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE("adm/cmake/occt")
-if (OCCT_LIBRARY_NOT_FOUND)
-  message (FATAL_ERROR "Could NOT find OCCT Library in : ${3RDPARTY_OCCT_LIBRARY_DIR}" )
-endif()
-
-OCCT_MAKE_OS_WITH_BITNESS()
-OCCT_MAKE_COMPILER_SHORT_NAME()
-
-set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
-set (INSTALL_API_DIR "${INSTALL_DIR}/api" CACHE PATH "" FORCE)
-set (INSTALL_DIR_BIN "${OS_WITH_BIT}/${COMPILER}/bin" CACHE PATH "" FORCE)
-set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "" FORCE)
-set (INSTALL_DIR_INCLUDE "inc" CACHE PATH "")
-
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gl2ps")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt5")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-#include (${CMAKE_SOURCE_DIR}/adm/cmake/3rdparty.cmake)
-
-set (3RDPARTY_DLL_PATH "${USED_3RDPARTY_OCCT_DIRS};\
-${USED_3RDPARTY_FREETYPE_DIR};\
-${USED_3RDPARTY_FREEIMAGE_DIRS};\
-${USED_3RDPARTY_GL2PS_DIRS};\
-${3RDPARTY_QT_DIR}/bin;\
-${3RDPARTY_TBB_DLL_DIR}")
-
-if (ADDITIONAL_DLL_DIR)
-  set (3RDPARTY_DLL_PATH "${3RDPARTY_DLL_PATH};\
-${ADDITIONAL_DLL_DIR}")
-endif()
-
-set (3RDPARTY_DLL_DEB_PATH "${3RDPARTY_DLL_PATH}")
-
-
-set (BUILD_TOOLKITS
-  TKTInspectorAPI
-  TKView
-  TKTreeModel
-  TKDFBrowser
-  TKVInspector
-  TKShapeView
-  TKTInspector
-  TKToolsDraw
-)
-
-string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all header files into ${CMAKE_BINARY_DIR}/inc ...")
-# collect all the headers to <binary dir>/inc folder
-COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}" "${CASROOT_SOURCE_FILES}/tools" "${INSTALL_DIR_INCLUDE}")
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/standalone_macros")
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt5_macro")
-
-set (BUILD_PROJECTS
-  TInspectorAPI
-  View
-  TreeModel
-  DFBrowserPane
-  DFBrowserPaneXDE
-  DFBrowser
-  ShapeView
-  VInspector
-  TInspector
-  TInspectorEXE
-  ToolsDraw
-)
-# include patched toolkit projects or original ones
-foreach (PROJECT_ITEM ${BUILD_PROJECTS})
-  OCCT_ADD_SUBDIRECTORY ("src/${PROJECT_ITEM}")
-endforeach()

samples/tools/TStandalone/adm/cmake/occt.cmake

@@ -1,75 +0,0 @@
-#freeimage
-
-if(NOT "${CASROOT}" STREQUAL "")
-  #message(FATAL_ERROR, "Empty OCCT dir")
-  #return()
-  #set("3RDPARTY_OCCT_DIR ${CASROOT}")
-endif()
-
-#set(3RDPARTY_OCC_DIR ${CASROOT})
-#message("3RDPARTY_OCC_DIR: ${3RDPARTY_OCC_DIR}")
-#set("3RDPARTY_OCC_DIR ${3RDPARTY_OCCT_DIR}")
-#message("3RDPARTY_OCC_DIR: ${3RDPARTY_OCC_DIR}")
-
-set(CSF_TKernel "TKernel")
-THIRDPARTY_PRODUCT("OCCT" "Standard.hxx" "CSF_TKernel" "")
-
-set(3RDPARTY_OCCT_DIR ${3RDPARTY_OCC_DIR} CACHE PATH "OCCT dir")
-
-OCCT_MAKE_OS_WITH_BITNESS()
-OCCT_MAKE_COMPILER_SHORT_NAME()
-
-SET(3RDPARTY_OCCT_INCLUDE_DIR "${3RDPARTY_OCC_INCLUDE_DIR}" CACHE PATH "OCCT include dir")
-SET(3RDPARTY_OCCT_LIBRARY_DIR "${3RDPARTY_OCC_LIBRARY_DIR}" CACHE PATH "OCCT library dir")
-SET(3RDPARTY_OCCT_DLL_DIR "${3RDPARTY_OCC_DLL_DIR}" CACHE PATH "OCCT dll dir")
-
-SET(CSF_StandardDefaults_DIR ${CASROOT}/src/StdResource CACHE PATH "OCCT Standard Resource")
-SET(CSF_XCAFDefaults_DIR ${CASROOT}/src/StdResource CACHE PATH "OCCT XCAF Defaults")
-SET(CSF_PluginDefaults_DIR ${CASROOT}/src/StdResource CACHE PATH "OCCT Plugin Defaults")
-
-message (STATUS "... OCCT dir: ${3RDPARTY_OCCT_DIR}")
-message (STATUS "... OCCT Include dirs: ${3RDPARTY_OCCT_INCLUDE_DIR}")
-message (STATUS "... OCCT Library dirs: ${3RDPARTY_OCCT_LIBRARY_DIRS}")
-message (STATUS "... OCCT Binary  dirs: ${3RDPARTY_OCCT_DLL_DIRS}")
-
-SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${3RDPARTY_OCCT_LIBRARY_DIRS}")
-
-find_library(TKernel TKernel PATHS "${3RDPARTY_OCCT_LIBRARY_DIRS}"
-                             PATH_SUFFIXES lib
-                             NO_DEFAULT_PATH)
-
-if ("${TKernel}" STREQUAL "TKernel-NOTFOUND")
-  set (OCCT_LIBRARY_NOT_FOUND ON)
-endif()
-
-find_library(TKMath TKMath)
-
-find_library(TKCAF TKCAF)
-find_library(TKCDF TKCDF)
-find_library(TKLCAF TKLCAF)
-find_library(TKVCAF TKVCAF)
-
-find_library(TKBRep TKBRep)
-find_library(TKService TKService)
-
-find_library(TKOpenGl TKOpenGl)
-find_library(TKV3d TKV3d)
-
-find_library(TKXCAF TKXCAF)
-find_library(TKXSBase TKXSBase)
-find_library(TKXDESTEP TKXDESTEP)
-find_library(TKXmlXCAF TKXmlXCAF)
-find_library(TKXml TKXml)
-
-find_library(TKBin TKBin)
-find_library(TKBinL TKBinL)
-find_library(TKBinXCAF TKBinXCAF)
-
-find_library(TKStd TKStd)
-find_library(TKXmlL TKXmlL)
-find_library(TKStdL TKStdL)
-# VInspector additionally:
-find_library(TKBO TKBO)
-# ShapeView additionally:
-find_library(TKGeomBase TKGeomBase)
-find_library(TKG3d TKG3d)

samples/tools/TStandalone/adm/cmake/occt_toolkit_standalone.cmake

@@ -1,115 +0,0 @@
-# script for each OCCT toolkit
-
-#Qt dependencies
-#message ("Project is ${PROJECT_NAME}")
-if (EXECUTABLE_PROJECT)
-  set (PACKAGE_PREFIX_DIR "samples/tools")
-  SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}/../${PROJECT_NAME})
-  include_directories("${SOURCE_DIR}")
-  #message("Inc dir: ${CMAKE_SOURCE_DIR}/../${PROJECT_NAME}")
-else()
-  set (PACKAGE_PREFIX_DIR "tools")
-  SET(SOURCE_DIR ${CASROOT_SOURCE_FILES}/${PACKAGE_PREFIX_DIR}/${PROJECT_NAME})
-endif()
-
-FIND_SOURCES_AND_HEADERS_FILES(${SOURCE_DIR} SOURCE_FILES HEADER_FILES)
-
-#message ("Source dir is ${SOURCE_DIR}")
-#message ("Sources are ${SOURCE_FILES}")
-
-unset(RCC_FILES)
-if (USE_QT)
-  FIND_QT5_PACKAGE(PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-
-  FIND_AND_WRAP_MOC_FILES("${SOURCE_FILES}")
-  FIND_AND_WRAP_RESOURCE_FILE("${SOURCE_DIR}/${PROJECT_NAME}.qrc" RCC_FILES)
-
-endif()
-
-if (TOOLKIT_NAME)
-  set(TARGET_NAME TK${PROJECT_NAME})
-else ()
-  set(TARGET_NAME ${PROJECT_NAME})
-endif()
-
-if (EXECUTABLE_PROJECT)
-  add_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-else()
-  add_library(${TARGET_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES})
-endif()
-
-
-include_directories(
-  ${PROJECT_INCLUDES}
-  ${SOURCE_DIR}
-  ${3RDPARTY_OCCT_INCLUDE_DIR}
- "${CMAKE_BINARY_DIR}/inc")
-
-add_definitions(-D__WIN32__)
-add_definitions(-DWNT)
-add_definitions(-D${PROJECT_NAME}_EXPORTS)
-
-# parce EXTERNLIB file
-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)
-    set (LIB_ITEM ${USED_ITEM})
-    set (LIB_PARSED_ITEM ${${USED_ITEM}})
-
-    if (LIB_PARSED_ITEM)
-      list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${${USED_ITEM}})
-      #message("Append external lib: ${${USED_ITEM}}")
-    else ()
-      list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
-      #message("Append lib: ${USED_ITEM}")
-    endif()
-
-  endif()
-endforeach()
-
-
-target_link_libraries (${TARGET_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT})
-
-if (USE_QT)
-  target_link_libraries (${TARGET_NAME} debug ${PROJECT_LIBRARIES_DEBUG})
-  target_link_libraries (${TARGET_NAME} optimized ${PROJECT_LIBRARIES_RELEASE})
-
-  if (NOT "${RCC_FILES}" STREQUAL "")
-    #message("RCC files: ${RCC_FILES}")
-    target_sources(${TARGET_NAME} PRIVATE ${RCC_FILES})
-  endif()
-endif()
-
-if (EXECUTABLE_PROJECT)
-  INSTALL(TARGETS ${TARGET_NAME} DESTINATION "${INSTALL_DIR_BIN}")
-else()
-  if (MSVC)
-    install (DIRECTORY  ${PROJECT_BINARY_DIR}/Debug/
-             DESTINATION "${INSTALL_DIR_BIN}"
-             FILES_MATCHING PATTERN *.pdb)
-    if (INSTALL_API_DIR)
-      install (DIRECTORY  ${PROJECT_BINARY_DIR}/Debug/
-               DESTINATION "${INSTALL_API_DIR}/bin"
-               FILES_MATCHING PATTERN *.pdb)
-    endif()
-  endif()
-  install (TARGETS ${TARGET_NAME}
-           RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
-           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
-           LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
-
-  if (INSTALL_API_DIR)
-    install (TARGETS ${TARGET_NAME}
-             RUNTIME DESTINATION "${INSTALL_API_DIR}/bin")
-
-    if (INSTALL_API)
-      INSTALL(FILES ${HEADER_FILES} DESTINATION "${INSTALL_API_DIR}/${INSTALL_DIR_INCLUDE}")
-    
-      install (DIRECTORY  ${PROJECT_BINARY_DIR}/Debug/
-               DESTINATION "${INSTALL_API_DIR}/lib"
-               FILES_MATCHING PATTERN *.lib)
-    endif()
-  endif()
-
-endif()

samples/tools/TStandalone/adm/cmake/standalone_macros.cmake

@@ -1,33 +0,0 @@
-#freeimage
-
-macro (FIND_SOURCES_AND_HEADERS_FILES CURRENT_SOURCES_DIR SOURCE_FILES HEADER_FILES)
-  if (EXISTS "${CURRENT_SOURCES_DIR}/FILES")
-    file (STRINGS "${CURRENT_SOURCES_DIR}/FILES" HEADER_FILES_H REGEX ".+[.]h")
-    file (STRINGS "${CURRENT_SOURCES_DIR}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
-
-    if (NOT "${HEADER_FILES_H}" STREQUAL "")
-      foreach (ORIGIN_FILE ${HEADER_FILES_H})
-        list (APPEND HEADER_FILES_ ${CURRENT_SOURCES_DIR}/${ORIGIN_FILE})
-      endforeach()
-
-      #message("${HEADER_FILES_}")
-      set(${HEADER_FILES} ${HEADER_FILES_})
-    endif()
-
-    if(NOT "${SOURCE_FILES_C}" STREQUAL "")
-      foreach (ORIGIN_FILE ${SOURCE_FILES_C})
-        list (APPEND SOURCE_FILES_ ${CURRENT_SOURCES_DIR}/${ORIGIN_FILE})
-      endforeach()
-
-      #message("${SOURCE_FILES_}")
-      set(${SOURCE_FILES} ${SOURCE_FILES_})
-    endif()
-
-    #set(${HEADER_FILES} ${HEADER_FILES_H})
-    #set(${SOURCE_FILES} ${SOURCE_FILES_C})
-
-  else()
-    message(WARNING "file FILES is absent in $TARGET")
-  endif()
-
-endmacro()

samples/tools/TStandalone/adm/templates/TInspectorEXE.vcxproj.user.in

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <LocalDebuggerEnvironment>PATH=@3RDPARTY_DLL_DEB_PATH@;@CMAKE_INSTALL_PREFIX@/@INSTALL_DIR_BIN@;%PATH%
-DATA_DIR=@INSTALL_DIR@/data
-QTDIR=@3RDPARTY_QT_DIR@
-CSF_OCCTDataPath=@3RDPARTY_OCCT_DIR@/data
-    </LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <LocalDebuggerEnvironment>PATH=@3RDPARTY_DLL_DEB_PATH@;@CMAKE_INSTALL_PREFIX@/@INSTALL_DIR_BIN@;%PATH%
-DATA_DIR=@INSTALL_DIR@/data
-QTDIR=@3RDPARTY_QT_DIR@
-CSF_OCCTDataPath=@3RDPARTY_OCCT_DIR@/data
-    </LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <LocalDebuggerEnvironment>PATH=@3RDPARTY_DLL_DEB_PATH@;@CMAKE_INSTALL_PREFIX@/@INSTALL_DIR_BIN@;%PATH%
-DATA_DIR=@INSTALL_DIR@/data
-QTDIR=@3RDPARTY_QT_DIR@
-CSF_OCCTDataPath=@3RDPARTY_OCCT_DIR@/data
-CSF_ShadersDirectory=@CASROOT@/src/Shaders
-    </LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
-  </PropertyGroup>
-</Project>

samples/tools/TStandalone/adm/templates/header.in

@@ -1 +0,0 @@
-@OCCT_HEADER_FILE_CONTENT@

samples/tools/TStandalone/src/DFBrowser/CMakeLists.txt

@@ -1,11 +0,0 @@
-project(DFBrowser)
-
-ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-
-set (USE_QT ON)
-set (TOOLKIT_NAME ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-unset (TOOLKIT_NAME)

samples/tools/TStandalone/src/DFBrowser/EXTERNLIB

@@ -1,29 +0,0 @@
-DFBrowserPane
-DFBrowserPaneXDE
-TKBRep
-TKMath
-TKV3d
-TKBRep
-TKBin
-TKBinL
-TKBinXCAF
-TKCAF
-TKCDF
-TKernel
-TKLCAF
-TKMath
-TKOpenGl
-TKService
-TKStd
-TKStdL
-TKTInspector
-TKTInspectorAPI
-TKTreeModel
-TKV3d
-TKView
-TKXSBase
-TKXCAF
-TKXDESTEP
-TKXmlXCAF
-TKXml
-TKXmlL

samples/tools/TStandalone/src/DFBrowserPane/CMakeLists.txt

@@ -1,5 +0,0 @@
-project(DFBrowserPane)
-
-set (USE_QT ON)
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-unset (USE_QT)

samples/tools/TStandalone/src/DFBrowserPane/EXTERNLIB

@@ -1,12 +0,0 @@
-TKG3d
-TKTInspectorAPI
-TKTreeModel
-TKernel
-TKMath
-TKService
-TKV3d
-TKVCAF
-TKCDF
-TKCAF
-TKLCAF
-TKBRep

samples/tools/TStandalone/src/DFBrowserPaneXDE/CMakeLists.txt

@@ -1,5 +0,0 @@
-project(DFBrowserPaneXDE)
-
-set (USE_QT ON)
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-unset (USE_QT)

samples/tools/TStandalone/src/DFBrowserPaneXDE/EXTERNLIB

@@ -1,7 +0,0 @@
-DFBrowserPane
-TKernel
-TKTInspectorAPI
-TKXSBase
-TKXDESTEP
-TKBRep
-TKXCAF

samples/tools/TStandalone/src/ShapeView/CMakeLists.txt

@@ -1,11 +0,0 @@
-project(ShapeView)
-
-set (USE_QT ON)
-set (TOOLKIT_NAME ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-unset (TOOLKIT_NAME)
-
-

samples/tools/TStandalone/src/ShapeView/EXTERNLIB

@@ -1,8 +0,0 @@
-TKBRep
-TKGeomBase
-TKG3d
-TKMath
-TKTInspectorAPI
-TKTreeModel
-TKService
-TKView

samples/tools/TStandalone/src/TInspector/CMakeLists.txt

@@ -1,11 +0,0 @@
-project(TInspector)
-
-set (USE_QT ON)
-set (TOOLKIT_NAME ON)
-set (INSTALL_API ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-unset (TOOLKIT_NAME)
-unset (INSTALL_API)

samples/tools/TStandalone/src/TInspector/EXTERNLIB

@@ -1,2 +0,0 @@
-TKernel
-TKTInspectorAPI

samples/tools/TStandalone/src/TInspectorAPI/CMakeLists.txt

@@ -1,10 +0,0 @@
-project(TInspectorAPI)
-
-set (TOOLKIT_NAME ON)
-set (INSTALL_API ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (TOOLKIT_NAME)
-unset (INSTALL_API)
-

samples/tools/TStandalone/src/TInspectorAPI/EXTERNLIB

@@ -1,2 +0,0 @@
-TKernel
-TKLCAF

samples/tools/TStandalone/src/TInspectorEXE/CMakeLists.txt

@@ -1,13 +0,0 @@
-project(TInspectorEXE)
-
-set (USE_QT ON)
-set (EXECUTABLE_PROJECT ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-unset (EXECUTABLE_PROJECT)
-
-configure_file(${CMAKE_SOURCE_DIR}/adm/templates/${PROJECT_NAME}.vcxproj.user.in 
-               ${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}.vcxproj.user @ONLY)
-

samples/tools/TStandalone/src/TInspectorEXE/EXTERNLIB

@@ -1,8 +0,0 @@
-TKBRep
-TKG3d
-TKService
-TKTInspector
-TKXCAF
-TKXDESTEP
-TKXSBase
-TKView

samples/tools/TStandalone/src/TreeModel/CMakeLists.txt

@@ -1,10 +0,0 @@
-project(TreeModel)
-
-set (USE_QT ON)
-set (TOOLKIT_NAME ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-
-

samples/tools/TStandalone/src/TreeModel/EXTERNLIB

@@ -1 +0,0 @@
-

samples/tools/TStandalone/src/VInspector/CMakeLists.txt

@@ -1,9 +0,0 @@
-project(VInspector)
-
-set (USE_QT ON)
-set (TOOLKIT_NAME ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-unset (TOOLKIT_NAME)

samples/tools/TStandalone/src/VInspector/EXTERNLIB

@@ -1,10 +0,0 @@
-TKBO
-TKBRep
-TKG3d
-TKernel
-TKMath
-TKTInspectorAPI
-TKTreeModel
-TKService
-TKV3d
-TKView

samples/tools/TStandalone/src/View/CMakeLists.txt

@@ -1,9 +0,0 @@
-project(View)
-
-set (USE_QT ON)
-set (TOOLKIT_NAME ON)
-
-OCCT_INCLUDE_CMAKE_FILE_STANDALONE ("adm/cmake/occt_toolkit_standalone")
-
-unset (USE_QT)
-

samples/tools/TStandalone/src/View/EXTERNLIB

@@ -1,5 +0,0 @@
-TKernel
-TKMath
-TKService
-TKOpenGl
-TKV3d

samples/xaml/MainPage.xaml.cpp

@@ -331,8 +331,10 @@ Standard_Boolean MainPage::SaveSTEP(const wchar_t* theFilePath, const TopoDS_Sha
     return Standard_False;
   }
 
-  const TCollection_AsciiString aFilePath (theFilePath);
-  switch (aWriter.Write (aFilePath.ToCString()))
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  switch (aWriter.Write(theFilePathA))
   {
   case IFSelect_RetError:
     Output_TextBlock->Text += L"Error: Incorrect Data\n";
@@ -356,8 +358,11 @@ Standard_Boolean MainPage::SaveSTEP(const wchar_t* theFilePath, const TopoDS_Sha
 Standard_Boolean MainPage::SaveSTL(const wchar_t* theFilePath, const TopoDS_Shape& theShape)
 {
   StlAPI_Writer myStlWriter;
-  const TCollection_AsciiString aFilePath (theFilePath);
-  return myStlWriter.Write (theShape, aFilePath.ToCString());
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  return myStlWriter.Write(theShape, theFilePathA) == StlAPI_StatusOK;
 }
 
 //=======================================================================
@@ -367,8 +372,12 @@ Standard_Boolean MainPage::SaveSTL(const wchar_t* theFilePath, const TopoDS_Shap
 Standard_Boolean MainPage::SaveVRML(const wchar_t* theFilePath, const TopoDS_Shape& theShape)
 {
   VrmlAPI_Writer aWriter;
-  const TCollection_AsciiString aFilePath (theFilePath);
-  aWriter.Write (theShape, aFilePath.ToCString());
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  aWriter.Write(theShape, theFilePathA);
+
   return Standard_True;
 }
 
@@ -381,8 +390,11 @@ Standard_Boolean MainPage::ReadBREP(const wchar_t* theFilePath, TopoDS_Shape& th
   theShape.Nullify();
 
   BRep_Builder aBuilder;
-  const TCollection_AsciiString aFilePath (theFilePath);
-  if (!BRepTools::Read(theShape, aFilePath.ToCString(), aBuilder))
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  if (!BRepTools::Read(theShape, theFilePathA, aBuilder))
     return Standard_False;
 
   return !theShape.IsNull() && BRepAlgo::IsValid(theShape);
@@ -398,8 +410,10 @@ Standard_Boolean MainPage::ReadIGES(const wchar_t* theFilePath, TopoDS_Shape& th
 
   IGESControl_Reader Reader;
 
-  const TCollection_AsciiString aFilePath (theFilePath);
-  if (Reader.ReadFile (aFilePath.ToCString()) != IFSelect_RetDone)
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  if (Reader.ReadFile(theFilePathA) != IFSelect_RetDone)
     return Standard_False;
 
   Reader.TransferRoots();
@@ -417,8 +431,11 @@ Standard_Boolean MainPage::ReadSTEP(const wchar_t* theFilePath, TopoDS_Shape& th
   theShape.Nullify();
 
   STEPControl_Reader aReader;
-  const TCollection_AsciiString aFilePath (theFilePath);
-  switch (aReader.ReadFile (aFilePath.ToCString()))
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  switch (aReader.ReadFile(theFilePathA))
   {
   case IFSelect_RetError:
     Output_TextBlock->Text += L"Error: Not a valid Step file\n";

src/AIS/AIS_Dimension.cxx

@@ -691,9 +691,21 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
   FitTextAlignmentForLinear (theFirstPoint, theSecondPoint, theIsOneSide, aHorisontalTextPos,
                              aLabelPosition, isArrowsExternal);
 
-  // compute dimension line points
-  gp_Pnt aLineBegPoint, aLineEndPoint;
-  ComputeFlyoutLinePoints (theFirstPoint, theSecondPoint, aLineBegPoint, aLineEndPoint);
+    // compute dimension line points
+  gp_Ax1 aPlaneNormal = GetPlane().Axis();
+  gp_Dir aTargetPointsVector = gce_MakeDir (theFirstPoint, theSecondPoint);
+
+  // compute flyout direction vector
+  gp_Dir aFlyoutVector = aPlaneNormal.Direction() ^ aTargetPointsVector;
+
+  // create lines for layouts
+  gp_Lin aLine1 (theFirstPoint, aFlyoutVector);
+  gp_Lin aLine2 (theSecondPoint, aFlyoutVector);
+
+  // Get flyout end points
+  gp_Pnt aLineBegPoint = ElCLib::Value (ElCLib::Parameter (aLine1, theFirstPoint)  + GetFlyout(), aLine1);
+  gp_Pnt aLineEndPoint = ElCLib::Value (ElCLib::Parameter (aLine2, theSecondPoint) + GetFlyout(), aLine2);
+
   gp_Lin aDimensionLine = gce_MakeLin (aLineBegPoint, aLineEndPoint);
 
   // compute arrows positions and directions
@@ -984,27 +996,6 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
   mySelectionGeom.IsComputed = Standard_True;
 }
 
-//=======================================================================
-//function : ComputeFlyoutLinePoints
-//purpose  :
-//=======================================================================
-void AIS_Dimension::ComputeFlyoutLinePoints (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint,
-                                             gp_Pnt& theLineBegPoint, gp_Pnt& theLineEndPoint)
-{
-  // compute dimension line points
-  gp_Ax1 aPlaneNormal = GetPlane().Axis();
-  // compute flyout direction vector
-  gp_Dir aTargetPointsVector = gce_MakeDir (theFirstPoint, theSecondPoint);
-  gp_Dir aFlyoutVector = aPlaneNormal.Direction() ^ aTargetPointsVector;
-  // create lines for layouts
-  gp_Lin aLine1 (theFirstPoint, aFlyoutVector);
-  gp_Lin aLine2 (theSecondPoint, aFlyoutVector);
-
-  // Get flyout end points
-  theLineBegPoint = ElCLib::Value (ElCLib::Parameter (aLine1, theFirstPoint)  + GetFlyout(), aLine1);
-  theLineEndPoint = ElCLib::Value (ElCLib::Parameter (aLine2, theSecondPoint) + GetFlyout(), aLine2);
-}
-
 //=======================================================================
 //function : ComputeLinearFlyouts
 //purpose  :

src/AIS/AIS_Dimension.hxx

@@ -463,14 +463,6 @@ protected:
                                             const gp_Pnt& theSecondPoint,
                                             const Standard_Boolean theIsOneSide = Standard_False);
 
-  //! Computes points bounded the flyout line for linear dimension.
-  //! @param theFirstPoint [in] the first attach point of linear dimension.
-  //! @param theSecondPoint [in] the second attach point of linear dimension.
-  //! @param theLineBegPoint [out] the first attach point of linear dimension.
-  //! @param theLineEndPoint [out] the second attach point of linear dimension.
-  Standard_EXPORT virtual void ComputeFlyoutLinePoints (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint,
-                                                        gp_Pnt& theLineBegPoint, gp_Pnt& theLineEndPoint);
-
   //! Compute selection sensitives for linear dimension flyout lines (length, diameter, radius).
   //! Please note that this method uses base dimension properties: working plane and flyout length.
   //! @param theSelection [in] the selection structure to fill with selection primitives.

src/AIS/AIS_LengthDimension.cxx

@@ -44,8 +44,7 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
 //=======================================================================
 AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFirstFace,
                                           const TopoDS_Face& theSecondFace)
-: AIS_Dimension (AIS_KOD_LENGTH),
-  myHasCustomDirection (Standard_False)
+: AIS_Dimension (AIS_KOD_LENGTH)
 {
   SetMeasuredGeometry (theFirstFace, theSecondFace);
   SetFlyout (15.0);
@@ -57,8 +56,7 @@ AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFirstFace,
 //=======================================================================
 AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFace,
                                           const TopoDS_Edge& theEdge)
-: AIS_Dimension (AIS_KOD_LENGTH),
-  myHasCustomDirection (Standard_False)
+: AIS_Dimension (AIS_KOD_LENGTH)
 {
   SetMeasuredGeometry (theFace, theEdge);
   SetFlyout (15.0);
@@ -71,8 +69,7 @@ AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFace,
 AIS_LengthDimension::AIS_LengthDimension (const gp_Pnt& theFirstPoint,
                                           const gp_Pnt& theSecondPoint,
                                           const gp_Pln& thePlane)
-: AIS_Dimension (AIS_KOD_LENGTH),
-  myHasCustomDirection (Standard_False)
+: AIS_Dimension (AIS_KOD_LENGTH)
 {
   SetMeasuredGeometry (theFirstPoint, theSecondPoint, thePlane);
   SetFlyout (15.0);
@@ -85,8 +82,7 @@ AIS_LengthDimension::AIS_LengthDimension (const gp_Pnt& theFirstPoint,
 AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Shape& theFirstShape,
                                           const TopoDS_Shape& theSecondShape,
                                           const gp_Pln& thePlane)
-: AIS_Dimension (AIS_KOD_LENGTH),
-  myHasCustomDirection (Standard_False)
+: AIS_Dimension (AIS_KOD_LENGTH)
 {
   SetCustomPlane (thePlane);
   SetMeasuredShapes (theFirstShape, theSecondShape);
@@ -99,8 +95,7 @@ AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Shape& theFirstShape,
 //=======================================================================
 AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Edge& theEdge,
                                           const gp_Pln& thePlane)
-: AIS_Dimension (AIS_KOD_LENGTH),
-  myHasCustomDirection (Standard_False)
+: AIS_Dimension (AIS_KOD_LENGTH)
 {
   SetMeasuredGeometry (theEdge, thePlane);
   SetFlyout (15.0);
@@ -266,13 +261,7 @@ void AIS_LengthDimension::SetDisplayUnits (const TCollection_AsciiString& theUni
 //=======================================================================
 Standard_Real AIS_LengthDimension::ComputeValue() const
 {
-  if (!IsValid())
-    return 0.0;
-
-  if (!myHasCustomDirection)
-    return myFirstPoint.Distance (mySecondPoint);
-
-  return fabs (gp_Vec(myFirstPoint, mySecondPoint).Dot (myDirection));
+  return IsValid() ? myFirstPoint.Distance (mySecondPoint) : 0.0;
 }
 
 //=======================================================================
@@ -293,35 +282,6 @@ void AIS_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /
   DrawLinearDimension (thePresentation, theMode, myFirstPoint, mySecondPoint);
 }
 
- //=======================================================================
-//function : ComputeFlyoutLinePoints
-//purpose  : 
-//=======================================================================
-void AIS_LengthDimension::ComputeFlyoutLinePoints (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint,
-                                                   gp_Pnt& theLineBegPoint, gp_Pnt& theLineEndPoint)
-{
-  if (!myHasCustomDirection)
-  {
-    AIS_Dimension::ComputeFlyoutLinePoints (theFirstPoint, theSecondPoint, theLineBegPoint, theLineEndPoint);
-    return;
-  }
-
-  // find scalar of projection target vector (from start to second point) to flyout vector
-  gp_Ax1 aPlaneNormal = GetPlane().Axis();
-  gp_Vec aFlyoutNormalizedDir(aPlaneNormal.Direction() ^ myDirection);
-  aFlyoutNormalizedDir.Normalize();
-  Standard_Real aTargetProjectedToFlyout = gp_Vec(theFirstPoint, theSecondPoint).Dot (aFlyoutNormalizedDir);
-
-  gp_Dir aFlyoutVector = aFlyoutNormalizedDir;
-  // create lines for layouts
-  gp_Lin aLine1 (theFirstPoint, aFlyoutVector);
-  gp_Lin aLine2 (theSecondPoint, aFlyoutVector);
-
-  // Get flyout end points
-  theLineBegPoint = ElCLib::Value (ElCLib::Parameter (aLine1, theFirstPoint)  + GetFlyout() + aTargetProjectedToFlyout, aLine1);
-  theLineEndPoint = ElCLib::Value (ElCLib::Parameter (aLine2, theSecondPoint) + GetFlyout(), aLine2);
-}
-
 //=======================================================================
 //function : ComputeFlyoutSelection
 //purpose  : 
@@ -813,14 +773,3 @@ void AIS_LengthDimension::SetTextPosition (const gp_Pnt& theTextPos)
 
   SetToUpdate();
 }
-
-//=======================================================================
-//function : SetDirection
-//purpose  : 
-//=======================================================================
-void AIS_LengthDimension::SetDirection (const gp_Dir& theDirection, const Standard_Boolean theUseDirection)
-{
-  myHasCustomDirection = theUseDirection;
-  if (myHasCustomDirection)
-    myDirection = theDirection;
-}

src/AIS/AIS_LengthDimension.hxx

@@ -194,13 +194,6 @@ public:
 
   Standard_EXPORT virtual const gp_Pnt GetTextPosition() const Standard_OVERRIDE;
 
-  //! Set custom direction for dimension. If it is not set, the direction is obtained
-  //! from the measured geometry (e.g. line between points of dimension)
-  //! The direction does not change flyout direction of dimension.
-  //! @param theDirection [in] the dimension direction.
-  //! @param theUseDirection [in] boolean value if custom direction should be used.
-  Standard_EXPORT void SetDirection (const gp_Dir& theDirection, const Standard_Boolean theUseDirection = Standard_True);
-
 public:
 
   DEFINE_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
@@ -212,25 +205,12 @@ protected:
 
   Standard_EXPORT virtual gp_Pln ComputePlane(const gp_Dir& theAttachDir) const;
 
-  //! Computes distance between dimension points. If custom direction is defined, the distance
-  //! is a projection value of the distance between points to this direction
-  //! @return dimension value
   Standard_EXPORT Standard_Real ComputeValue() const Standard_OVERRIDE;
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
                                         const Handle(Prs3d_Presentation)& thePresentation,
                                         const Standard_Integer theMode = 0) Standard_OVERRIDE;
 
-  //! Computes points bounded the flyout line for linear dimension.
-  //! Direction of flyout line equal to the custom direction of dimension if defined or
-  //! parallel to the main direction line
-  //! @param theFirstPoint [in] the first attach point of linear dimension.
-  //! @param theSecondPoint [in] the second attach point of linear dimension.
-  //! @param theLineBegPoint [out] the first attach point of linear dimension.
-  //! @param theLineEndPoint [out] the second attach point of linear dimension.
-  Standard_EXPORT virtual void ComputeFlyoutLinePoints (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint,
-                                                        gp_Pnt& theLineBegPoint, gp_Pnt& theLineEndPoint) Standard_OVERRIDE;
-
   Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection,
                                                        const Handle(SelectMgr_EntityOwner)& theEntityOwner) Standard_OVERRIDE;
 
@@ -283,8 +263,6 @@ private:
   gp_Pnt mySecondPoint;
   TopoDS_Shape myFirstShape;
   TopoDS_Shape mySecondShape;
-  gp_Dir myDirection;
-  Standard_Boolean myHasCustomDirection;
 };
 
 #endif // _AIS_LengthDimension_HeaderFile

src/AIS/AIS_Shape.cxx

@@ -292,7 +292,7 @@ void AIS_Shape::Compute(const Handle(Prs3d_Projector)& aProjector,
       OCC_CATCH_SIGNALS
       switch (TypeOfHLR()) {
         case Prs3d_TOH_Algo:
-            StdPrs_HLRShape::Add (aPresentation, SH, myDrawer, aProjector);
+          StdPrs_HLRShape::Add (aPresentation, SH, myDrawer, aProjector);
           break;
         case Prs3d_TOH_PolyAlgo:
         default:

src/BRepClass3d/BRepClass3d_SClassifier.cxx

@@ -313,14 +313,11 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer,
           continue;
         TopoDS_Face f1 = TopoDS::Face(ffs.First());
         TopoDS_Face f2 = TopoDS::Face(ffs.Last());
+        IntCurveSurface_TransitionOnCurve tran;
         TopoDS_Vertex V1, V2;
         TopExp::Vertices(EE, V1, V2);
         if (LVInts.Contains(V1) || LVInts.Contains(V2))
-        {
           continue;
-        }
-
-        IntCurveSurface_TransitionOnCurve tran = IntCurveSurface_Tangent;
         Standard_Integer Tst = GetTransi(f1, f2, EE, param, L, tran);
         if (Tst == 1 && Abs(Lpar) < Abs(parmin))
         {

src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx

@@ -67,7 +67,7 @@ void BRepTopAdaptor_Tool::Init(const Handle(Adaptor3d_HSurface)& surface,
   myloaded=Standard_True;
 }
 
-Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool() const{ 
+Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool() { 
   if(myloaded) { 
     return(myTopolTool);
   }
@@ -79,7 +79,7 @@ Handle(BRepTopAdaptor_TopolTool) BRepTopAdaptor_Tool::GetTopolTool() const{
   }
 }
 
-Handle(Adaptor3d_HSurface)  BRepTopAdaptor_Tool::GetSurface() const{ 
+Handle(Adaptor3d_HSurface)  BRepTopAdaptor_Tool::GetSurface() { 
   if(myloaded) { 
     return(myHSurface);
   }

src/BRepTopAdaptor/BRepTopAdaptor_Tool.hxx

@@ -46,11 +46,11 @@ public:
   
   Standard_EXPORT void Init (const Handle(Adaptor3d_HSurface)& Surface, const Standard_Real Tol2d);
   
-  Standard_EXPORT Handle(BRepTopAdaptor_TopolTool) GetTopolTool() const;
+  Standard_EXPORT Handle(BRepTopAdaptor_TopolTool) GetTopolTool();
   
   Standard_EXPORT void SetTopolTool (const Handle(BRepTopAdaptor_TopolTool)& TT);
   
-  Standard_EXPORT Handle(Adaptor3d_HSurface) GetSurface() const;
+  Standard_EXPORT Handle(Adaptor3d_HSurface) GetSurface();
   
   Standard_EXPORT void Destroy();
 ~BRepTopAdaptor_Tool()

src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx

@@ -106,8 +106,6 @@ void BinLDrivers_DocumentStorageDriver::Write (const Handle(CDM_Document)& theDo
       myDrivers = AttributeDrivers (myMsgDriver);
     Handle(TDF_Data) aData = aDoc->GetData();
     FirstPass (aData->Root());
-    if(aDoc->EmptyLabelsSavingMode()) 
-      myEmptyLabels.Clear(); // 
 
 //  1. Write info section (including types table)
     WriteInfoSection (aDoc, theOStream);

src/Bisector/Bisector_BisecAna.cxx

@@ -839,8 +839,11 @@ void Bisector_BisecAna::Perform(const Handle(Geom2d_Curve)& afirstcurve  ,
   }
 
   aFirstCurveType = curve->DynamicType();
-  const gp_Pnt2d aPoint(asecondpoint->Pnt2d());
-  (void )aPoint;
+#ifdef OCCT_DEBUG
+  gp_Pnt2d Point(asecondpoint->Pnt2d());
+#else
+  asecondpoint->Pnt2d();
+#endif
   if (aFirstCurveType == STANDARD_TYPE(Geom2d_Circle)) {
     cas = 1;
     Handle(Geom2d_Circle) C1 = Handle(Geom2d_Circle)::DownCast(curve);

src/Bnd/Bnd_Box2d.cxx

@@ -300,23 +300,3 @@ void Bnd_Box2d::Dump () const
   cout << "\n Gap : " << Gap;
   cout << "\n";
 }
-
- Standard_Real Bnd_Box2d::SquareDistance (const gp_Pnt2d& thePnt2d) const
- {
-   Standard_Real Xmin, Xmax, Ymin, Ymax;
-   Standard_Real X = thePnt2d.X(), Y = thePnt2d.Y();
-   Standard_Real dd = 0;
-   Get(Xmin, Ymin, Xmax, Ymax);
-
-   if (X < Xmin)
-     dd += (Xmin - X)*(Xmin - X);
-   else if (X > Xmax)
-     dd += (Xmax - X)*(Xmax - X);
-
-   if (Y < Ymin)
-     dd += (Ymin - Y)*(Ymin - Y);
-   else if (Y > Ymax)
-     dd += (Ymax - Y)*(Ymax - Y);
-
-   return dd;
- }

src/Bnd/Bnd_Box2d.hxx

@@ -182,10 +182,6 @@ public:
   
   //! Returns True if the 2d pnt <P> is out <me>.
   Standard_EXPORT Standard_Boolean IsOut (const gp_Pnt2d& P) const;
-
-  //! Returns distance from point <thePnt2d> to <me>
-  //! distance will be 0 if point is inside of <me>
-   Standard_EXPORT Standard_Real SquareDistance (const gp_Pnt2d& thePnt2d) const;
   
   //! Returns True if <Box2d> is out <me>.
   Standard_EXPORT Standard_Boolean IsOut (const Bnd_Box2d& Other) const;

src/Contap/Contap_ArcFunction.cxx

@@ -36,15 +36,14 @@ void Contap_ArcFunction::Set(const Handle(Adaptor3d_HSurface)& S)
 {
   mySurf = S;
   Standard_Integer i;
-  Standard_Real uinf, vinf, usup, vsup;
-  Standard_Integer nbs = Contap_HContTool::NbSamplePoints(S, uinf, vinf, usup, vsup);
+  Standard_Integer nbs = Contap_HContTool::NbSamplePoints(S);
   Standard_Real U,V;
   //  gp_Vec d1u,d1v;
   gp_Vec norm;
   if (nbs > 0) {
     myMean = 0.;
     for (i = 1; i <= nbs; i++) {
-      Contap_HContTool::SamplePoint(S,i,U,V, uinf, vinf, usup, vsup);
+      Contap_HContTool::SamplePoint(S,i,U,V);
       //      Adaptor3d_HSurfaceTool::D1(S,U,V,solpt,d1u,d1v);
       //      myMean = myMean + d1u.Crossed(d1v).Magnitude();
       Contap_SurfProps::Normale(S,U,V,solpt,norm);

src/Contap/Contap_Contour.cxx

@@ -1237,16 +1237,9 @@ void ComputeInternalPoints
         // Essayer de converger
         // cout << "Changement de signe detecte" << endl;
         solution = Standard_False;
-        math_Vector dir1(1,2), dir2(1,2);
-        math_Vector prevX(1,2), prevPrevX (1,2);
-        int count = 0;
-        int revCount = 0;
-        double dot = 0;
-        double t = 0.5;
-        while (!solution)
-        {
-          X(1) =/* (XInf(1) + XSup(1)) /2.;*/ XInf(1) + t * (XSup(1) - XInf(1));
-          X(2) = /*(XInf(2) + XSup(2)) /2.;*/XInf(2) + t * (XSup(2) - XInf(2));
+        while (!solution) {
+          X(1) = (XInf(1) + XSup(1)) /2.;
+          X(2) = (XInf(2) + XSup(2)) /2.;
           rsnld.Perform(SFunc,X,infb,supb);
 
           if (!rsnld.IsDone()) {
@@ -1271,27 +1264,6 @@ void ComputeInternalPoints
               else {
                 vtestb = gp_Vec(0.,0.,0.);
               }
-              count++;
-              if (count > 10)
-              {
-                if (count > 12)
-                {
-                  dir1 = prevX - prevPrevX;
-                  dir2 = X - prevX;
-                  double d1n = dir1.Norm();
-                  double d2n = dir2.Norm();
-                  if (d1n > gp::Resolution() && d2n > gp::Resolution())
-                  {
-                    dir1 /= d1n;
-                    dir2 /= d2n;
-                    dot = dir1(1) * dir2(1) + dir1(2) * dir2(2);
-                    if (Abs(dot + 1) < 1e-10)
-                      revCount++;
-                  }
-                }
-                prevPrevX = prevX;
-                prevX = X;
-              }
               if ((vtestb.Magnitude() <= gp::Resolution())||
                 (Abs(X(1)-XInf(1)) <= toler(1) 
                 && Abs(X(2)-XInf(2)) <= toler(2)) ||
@@ -1306,11 +1278,6 @@ void ComputeInternalPoints
               }
               else {
                 XInf = X;
-                if (revCount > 10000)
-                {
-                  //XInf = (X + prevPrevX)/2;
-                  t = 0.75;
-                }
               }
             }
             else { // on n est pas sur une solution

src/Contap/Contap_HContTool.cxx

@@ -24,6 +24,8 @@
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 
+static Standard_Real uinf,vinf,usup,vsup;
+
 Standard_Integer Contap_HContTool::NbSamplesV
 (const Handle(Adaptor3d_HSurface)& S,
  const Standard_Real ,
@@ -123,7 +125,7 @@ Standard_Integer Contap_HContTool::NbSamplesU
 }
 
 Standard_Integer Contap_HContTool::NbSamplePoints
-(const Handle(Adaptor3d_HSurface)& S, Standard_Real& uinf, Standard_Real& vinf, Standard_Real& usup, Standard_Real& vsup)
+(const Handle(Adaptor3d_HSurface)& S)
 {
   uinf = S->FirstUParameter();
   usup = S->LastUParameter();
@@ -173,11 +175,7 @@ Standard_Integer Contap_HContTool::NbSamplePoints
 void Contap_HContTool::SamplePoint (const Handle(Adaptor3d_HSurface)& S,
                                     const Standard_Integer Index,
                                     Standard_Real& U,
-                                    Standard_Real& V,
-                                    const Standard_Real& uinf, 
-                                    const Standard_Real& vinf, 
-                                    const Standard_Real& usup, 
-                                    const Standard_Real& vsup)
+                                    Standard_Real& V )
 {
   if(S->GetType() ==   GeomAbs_BSplineSurface) {
     Standard_Integer nbIntU = NbSamplesU(S,uinf,usup)/3;

src/Contap/Contap_HContTool.hxx

@@ -44,10 +44,9 @@ public:
   
   Standard_EXPORT static Standard_Integer NbSamplesV (const Handle(Adaptor3d_HSurface)& S, const Standard_Real v1, const Standard_Real v2);
   
-  Standard_EXPORT static Standard_Integer NbSamplePoints (const Handle(Adaptor3d_HSurface)& S, Standard_Real& uinf, Standard_Real& vinf, Standard_Real& usup, Standard_Real& vsup);
+  Standard_EXPORT static Standard_Integer NbSamplePoints (const Handle(Adaptor3d_HSurface)& S);
   
-  Standard_EXPORT static void SamplePoint (const Handle(Adaptor3d_HSurface)& S, const Standard_Integer Index, Standard_Real& U, Standard_Real& V,
-    const Standard_Real& uinf, const Standard_Real& vinf, const Standard_Real& usup, const Standard_Real& vsup);
+  Standard_EXPORT static void SamplePoint (const Handle(Adaptor3d_HSurface)& S, const Standard_Integer Index, Standard_Real& U, Standard_Real& V);
   
   //! Returns True if all the intersection point and edges
   //! are known on the Arc.

src/Contap/Contap_SurfFunction.cxx

@@ -42,14 +42,13 @@ void Contap_SurfFunction::Set(const Handle(Adaptor3d_HSurface)& S)
 {
   mySurf = S;
   Standard_Integer i;
-  Standard_Real uinf,vinf,usup,vsup;
-  Standard_Integer nbs = Contap_HContTool::NbSamplePoints(S,uinf,vinf,usup,vsup);
+  Standard_Integer nbs = Contap_HContTool::NbSamplePoints(S);
   Standard_Real U,V;
   gp_Vec norm;
   if (nbs > 0) {
     myMean = 0.;
     for (i = 1; i <= nbs; i++) {
-      Contap_HContTool::SamplePoint(S,i,U,V,uinf,vinf,usup,vsup);
+      Contap_HContTool::SamplePoint(S,i,U,V);
       //      Adaptor3d_HSurfaceTool::D1(S,U,V,solpt,d1u,d1v);
       //      myMean = myMean + d1u.Crossed(d1v).Magnitude();
       Contap_SurfProps::Normale(S,U,V,solpt,norm);

src/DDocStd/DDocStd_ApplicationCommands.cxx

@@ -232,17 +232,17 @@ static Standard_Integer DDocStd_Save (Draw_Interpretor& di,
 //=======================================================================
 
 static Standard_Integer DDocStd_SaveAs (Draw_Interpretor& di,
-                                        Standard_Integer nb,
-                                        const char** a)
-{
+					Standard_Integer nb,
+					const char** a)
+{  
   if (nb >= 3) {
     Handle(TDocStd_Document) D;    
     if (!DDocStd::GetDocument(a[1],D)) return 1;  
     TCollection_ExtendedString path (a[2]); 
     Handle(TDocStd_Application) A = DDocStd::GetApplication();
     PCDM_StoreStatus theStatus;
-
-    Standard_Boolean anUseStream(Standard_False), isSaveEmptyLabels(Standard_False);
+    
+    Standard_Boolean anUseStream = Standard_False;
     for ( Standard_Integer i = 3; i < nb; i++ )
     {
       if (!strcmp (a[i], "-stream"))
@@ -250,11 +250,9 @@ static Standard_Integer DDocStd_SaveAs (Draw_Interpretor& di,
         di << "standard SEEKABLE stream is used\n";
         anUseStream = Standard_True;
         break;
-      } else {
-        isSaveEmptyLabels =  ((atoi (a[3])) != 0);
-        D->SetEmptyLabelsSavingMode(isSaveEmptyLabels);
       }
     }
+
     if (anUseStream)
     {
       std::ofstream aFileStream;
@@ -265,35 +263,35 @@ static Standard_Integer DDocStd_SaveAs (Draw_Interpretor& di,
     {
       theStatus = A->SaveAs(D,path);
     }
-
+    
     if (theStatus != PCDM_SS_OK ) {
       switch ( theStatus ) {
-      case PCDM_SS_DriverFailure: {
-        di << "Error saving document: Could not store , no driver found to make it\n";
-        break ;
-                                  }
-      case PCDM_SS_WriteFailure: {
-        di << "Error saving document: Write access failure\n";
-        break;
-                                 }
-      case PCDM_SS_Failure: {
-        di << "Error saving document: Write failure\n" ;
-        break;
-                            }
-      case PCDM_SS_Doc_IsNull: {
-        di << "Error saving document: No document to save\n";
-        break ;
-                               }
-      case PCDM_SS_No_Obj: {
-        di << "Error saving document: No objects written\n";
-        break;
-                           }
-      case PCDM_SS_Info_Section_Error: {
-        di << "Error saving document: Write info section failure\n" ;
-        break;
-                                       }
-      default:
-        break;
+        case PCDM_SS_DriverFailure: {
+          di << "Error saving document: Could not store , no driver found to make it\n";
+          break ;
+        }
+        case PCDM_SS_WriteFailure: {
+          di << "Error saving document: Write access failure\n";
+          break;
+        }
+        case PCDM_SS_Failure: {
+          di << "Error saving document: Write failure\n" ;
+          break;
+        }
+        case PCDM_SS_Doc_IsNull: {
+          di << "Error saving document: No document to save\n";
+          break ;
+        }
+        case PCDM_SS_No_Obj: {
+          di << "Error saving document: No objects written\n";
+          break;
+        }
+        case PCDM_SS_Info_Section_Error: {
+          di << "Error saving document: Write info section failure\n" ;
+          break;
+        }
+        default:
+          break;
       }
       return 1;
     } else {
@@ -533,7 +531,7 @@ void DDocStd::ApplicationCommands(Draw_Interpretor& theCommands)
 		  __FILE__, DDocStd_Open, g);   
 
   theCommands.Add("SaveAs",
-		  "SaveAs DOC path [saveEmptyLabels: 0|1] [-stream]",
+		  "SaveAs DOC path [-stream]",
 		  __FILE__, DDocStd_SaveAs, g);  
 
   theCommands.Add("Save",

src/DNaming/DNaming_Line3DDriver.cxx

@@ -118,15 +118,13 @@ Standard_Integer DNaming_Line3DDriver::Execute(Handle(TFunction_Logbook)& theLog
 #ifdef OCCT_DEBUG
     if(!aNS1->IsEmpty()) {
       aShape1 = aNS1->Get();
-      const gp_Pnt aDebPoint = BRep_Tool::Pnt(TopoDS::Vertex(aShape1));
-      (void )aDebPoint;
+      gp_Pnt aDebPoint = BRep_Tool::Pnt(TopoDS::Vertex(aShape1));
       //	cout << aCounter << " X = " <<  aDebPoint.X() << " Y = " <<  aDebPoint.Y() << " Z = " <<  aDebPoint.Z() << endl;
     } else
       cout << " Line3DDriver:: NS1 is empty" << endl;
     if(!aNS2->IsEmpty()) {
       aShape2 = aNS2->Get();
-      const gp_Pnt aDebPoint = BRep_Tool::Pnt(TopoDS::Vertex(aShape2));
-      (void )aDebPoint;
+      gp_Pnt aDebPoint = BRep_Tool::Pnt(TopoDS::Vertex(aShape2));
       //      cout << aCounter+1 << " X = " <<  aDebPoint.X() << " Y = " <<  aDebPoint.Y() << " Z = " <<  aDebPoint.Z() << endl;
     } else
       cout << " Line3DDriver:: NS2 is empty" << endl;
@@ -139,12 +137,10 @@ Standard_Integer DNaming_Line3DDriver::Execute(Handle(TFunction_Logbook)& theLog
     aShape1 = aNS1->Get();
     aShape2 = aNS2->Get();
 #ifdef OCCT_DEBUG
-    const gp_Pnt aDebPoint1 = BRep_Tool::Pnt(TopoDS::Vertex(aShape1));
-    const gp_Pnt aDebPoint2 = BRep_Tool::Pnt(TopoDS::Vertex(aShape2));
-    //      cout << aCounter   << " X = " <<  aDebPoint1.X() << " Y = " <<  aDebPoint1.Y() << " Z = " <<  aDebPoint1.Z() << endl;
-    //      cout << aCounter+1 << " X = " <<  aDebPoint2.X() << " Y = " <<  aDebPoint2.Y() << " Z = " <<  aDebPoint2.Z() << endl;
-    (void )aDebPoint1;
-    (void )aDebPoint2;
+    gp_Pnt aDebPoint = BRep_Tool::Pnt(TopoDS::Vertex(aShape1));
+    //      cout << aCounter << " X = " <<  aDebPoint.X() << " Y = " <<  aDebPoint.Y() << " Z = " <<  aDebPoint.Z() << endl;
+    aDebPoint = BRep_Tool::Pnt(TopoDS::Vertex(aShape2));
+    //      cout << aCounter+1 << " X = " <<  aDebPoint.X() << " Y = " <<  aDebPoint.Y() << " Z = " <<  aDebPoint.Z() << endl;
 #endif 
     if(aShape1.ShapeType() != TopAbs_VERTEX || aShape2.ShapeType() != TopAbs_VERTEX) {
       aFunction->SetFailure(WRONG_ARGUMENT);