0031149: Visualization - using clipping planes for FitAll of V3d_View

(cherry picked from commit 60d61bea5e)

CMakeLists.txt

@@ -86,6 +86,11 @@ if (BUILD_WITH_DEBUG)
   set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
 endif()
 
+# option disabling OCCT exceptions in Release builds (No_Exception)
+if (NOT DEFINED BUILD_RELEASE_DISABLE_EXCEPTIONS)
+  set (BUILD_RELEASE_DISABLE_EXCEPTIONS ON CACHE BOOL "${BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR}")
+endif()
+
 # option to enable or disable use of precompiled headers
 if (NOT DEFINED BUILD_USE_PCH)
   set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
@@ -628,6 +633,26 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
 endif()
 
+# RapidJSON
+# search for CSF_RapidJSON variable in EXTERNLIB of each being used toolkit
+OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
+if (CAN_USE_RAPIDJSON)
+  set (USE_RAPIDJSON OFF CACHE BOOL "${USE_RAPIDJSON_DESCR}")
+
+  if (USE_RAPIDJSON)
+    add_definitions (-DHAVE_RAPIDJSON)
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
+  else()
+    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
+    OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
+
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
+  OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
+endif()
+
 # EIGEN
 if (CAN_USE_EIGEN)
   set (USE_EIGEN OFF CACHE BOOL "${USE_EIGEN_DESCR}")

adm/.gitignore

@@ -0,0 +1 @@
+/build-*

adm/MODULES

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

adm/TOOLS

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

adm/UDLIST

@@ -203,6 +203,7 @@ n Aspect
 n DsgPrs
 n Graphic3d
 n Image
+n Media
 n MeshVS
 n OpenGl
 n D3DHost
@@ -438,3 +439,7 @@ n Geom2dEvaluator
 t TKVCAF
 n XCAFView
 n XCAFNoteObjects
+t TKRWMesh
+n RWGltf
+n RWMesh
+n RWObj

adm/cmake/3rdparty_macro.cmake

@@ -133,7 +133,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
         set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
 
-        if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
           find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
                                                                                 PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                                 PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
@@ -181,9 +181,9 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
           # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
           set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
 
-          if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
             find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${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")

adm/cmake/occt_csf.cmake

@@ -65,6 +65,7 @@ if (WIN32)
   set (CSF_shell32       "shell32.lib")
   set (CSF_wsock32       "wsock32.lib")
   set (CSF_psapi         "psapi.lib")
+  set (CSF_winmm         "winmm.lib")
   set (CSF_d3d9          "D3D9.lib")
   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
     set (CSF_OpenGlLibs  "libEGL libGLESv2")
@@ -72,28 +73,35 @@ if (WIN32)
     set (CSF_OpenGlLibs  "opengl32.lib")
   endif()
 
-  else()
+else()
 
   if (APPLE)
     set (CSF_objc        "objc")
 
     # frameworks
-    find_library (Appkit_LIB NAMES AppKit)
-    set (CSF_Appkit ${Appkit_LIB})
+    if (IOS)
+      find_library (Appkit_LIB NAMES UIKit)
+      set (CSF_Appkit ${Appkit_LIB})
+    else()
+      find_library (Appkit_LIB NAMES AppKit)
+      set (CSF_Appkit ${Appkit_LIB})
+    endif()
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
 
     find_library (IOKit_LIB NAMES IOKit)
     set (CSF_IOKit ${IOKit_LIB})
-
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
     OCCT_CHECK_AND_UNSET (IOKit_LIB)
 
-    if (USE_GLX)
+    if (IOS)
+      find_library (OpenGlLibs_LIB NAMES OpenGLES)
+      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
+    elseif (USE_GLX)
       set (CSF_OpenGlLibs GL)
       set (CSF_XwLibs     "X11 Xext Xmu Xi")
     else()
       find_library (OpenGlLibs_LIB NAMES OpenGL)
       set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-
       OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
     endif()
     
@@ -109,5 +117,6 @@ if (WIN32)
     endif()
     set (CSF_XwLibs      "X11 Xext Xmu Xi")
     set (CSF_dl          "dl")
+    set (CSF_fontconfig  "fontconfig")
   endif()
 endif()

adm/cmake/occt_defs_flags.cmake

@@ -143,5 +143,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
 endif()
 
-set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+endif()

adm/cmake/occt_macros.cmake

@@ -163,13 +163,18 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   OCCT_MAKE_COMPILER_BITNESS()
 
   string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
-
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
+  if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
+    string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
+    list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
+  else()
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[a-zA-Z]*[0-9]*-${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
+  endif()
 
   SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
 

adm/cmake/rapidjson.cmake

@@ -0,0 +1,86 @@
+# RapidJSON
+
+if (NOT DEFINED INSTALL_RAPIDJSON)
+  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
+endif()
+
+# RapidJSON directory
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
+  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
+endif()
+
+# search for RapidJSON in user defined directory
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
+    if (RAPIDJSON_DIR_NAME)
+      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
+    endif()
+  endif()
+endif()
+
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
+endif()
+
+if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+
+  set (HEADER_NAMES rapidjson/rapidjson.h)
+
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
+
+  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
+                                              PATH_SUFFIXES include rapidjson
+                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              NO_DEFAULT_PATH)
+  else()
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATH_SUFFIXES include rapidjson
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
+  endif()
+
+  # use default (CMake) RapidJSON search
+  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
+      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
+    endif()
+
+    find_package(RapidJSON QUIET)
+
+    # restore ENV{RapidJSON_DIR}
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
+    endif()
+
+    if (${RAPIDJSON_FOUND})
+      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
+      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
+    endif()
+  endif()
+endif()
+
+if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+
+  # Install header files
+  if (INSTALL_RAPIDJSON)
+    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
+    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
+      if(IS_DIRECTORY "${SUBDIR}")
+        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+      else()
+        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+      endif()
+    endforeach()
+  endif()
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
+endif()
+
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET(RapidJSON_DIR)

adm/cmake/vardescr.cmake

@@ -28,6 +28,11 @@ Applies only for Debug configuration.")
 set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
 "Append the postfix to names of output libraries")
 
+set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
+"Disables exceptions like Standard_OutOfRange in Release builds.
+Defines No_Exception macros for Release builds when enabled (default).
+These exceptions are always enabled in Debug builds, but disable in Release for better performance")
+
 set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
 "Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
 Corresponding environment variable (CSF_FPE) can be changed manually
@@ -89,6 +94,7 @@ INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
 INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
 INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
 INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
+INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
 INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
 INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
 INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
@@ -156,6 +162,10 @@ 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)")
 
+set (USE_RAPIDJSON_DESCR
+"Indicates whether RapidJSON product should be used in OCCT DataExchange
+module for support of JSON-based formats like glTF")
+
 set (USE_EGL_DESCR
 "Indicates whether EGL should be used in OCCT visualization
 module instead of conventional OpenGL context creation APIs")

adm/genconf.tcl

@@ -30,10 +30,30 @@ set aRowIter 0
 set aCheckRowIter 0
 frame .myFrame -padx 5 -pady 5
 pack  .myFrame -fill both -expand 1
+frame .myFrame.myPrjFrame
 frame .myFrame.myVsFrame
 frame .myFrame.myHxxChecks
 frame .myFrame.myChecks
 
+# project file format
+set SYS_PRJFMT_LIST {}
+set SYS_PRJNAME_LIST {}
+if { "$::tcl_platform(platform)" == "windows" } {
+  lappend ::SYS_PRJFMT_LIST "vcxproj"
+  lappend ::SYS_PRJNAME_LIST "Visual Studio (.vcxproj)"
+}
+if { "$tcl_platform(os)" == "Darwin" } {
+  lappend ::SYS_PRJFMT_LIST "xcd"
+  lappend ::SYS_PRJNAME_LIST "XCode (.xcd)"
+}
+lappend ::SYS_PRJFMT_LIST "cbp"
+lappend ::SYS_PRJNAME_LIST "Code Blocks (.cbp)"
+lappend ::SYS_PRJFMT_LIST "pro"
+lappend ::SYS_PRJNAME_LIST "Qt Creator (.pro)"
+
+set aPrjIndex [lsearch $::SYS_PRJFMT_LIST $::PRJFMT]
+set ::PRJNAME [lindex $::SYS_PRJNAME_LIST $aPrjIndex]
+
 set SYS_VS_LIST {}
 set SYS_VC_LIST {}
 set SYS_VCVARS_LIST {}
@@ -101,6 +121,7 @@ proc wokdep:gui:Close {} {
 }
 
 proc wokdep:gui:SwitchConfig {} {
+  set ::PRJFMT [lindex $::SYS_PRJFMT_LIST [.myFrame.myPrjFrame.myPrjCombo current]]
   set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsFrame.myVsCombo current]]
   set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]
 
@@ -168,6 +189,9 @@ proc wokdep:gui:UpdateList {} {
     }
     wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
   }
+  if { "$::HAVE_RAPIDJSON" == "true" } {
+    wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
 
   if { "$::CHECK_QT4" == "true" } {
     wokdep:SearchQt4     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
@@ -390,6 +414,8 @@ proc wokdep:gui:Show64Bitness { theRowIter } {
 }
 
 # Header
+ttk::label    .myFrame.myPrjFrame.myPrjLbl     -text "Project format:" -padding {5 5 20 5}
+ttk::combobox .myFrame.myPrjFrame.myPrjCombo   -values $SYS_PRJNAME_LIST -state readonly -textvariable PRJNAME -width 40
 ttk::label    .myFrame.myVsFrame.myVsLbl       -text "Visual Studio configuration:" -padding {5 5 20 5}
 ttk::combobox .myFrame.myVsFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
 ttk::combobox .myFrame.myVsFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
@@ -433,6 +459,9 @@ ttk::label    .myFrame.myChecks.myZLibLbl       -text "Use zlib"
 checkbutton   .myFrame.myChecks.myLzmaCheck     -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA   -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myLzmaLbl       -text "Use liblzma"
 
+checkbutton   .myFrame.myChecks.myRapidJsonCheck -offvalue "false" -onvalue "true" -variable HAVE_RAPIDJSON -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myRapidJsonLbl   -text "Use RapidJSON"
+
 checkbutton   .myFrame.myChecks.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myQt4Lbl        -text "Search Qt4"
 checkbutton   .myFrame.myChecks.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
@@ -494,6 +523,10 @@ ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close
 
 # Create grid
 # Header
+grid .myFrame.myPrjFrame            -row $aRowIter -column 0 -columnspan 10 -sticky w
+grid .myFrame.myPrjFrame.myPrjLbl   -row 0 -column 0
+grid .myFrame.myPrjFrame.myPrjCombo -row 0 -column 1
+incr aRowIter
 if { "$tcl_platform(platform)" == "windows" } {
   grid .myFrame.myVsFrame               -row $aRowIter -column 0 -columnspan 10 -sticky w
   grid .myFrame.myVsFrame.myVsLbl       -row 0 -column 0
@@ -537,8 +570,8 @@ if { "$::tcl_platform(os)" != "Darwin" } {
 grid .myFrame.myChecks.myZLibCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myZLibLbl       -row $aCheckRowIter -column 7 -sticky w
 
-grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 10 -sticky e
-grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 11 -sticky w
+grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 13 -sticky w
 
 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
@@ -551,8 +584,8 @@ if { "$::tcl_platform(platform)" == "windows" } {
 }
 grid .myFrame.myChecks.myLzmaCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myLzmaLbl       -row $aCheckRowIter -column 7 -sticky w
-grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 10 -sticky e
-grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 11 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
 
 incr aCheckRowIter
 if { "$::tcl_platform(os)" == "Darwin" } {
@@ -561,6 +594,10 @@ if { "$::tcl_platform(os)" == "Darwin" } {
   incr aCheckRowIter
 }
 
+grid .myFrame.myChecks.myRapidJsonCheck -row $aCheckRowIter -column 6 -sticky e
+grid .myFrame.myChecks.myRapidJsonLbl   -row $aCheckRowIter -column 7 -sticky w
+incr aCheckRowIter
+
 # Additional headers search paths
 grid .myFrame.myIncLbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
 incr aRowIter
@@ -592,6 +629,9 @@ grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
 grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2
 
 # Bind events
+bind .myFrame.myPrjFrame.myPrjCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchConfig
+}
 bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
   wokdep:gui:SwitchConfig
 }

adm/genconfdeps.tcl

@@ -27,8 +27,10 @@ if { "$tcl_platform(platform)" == "unix" } {
   set SYS_EXE_SUFFIX    ""
   if { "$tcl_platform(os)" == "Darwin" } {
     set SYS_LIB_SUFFIX "dylib"
+    set PRJFMT "xcd"
   } else {
     set SYS_LIB_SUFFIX "so"
+    set PRJFMT "cbp"
   }
   set VCVER "gcc"
   set VCVARS ""
@@ -39,6 +41,7 @@ if { "$tcl_platform(platform)" == "unix" } {
   set SYS_EXE_SUFFIX    ".exe"
   set VCVER  "vc10"
   set VCVARS ""
+  set PRJFMT "vcxproj"
 }
 
 set SHORTCUT_HEADERS "ShortCut"
@@ -65,7 +68,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
 }
 
 # fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
-set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
+set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_RAPIDJSON HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
 foreach anEnvIter $THE_ENV_VARIABLES {
   set ${anEnvIter} "false"
   if { [info exists ::env(${anEnvIter})] } {
@@ -82,7 +85,7 @@ if { "$tcl_platform(platform)" != "windows" } {
   set HAVE_D3D ""
   set HAVE_RelWithDebInfo ""
 }
-foreach anEnvIter {ARCH VCVER VCVARS PRODUCTS_PATH} {
+foreach anEnvIter {ARCH VCVER VCVARS PRJFMT PRODUCTS_PATH} {
   if { [info exists ::env(${anEnvIter})] } {
     set ${anEnvIter} "$::env(${anEnvIter})"
   }
@@ -855,6 +858,25 @@ proc wokdep:SearchGLES {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin6
   return "$isFound"
 }
 
+# Search RapidJSON headers
+proc wokdep:SearchRapidJson {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc anErrInc
+
+  set isFound "true"
+  set aRJHPath [wokdep:SearchHeader "rapidjson/rapidjson.h"]
+  if { "$aRJHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{rapidjson}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/rapidjson/rapidjson.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } else {
+      lappend anErrInc "Error: 'rapidjson/rapidjson.h' not found (RapidJSON)"
+      set isFound "false"
+    }
+  }
+
+  return "$isFound"
+}
+
 # Auxiliary function, gets VTK version to set default search directory
 proc wokdep:VtkVersion { thePath } {
   set aResult "6.1"
@@ -1118,15 +1140,33 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   return "$isFound"
 }
 
+# Returns OCCT version string from file Standard_Version.hxx (if available)
+proc wokdep:DetectCasVersion {} {
+  set occt_ver 7.0.0
+  set aCasRoot [file normalize [file dirname [info script]]]
+  set filename "${aCasRoot}/src/Standard/Standard_Version.hxx"
+  if { [file exists $filename] } {
+    set fh [open $filename "r"]
+    set fh_loaded [read $fh]
+    close $fh
+    regexp {[^/]\s*#\s*define\s+OCC_VERSION_COMPLETE\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver
+  } else {
+    puts "Error: file '$filename' not found"
+  }
+  return $occt_ver
+}
+
 # Generate (override) custom environment file
 proc wokdep:SaveCustom {} {
+  set aGenInfo "This environment file was generated by genconf.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
   if { "$::tcl_platform(platform)" == "windows" } {
     set aCustomFilePath "./custom.bat"
     set aFile [open $aCustomFilePath "w"]
     puts $aFile "@echo off"
-    puts $aFile "rem This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
+    puts $aFile "rem $aGenInfo"
 
     puts $aFile ""
+    puts $aFile "set PRJFMT=$::PRJFMT"
     puts $aFile "set VCVER=$::VCVER"
     puts $aFile "set ARCH=$::ARCH"
     puts $aFile "set VCVARS=$::VCVARS"
@@ -1146,26 +1186,41 @@ proc wokdep:SaveCustom {} {
     }
 
     set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional headers search paths"
     puts $aFile "set \"CSF_OPT_INC=$aStringInc\""
 
     set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringLib32 [regsub -all "$::PRODUCTS_PATH" $aStringLib32 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional libraries (32-bit) search paths"
     puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""
 
     set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringLib64 [regsub -all "$::PRODUCTS_PATH" $aStringLib64 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional libraries (64-bit) search paths"
     puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""
 
     set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringBin32 [regsub -all "$::PRODUCTS_PATH" $aStringBin32 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional (32-bit) search paths"
     puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""
 
     set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringBin64 [regsub -all "$::PRODUCTS_PATH" $aStringBin64 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional (64-bit) search paths"
     puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
@@ -1175,9 +1230,10 @@ proc wokdep:SaveCustom {} {
     set aCustomFilePath "./custom.sh"
     set aFile [open $aCustomFilePath "w"]
     puts $aFile "#!/bin/bash"
-    puts $aFile "# This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
+    puts $aFile "# $aGenInfo"
 
     puts $aFile ""
+    puts $aFile "export PRJFMT=$::PRJFMT"
     puts $aFile "export ARCH=$::ARCH"
     puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
 
@@ -1195,22 +1251,88 @@ proc wokdep:SaveCustom {} {
     }
 
     set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "\${PRODUCTS_PATH}"]
+    }
     puts $aFile ""
     puts $aFile "# Additional headers search paths"
     puts $aFile "export CSF_OPT_INC=\"$aStringInc\""
 
-    set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
+    set aStringLib [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringLib [regsub -all "$::PRODUCTS_PATH" $aStringLib "\${PRODUCTS_PATH}"]
+    }
     puts $aFile ""
     puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""
+    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib]\""
 
-    set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
+    set aStringBin [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringBin [regsub -all "$::PRODUCTS_PATH" $aStringBin "\${PRODUCTS_PATH}"]
+    }
     puts $aFile ""
     puts $aFile "# Additional ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""
+    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin]\""
 
     close $aFile
   }
-
   puts "Configuration saved to file '$aCustomFilePath'"
+
+  # generate custom.auto.pri
+  set toExportCustomPri 1
+  if { $toExportCustomPri == 1 } {
+    set aCasVer [wokdep:DetectCasVersion]
+    set aCustomFilePath "./adm/qmake/custom.auto.pri"
+    set aFile [open $aCustomFilePath "w"]
+    puts $aFile "# $aGenInfo"
+
+    puts $aFile ""
+    puts $aFile "VERSION=$aCasVer"
+    puts $aFile "PRODUCTS_PATH=\"$::PRODUCTS_PATH\""
+
+    puts $aFile ""
+    puts $aFile "# Optional 3rd-parties switches"
+    foreach anEnvIter $::THE_ENV_VARIABLES {
+      set aName ${anEnvIter}
+      set aValue [set ::${anEnvIter}]
+      if { "$aValue" == "true" } {
+        puts $aFile "CONFIG += ${aName}"
+      } else {
+        #puts $aFile "CONFIG -= ${aName}"
+      }
+    }
+
+    puts $aFile ""
+    puts $aFile "# Additional headers search paths"
+    foreach anIncPath $::CSF_OPT_INC {
+      if { "$::PRODUCTS_PATH" != "" } {
+        set anIncPath [regsub -all "$::PRODUCTS_PATH" $anIncPath "\$\$\{PRODUCTS_PATH\}"]
+      }
+      puts $aFile "INCLUDEPATH += \"${anIncPath}\""
+    }
+
+    puts $aFile ""
+    puts $aFile "# Additional libraries search paths"
+    foreach aLibPath [set ::CSF_OPT_LIB$::ARCH] {
+      if { "$::PRODUCTS_PATH" != "" } {
+        set aLibPath [regsub -all "$::PRODUCTS_PATH" $aLibPath "\$\$\{PRODUCTS_PATH\}"]
+      }
+      puts $aFile "LIBS += -L\"${aLibPath}\""
+    }
+
+    if { "$::tcl_platform(platform)" == "windows" } {
+      puts $aFile ""
+      puts $aFile "# Additional DLLs search paths"
+      foreach aDllPath [set ::CSF_OPT_BIN$::ARCH] {
+        if { "$::PRODUCTS_PATH" != "" } {
+          set aDllPath [regsub -all "$::PRODUCTS_PATH" $aDllPath "\$\$\{PRODUCTS_PATH\}"]
+        }
+        puts $aFile "LIBS += -L\"${aDllPath}\""
+      }
+    }
+
+    puts $aFile ""
+    close $aFile
+    puts "Configuration saved to file '$aCustomFilePath'"
+  }
 }

adm/genproj.tcl

@@ -256,7 +256,7 @@ proc genAllResources {} {
 
 # Wrapper-function to generate VS project files
 proc genproj {theFormat args} {
-  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "cbp" "xcd"}
+  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "cbp" "xcd" "pro"}
   set aSupportedPlatforms { "wnt" "uwp" "lin" "mac" "ios" "qnx" }
   set isHelpRequire false
 
@@ -314,6 +314,7 @@ proc genproj {theFormat args} {
       vc141    -  Visual Studio 2017
       cbp      -  CodeBlocks
       xcd      -  XCode
+      pro      -  Qt Creator
 
     Platform (optional):
       wnt   -  Windows Desktop
@@ -395,9 +396,14 @@ proc genprojbat {theFormat thePlatform} {
       "cbp"   {
         file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.sh"  "$::path/codeblocks.sh"
         file copy -force -- "$::THE_CASROOT/adm/templates/codeblocks.bat" "$::path/codeblocks.bat"
+
         # Code::Blocks 16.01 does not create directory for import libs, help him
-        file mkdir "$::path/$thePlatform/cbp/lib"
-        file mkdir "$::path/$thePlatform/cbp/libd"
+        set aPlatformAndCompiler "${thePlatform}/gcc"
+        if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
+          set aPlatformAndCompiler "${thePlatform}/clang"
+        }
+        file mkdir "$::path/${aPlatformAndCompiler}/lib"
+        file mkdir "$::path/${aPlatformAndCompiler}/libd"
       }
       "xcd"   { file copy -force -- "$::THE_CASROOT/adm/templates/xcode.sh"      "$::path/xcode.sh" }
     }
@@ -472,15 +478,6 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl } {
     }
   }
 
-  # generate one solution for all projects if complete OS or VAS is processed
-  set anAllSolution "OCCT"
-
-  wokUtils:FILES:mkdir $anOutDir
-  if { ![file exists $anOutDir] } {
-    puts stderr "Error: Could not create output directory \"$anOutDir\""
-    return
-  }
-
   # create the out dir if it does not exist
   if (![file isdirectory $path/inc]) {
     puts "$path/inc folder does not exists and will be created"
@@ -491,6 +488,19 @@ proc OS:MKPRC { theOutDir theFormat theLibType thePlatform theCmpl } {
   puts "Collecting required header files into $path/inc ..."
   osutils:collectinc $aModules $path/inc
 
+  if { "$theFormat" == "pro" } {
+    return
+  }
+
+  # generate one solution for all projects if complete OS or VAS is processed
+  set anAllSolution "OCCT"
+
+  wokUtils:FILES:mkdir $anOutDir
+  if { ![file exists $anOutDir] } {
+    puts stderr "Error: Could not create output directory \"$anOutDir\""
+    return
+  }
+
   # Generating project files for the selected format
   switch -exact -- "$theFormat" {
     "vc7"   -
@@ -1349,6 +1359,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
     set aLibsMap(CSF_opengl32)     "opengl32"
     set aLibsMap(CSF_wsock32)      "wsock32"
     set aLibsMap(CSF_netapi32)     "netapi32"
+    set aLibsMap(CSF_winmm)        "winmm"
     set aLibsMap(CSF_OpenGlLibs)   "opengl32"
     if { "$::HAVE_GLES2" == "true" } {
       set aLibsMap(CSF_OpenGlLibs) "libEGL libGLESv2"
@@ -1366,17 +1377,23 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
     set aLibsMap(CSF_TBB) ""
   } else {
     set aLibsMap(CSF_dl)           "dl"
-    if { "$theOS" == "mac" } {
+    if { "$theOS" == "mac" || "$theOS" == "ios" } {
       set aLibsMap(CSF_objc)       "objc"
-      set aFrmsMap(CSF_Appkit)     "AppKit"
+      if { "$theOS" == "ios" } {
+        set aFrmsMap(CSF_Appkit)     "UIKit"
+        set aFrmsMap(CSF_OpenGlLibs) "OpenGLES"
+      } else {
+        set aFrmsMap(CSF_Appkit)     "AppKit"
+        set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
+      }
       set aFrmsMap(CSF_IOKit)      "IOKit"
-      set aFrmsMap(CSF_OpenGlLibs) "OpenGL"
       set aFrmsMap(CSF_TclLibs)    "Tcl"
       set aLibsMap(CSF_TclLibs)    ""
       set aFrmsMap(CSF_TclTkLibs)  "Tk"
       set aLibsMap(CSF_TclTkLibs)  ""
       set aLibsMap(CSF_QT)         "QtCore QtGui"
     } else {
+      set aLibsMap(CSF_fontconfig) "fontconfig"
       if { "$theOS" == "qnx" } {
         # CSF_ThreadLibs - pthread API is part of libc on QNX
         set aLibsMap(CSF_OpenGlLibs) "EGL GLESv2"
@@ -2295,6 +2312,10 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   set aCmplFlagsDebug   [list]
   set toPassArgsByFile 0
   set aLibPrefix "lib"
+  set aPlatformAndCompiler "${thePlatform}/gcc"
+  if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
+    set aPlatformAndCompiler "${thePlatform}/clang"
+  }
   if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" || "$thePlatform" == "qnx" } {
     set toPassArgsByFile 1
   }
@@ -2351,17 +2372,17 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   # Release target configuration
   puts $aFile "\t\t\t<Target title=\"Release\">"
   if { "$theIsExe" == "true" } {
-    puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
     puts $aFile "\t\t\t\t<Option type=\"1\" />"
   } else {
     if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bin/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${thePlatform}/cbp/lib/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bin/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${aPlatformAndCompiler}/lib/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
     } else {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/lib/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/lib/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
     }
     puts $aFile "\t\t\t\t<Option type=\"3\" />"
   }
-  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/obj\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${aPlatformAndCompiler}/obj\" />"
   puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
   puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
   if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2384,7 +2405,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   if { $toPassArgsByFile == 1 } {
     puts $aFile "\t\t\t\t\t<Add option=\"\@$aLnkFileName\" />"
   }
-  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/lib\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${aPlatformAndCompiler}/lib\" />"
   if { "$thePlatform" == "mac" } {
     if { [ lsearch $theLibsList X11 ] >= 0} {
       puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2392,7 +2413,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   }
   puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch})\" />"
   if { "$thePlatform" == "lin" } {
-    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/lib\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aPlatformAndCompiler}/lib\" />"
   }
   puts $aFile "\t\t\t\t</Linker>"
 
@@ -2401,17 +2422,17 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   # Debug target configuration
   puts $aFile "\t\t\t<Target title=\"Debug\">"
   if { "$theIsExe" == "true" } {
-    puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
     puts $aFile "\t\t\t\t<Option type=\"1\" />"
   } else {
     if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/bind/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${thePlatform}/cbp/libd/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/bind/${aLibPrefix}${theProjName}\" imp_lib=\"../../../${aPlatformAndCompiler}/libd/\$(TARGET_OUTPUT_BASENAME)\" prefix_auto=\"1\" extension_auto=\"1\" />"
     } else {
-      puts $aFile "\t\t\t\t<Option output=\"../../../${thePlatform}/cbp/libd/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
+      puts $aFile "\t\t\t\t<Option output=\"../../../${aPlatformAndCompiler}/libd/lib${theProjName}.so\" prefix_auto=\"0\" extension_auto=\"0\" />"
     }
     puts $aFile "\t\t\t\t<Option type=\"3\" />"
   }
-  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/objd\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${aPlatformAndCompiler}/objd\" />"
   puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
   puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
   if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2434,7 +2455,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   if { $toPassArgsByFile == 1 } {
     puts $aFile "\t\t\t\t\t<Add option=\"\@$aLnkDebFileName\" />"
   }
-  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/libd\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${aPlatformAndCompiler}/libd\" />"
   if { "$thePlatform" == "mac" } {
     if { [ lsearch $theLibsList X11 ] >= 0} {
       puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2442,7 +2463,7 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
   }
   puts $aFile "\t\t\t\t\t<Add option=\"\$(CSF_OPT_LNK${aWokArch}D)\" />"
   if { "$thePlatform" == "lin" } {
-    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/libd\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${aPlatformAndCompiler}/libd\" />"
   }
   puts $aFile "\t\t\t\t</Linker>"
 
@@ -2509,8 +2530,8 @@ proc osutils:cbp { theCmpl theOutDir theProjName thePlatform theSrcFiles theLibs
       puts $aFile "\t\t\t<Option link=\"0\" />"
       puts $aFile "\t\t</Unit>"
 
-      set aFileObj  [string map {.cxx .o} [string map [list "/src/" "/$thePlatform/cbp/obj/src/"]  $aSrcFile]]
-      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/$thePlatform/cbp/objd/src/"] $aSrcFile]]
+      set aFileObj  [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/obj/src/"]  $aSrcFile]]
+      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/objd/src/"] $aSrcFile]]
       puts -nonewline $aFileLnkObj  "$aFileObj "
       puts -nonewline $aFileLnkObjd "$aFileObjd "
     } else {
@@ -2655,7 +2676,7 @@ proc OS:xcodeproj { theModules theOutDir theGuidsMap theLibType thePlatform} {
 }
 
 # Generates dependencies section for Xcode project files.
-proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids theIsStatic} {
+proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids thePlatform theIsStatic} {
   upvar $theGuidsMap         aGuidsMap
   upvar $theFileRefSection   aFileRefSection
   upvar $theDepsGuids        aDepsGuids
@@ -2679,7 +2700,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
     }
   }
 
-  osutils:usedOsLibs $theToolKit "mac" aLibs aFrameworks
+  osutils:usedOsLibs $theToolKit $thePlatform aLibs aFrameworks
   set aUsedLibs [concat $aUsedLibs $aLibs]
   set aUsedLibs [concat $aUsedLibs $aFrameworks]
   foreach tkx $aUsedLibs {
@@ -2894,7 +2915,7 @@ proc osutils:xcdtk { theOutDir theToolKit theGuidsMap theIsStatic thePlatform {t
   }
 
   puts $aPbxprojFile [osutils:xcdtk:sources $theToolKit $theTargetType aSrcFileRefSection aGroupSection aPackagesGuids aSrcFileGuids aGuidsMap anIncPaths]
-  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $theIsStatic]
+  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $thePlatform $theIsStatic]
   # End PBXBuildFile section
 
   # Begin PBXFileReference section

adm/qmake/.gitignore

@@ -0,0 +1,5 @@
+/*/*.pro
+/*/*/*.pro
+*.pro.user
+custom.pri
+custom.auto.pri

adm/qmake/OccCppConfig.pri

@@ -0,0 +1,157 @@
+# This is project defines C++ compilation rules for building an OCCT Toolkit.
+
+exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.pri)      { include(custom.pri) }
+
+# Disable some dummy Qt defaults
+QT -= core gui
+CONFIG -= qt app_bundle
+CONFIG -= qml_debug
+CONFIG -= debug_and_release
+
+OccGitRoot = $$_PRO_FILE_PWD_/../../../..
+
+# Define compilation flags
+CONFIG += warn_on
+QMAKE_CFLAGS_WARN_ON   = -Wall
+QMAKE_CXXFLAGS_WARN_ON = -Wall
+win32 {
+  QMAKE_CFLAGS_WARN_ON   = -W4
+  QMAKE_CXXFLAGS_WARN_ON = -W4
+  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
+  QMAKE_CXXFLAGS_STL_ON = /EHa
+
+  QMAKE_CXXFLAGS += -fp:precise
+  #QMAKE_CXXFLAGS -= -Zc:throwingNew
+  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
+
+  QMAKE_LFLAGS += -INCREMENTAL:NO
+
+  CONFIG(debug, debug|release) {
+    QMAKE_CXXFLAGS += -Od
+    QMAKE_CXXFLAGS += -Ob1
+  }
+
+  DEFINES -= WIN32
+  DEFINES -= WIN64
+  DEFINES += _CRT_SECURE_NO_WARNINGS
+  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
+  DEFINES += _SCL_SECURE_NO_WARNINGS
+} else {
+  CONFIG += c++11
+  QMAKE_CFLAGS   += -fexceptions
+  QMAKE_CXXFLAGS += -fexceptions
+  QMAKE_CXXFLAGS += -fvisibility=default
+  DEFINES += OCC_CONVERT_SIGNALS
+  mac {
+    iphoneos {
+      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
+    } else {
+      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+    }
+  }
+}
+!CONFIG(debug, debug|release) {
+  # disable exceptions in Release builds
+  DEFINES += No_Exception
+  HAVE_RelWithDebInfo {
+    win32 {
+      CONFIG += force_debug_info
+    }
+  }
+}
+
+# Define output folder depending on compiler name
+MY_BITNESS = 32
+
+equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
+equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
+has64Target = $$find(QMAKE_TARGET.arch, "x64")
+count(has64Target, 1) { MY_BITNESS = 64 }
+
+MY_PLATFORM = platform
+CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
+} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
+} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
+} else:win32   { MY_PLATFORM = win$$MY_BITNESS
+} else:mac     { MY_PLATFORM = mac
+} else:linux   { MY_PLATFORM = lin
+} else:unix    { MY_PLATFORM = unix
+} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
+
+MY_COMPILER = compiler
+MY_VC_VER = 0
+android-g++ {
+  MY_COMPILER = gcc
+} else:clang {
+  MY_COMPILER = clang
+} else:gcc {
+  MY_COMPILER = gcc
+} else:win32-msvc2010 {
+  MY_COMPILER = vc10
+  MY_VC_VER = 10
+} else:win32-msvc2012 {
+  MY_COMPILER = vc11
+  MY_VC_VER = 11
+} else:win32-msvc2013 {
+  MY_COMPILER = vc12
+  MY_VC_VER = 12
+} else:win32-msvc2015 {
+  MY_COMPILER = vc14
+  MY_VC_VER = 14
+} else:win32-msvc2017 {
+  MY_COMPILER = vc14
+  MY_VC_VER = 14
+} else:win32-msvc {
+  MY_COMPILER = vc14
+  MY_VC_VER = 14
+  aMsvcVer = $$(VisualStudioVersion)
+  equals(aMsvcVer, 14.0){
+    # VS2015, vc140
+  } else:equals(aMsvcVer, 15.0){
+    # VS2015, vc141
+  } else:equals(aMsvcVer, 16.0){
+    # VS2019, vc142
+  } else {
+    warning (Unknown msvc version. "$$MY_COMPILER" is used)
+  }
+} else {
+  warning (Unknown compiler. "$$MY_COMPILER" is used)
+}
+MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
+#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
+
+CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
+
+DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
+win32 {
+  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
+  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
+  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
+
+  # dummy target creating lib/libd folder
+  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
+  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
+  occtkgen_libfolder.config = verbatim
+  QMAKE_SUBSTITUTES += occtkgen_libfolder
+
+  LIBS += -L$$aLibDest
+  equals(TEMPLATE, lib) {
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
+    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
+    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
+  } else {
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
+  }
+  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
+  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
+  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
+} else {
+  LIBS += -L$$DESTDIR
+  equals(TEMPLATE, app) {
+    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
+  }
+}
+
+#OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
+OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}

adm/qmake/OccModule.pri

@@ -0,0 +1,36 @@
+# This is a project template file defining an OCCT Module.
+# This project should be included with predefined OCC_MODULE_NAME variable.
+TEMPLATE = subdirs
+exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.pri)      { include(custom.pri) }
+
+# Iterate over Toolkits within current Module and generate sub-project per Toolkit
+aModuleList = $$cat(../MODULES, lines)
+for (aModuleIter, aModuleList) {
+  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
+  aModule = $$first($$list($$aModuleIter))
+  equals (aModule, $$OCC_MODULE_NAME) {
+    for (aToolKit, $$list($$aModuleIter)) {
+      toSkipToolkit = 0
+      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
+      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
+      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
+      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
+      equals (toSkipToolkit, 0) {
+        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
+        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
+        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
+        eval(occtkgen_$${aToolKit}.config = verbatim)
+        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
+        SUBDIRS += $${aToolKit}
+
+        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
+        aTkDepends = $${aToolKit}.depends
+        for (aModExtIter, aModExtList) {
+          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
+        }
+        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
+      }
+    }
+  }
+}

adm/qmake/OccModule.pro.in

@@ -0,0 +1,2 @@
+OCC_MODULE_NAME = \$\$TARGET
+include(../OccModule.pri)

adm/qmake/OccToolkit.pri

@@ -0,0 +1,144 @@
+# This is a project template file defining an OCCT Toolkit.
+# This project should be included with predefined OCC_TOOLKIT_NAME variable.
+
+TEMPLATE = lib
+!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
+  TEMPLATE = app
+  CONFIG += console
+}
+win32 {
+  # do not append version to DLL name
+  CONFIG += skip_target_version_ext
+}
+
+include(OccCppConfig.pri)
+
+aSrcRoot = $$OccGitRoot/src
+aHxxRoot = $$OccGitRoot/inc
+INCLUDEPATH += $$aHxxRoot
+
+# CSF variables
+CSF_FREETYPE  = -lfreetype
+CSF_TclLibs   = -ltcl8.6
+CSF_TclTkLibs = -ltk8.6
+HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
+HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
+HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
+HAVE_ZLIB      { CSF_ZLIB = -lzlib }
+HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
+win32 {
+  CSF_kernel32   = -lkernel32
+  CSF_advapi32   = -ladvapi32
+  CSF_gdi32      = -lgdi32
+  CSF_user32     = -luser32 -lcomdlg32
+  CSF_shell32    = -lShell32
+  CSF_opengl32   = -lopengl32
+  CSF_wsock32    = -lwsock32
+  CSF_netapi32   = -lnetapi32
+  CSF_OpenGlLibs = -lopengl32
+  HAVE_GLES2 { CSF_OpenGlLibs = -llibEGL -llibGLESv2 }
+  CSF_psapi      = -lPsapi
+  CSF_winmm      = -lwinmm
+  CSF_d3d9       = -ld3d9
+  CSF_TclLibs    = -ltcl86
+  CSF_TclTkLibs  = -ltk86
+  CSF_TBB =
+} else:mac {
+  CSF_dl         = -ldl
+  CSF_objc       = -lobjc
+  iphoneos {
+    CSF_Appkit     = -framework UIKit
+    CSF_OpenGlLibs = -framework OpenGLES
+  } else {
+    CSF_Appkit     = -framework AppKit
+    CSF_OpenGlLibs = -framework OpenGL
+  }
+  CSF_IOKit      = -framework IOKit
+  CSF_TclLibs    = -framework Tcl
+  CSF_TclTkLibs  = -framework Tk
+} else {
+  CSF_dl = -ldl
+  CSF_ThreadLibs = -lpthread -lrt
+  CSF_OpenGlLibs = -lGL
+  CSF_TclTkLibs  = -lX11 -ltk8.6
+  CSF_XwLibs     = -lX11 -lXext -lXmu -lXi
+  CSF_MotifLibs  = -lX11
+  CSF_fontconfig = -lfontconfig
+  HAVE_GLES2 { CSF_OpenGlLibs = -lEGL -lGLESv2 }
+}
+
+for (aCfgIter, CONFIG) {
+  aRes = $$find(aCfgIter, "^HAVE_")
+  count(aRes, 1) {
+    DEFINES += $$aCfgIter
+  }
+}
+
+# Define the list of standard OCCT file extensions
+aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
+aPxxRegex = ^.*\.(pxx)$
+aCxxRegex = ^.*\.(cxx|c)$
+mac { aCxxRegex = ^.*\.(cxx|c|m|mm)$ }
+
+# Auxiliary function for probing file extension
+defineTest (occCheckExtension) {
+  aProbe = $$find(1, "$$2")
+  count(aProbe, 1) { return(true) } else { return(false) }
+}
+
+# Auxiliary function for probing compilable files
+defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
+
+# Auxiliary function for probing header files
+defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
+
+aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
+aTkFiles += CMakeLists.txt
+aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
+anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
+
+for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
+for (anExternLib, anExternLibs) {
+  hasCsf = $$find(anExternLib, CSF_)
+  count(hasCsf, 1) {
+    aList = $$split($$anExternLib, "\n")
+    LIBS += $$aList
+  } else {
+    LIBS += -l$$anExternLib
+  }
+}
+
+# Iterate over Packages and add compilable files into this project
+isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
+for (aPackage, aPackages) {
+  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
+  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
+  for (aFileIter, aPackageFiles) {
+    occIsCxxFile($$aFileIter) {
+      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
+    }
+  }
+}
+
+# extend clean with versioned .so files
+!win32 {
+  aVerList = $$split(VERSION, ".")
+  aVerMaj = $$member(aVerList, 0)
+  aVerMin = $$member(aVerList, 1)
+  aVerMic = $$member(aVerList, 2)
+  equals(TEMPLATE, app) {
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
+  } else {
+    mac {
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
+    } else {
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
+    }
+  }
+}

adm/qmake/OccToolkit.pro.in

@@ -0,0 +1,2 @@
+OCC_TOOLKIT_NAME = \$\$TARGET
+include(../../OccToolkit.pri)

adm/qmake/Occt.pro

@@ -0,0 +1,41 @@
+# This is an experimental Solution project for building entire OCCT framework using qmake.
+# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
+# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
+# Building OCCT using CMake is a preferred solution.
+#
+# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
+# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
+# - Launch genproj to fill in "inc" folder with links to header files.
+# - Open project in Qt Creator, and call "Run qmake".
+# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
+# - "Run qmake" and perform Build.
+TEMPLATE = subdirs
+exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.pri)      { include(custom.pri) }
+
+OTHER_FILES += OccModule.pro.in \
+               OcctHeaderLink.hxx.in \
+               OccToolkit.pro.in \
+               OccCppConfig.pri \
+               OccModule.pri \
+               OccToolkit.pri \
+               custom.pri.template
+
+# Iterate over Modules and generate sub-projects
+aSolModuleList = $$cat(../MODULES, lines)
+for (aSolModuleIter, aSolModuleList) {
+  aSolModule = $$first($$list($$aSolModuleIter))
+  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
+  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
+  eval(occtkgen_$${aSolModule}.config = verbatim)
+  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
+  SUBDIRS += $${aSolModule}
+}
+
+# These dependencies are manually defined
+ModelingData.depends = FoundationClasses
+ModelingAlgorithms.depends = FoundationClasses ModelingData
+Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
+ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
+DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
+Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization

adm/qmake/OcctHeaderLink.hxx.in

@@ -0,0 +1 @@
+#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"

adm/qmake/custom.pri.template

@@ -0,0 +1,17 @@
+PRODUCTS_PATH = c:/3rdparty/vc14
+
+#CONFIG += HAVE_FREEIMAGE
+#CONFIG += HAVE_FFMPEG
+#CONFIG += HAVE_TBB
+#CONFIG += HAVE_GLES2
+#CONFIG += HAVE_D3D
+#CONFIG += HAVE_VTK
+
+aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
+aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
+
+INCLUDEPATH += $$aFreeType/include
+LIBS        += -L$$aFreeType/lib
+
+INCLUDEPATH += $$aTclTk/include
+LIBS        += -L$$aTclTk/lib

adm/templates/env.bat

@@ -24,11 +24,13 @@ set "HAVE_GLES2=false"
 set "HAVE_D3D=false"
 set "HAVE_ZLIB=false"
 set "HAVE_LIBLZMA=false"
+set "HAVE_RAPIDJSON=false"
 set "CSF_OPT_INC="
 set "CSF_OPT_LIB32="
 set "CSF_OPT_LIB64="
 set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="
+set "CSF_DEFINES=%CSF_DEFINES_EXTRA%"
 
 if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
 if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
@@ -162,6 +164,7 @@ if ["%HAVE_GLES2%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
 if ["%HAVE_D3D%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D"       & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
 if ["%HAVE_ZLIB%"]      == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB"      & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
 if ["%HAVE_LIBLZMA%"]   == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA"   & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"
+if ["%HAVE_RAPIDJSON%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_RAPIDJSON" & set "CSF_DEFINES=HAVE_RAPIDJSON;%CSF_DEFINES%"
 
 rem Eliminate VS warning
 if ["%CSF_DEFINES%"]  == [""] set "CSF_DEFINES=;"

adm/templates/env.sh

@@ -6,7 +6,7 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath
 # Reset values
 export CASROOT="__CASROOT__"
 export CASDEB=""
-export TARGET="";
+export PRJFMT="";
 export HAVE_TBB="false";
 export HAVE_OPENCL="false";
 export HAVE_FREEIMAGE="false";
@@ -40,9 +40,9 @@ do
   elif [ "$i" == "i" ] || [ "$i" == "relwithdeb" ]; then
     export CASDEB="i"
   elif [ "$i" == "cbp" ]; then
-    export TARGET="cbp";
+    export PRJFMT="cbp";
   elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
-    export TARGET="xcd";
+    export PRJFMT="xcd";
   fi
 done
 shopt -u nocasematch
@@ -64,28 +64,32 @@ else
 fi
 
 export CASBIN=""
-if [ "${TARGET}" == "cbp" ]; then
-  export CASBIN="${WOKSTATION}/cbp"
-elif [ "${TARGET}" == "xcd" ]; then
+if [ "${PRJFMT}" == "xcd" ]; then
   export CASBIN="adm/mac/xcd/build"
+else
+  if [ "$aSystem" == "Darwin" ]; then
+    export CASBIN="${WOKSTATION}/clang"
+  else
+    export CASBIN="${WOKSTATION}/gcc"
+  fi
 fi
 
 export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"
 
-if [ "${TARGET}" == "cbp" ]; then
-  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
-  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
-  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
-  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
-  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
-  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
-elif [ "${TARGET}" == "xcd" ]; then
+if [ "${PRJFMT}" == "xcd" ]; then
   export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
   export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
   export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
   export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
   export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
   export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
+else
+  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
+  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
+  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
 fi
 
 export CSF_OPT_CMPL=""
@@ -174,7 +178,7 @@ export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
 export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
 export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"
 
-if [ "${TARGET}" == "xcd" ]; then
+if [ "${PRJFMT}" == "xcd" ]; then
   if [ "${CASDEB}" == "d" ]; then
     export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
   else

dox/dev_guides/tests/tests.md

@@ -878,7 +878,18 @@ The test grid name is constructed depending on the type of the tested chamfers.
 | dist_angle_complex	| |	Distance from edge and given angle |
 | dist_angle_sequence	| |	Distance from edge and given angle |
 
-@subsubsection testmanual_5_1_7 demo
+@subsubsection testmanual_5_1_7 de
+
+This group tests reading and writing of CAD data files (iges, step) to and from OCCT.
+
+Test cases check transfer status, shape and attributes against expected reference values.
+
+| Grid	| Commands | Functionality |
+| :---- | :----- | :------- | 
+| iges_1, iges_2, iges_3 | igesbrep, brepiges, ReadIges, WriteIges | IGES tests | 
+| step_1, step_2, step_3, step_4, step_5 | stepread, stepwrite, ReadStep, WriteStep | STEP tests |
+
+@subsubsection testmanual_5_1_8 demo
 
 This group allows demonstrating how testing cases are created, and testing DRAW commands and the test system as a whole.
 
@@ -889,7 +900,7 @@ This group allows demonstrating how testing cases are created, and testing DRAW
 | samples	| |	OCCT samples | 
 
 
-@subsubsection testmanual_5_1_8 draft
+@subsubsection testmanual_5_1_9 draft
 
 This group allows testing draft operations.
 
@@ -900,7 +911,7 @@ DRAW module: MODELING.
 | Angle	| depouille	| Drafts with angle (inclined walls) |
 
 
-@subsubsection testmanual_5_1_9 feat
+@subsubsection testmanual_5_1_10 feat
 
 This group allows testing creation of features on a shape.
 
@@ -914,7 +925,7 @@ DRAW module: MODELING (package *BRepTest*).
 | featrevol		| | | 
 | featrf		| | |
 
-@subsubsection testmanual_5_1_10 heal
+@subsubsection testmanual_5_1_11 heal
 
 This group allows testing the functionality provided by *ShapeHealing* toolkit.
 
@@ -943,7 +954,7 @@ DRAW module: XSDRAW
 | surface_to_revolution_standard |	DT_ShapeConvertRev	| Convert elementary surfaces to revolutions, simple cases |
 | update_tolerance_locked	| updatetolerance	| Update the tolerance of shape so that it satisfy the rule: toler(face)<=toler(edge)<=toler(vertex) |
 
-@subsubsection testmanual_5_1_11 mesh
+@subsubsection testmanual_5_1_12 mesh
 
 This group allows testing shape tessellation (*BRepMesh*) and shading.
 
@@ -960,7 +971,7 @@ DRAW modules: MODELING (package *MeshTest*), VISUALIZATION (package *ViewerTest*
 | advanced_incmesh_parallel | incmesh | Meshing of complex shapes, parallel mode |
 | standard_incmesh_parallel | incmesh | Meshing of simple shapes, parallel mode |
 
-@subsubsection testmanual_5_1_12 mkface
+@subsubsection testmanual_5_1_13 mkface
 
 This group allows testing creation of simple surfaces.
 
@@ -975,7 +986,7 @@ DRAW module: MODELING (package *BRepTest*)
 | after_revsurf_and_offset | mkface	| | 
 | mkplane | mkplane	| |
 
-@subsubsection testmanual_5_1_13 nproject
+@subsubsection testmanual_5_1_14 nproject
 
 This group allows testing normal projection of edges and wires onto a face.
 
@@ -985,7 +996,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | Base	| nproject	|  |
 
-@subsubsection testmanual_5_1_14 offset
+@subsubsection testmanual_5_1_15 offset
 
 This group allows testing offset functionality for curves and surfaces.
 
@@ -1001,7 +1012,7 @@ DRAW module: MODELING (package *BRepTest*)
 | shape	 | offsetshape	| |
 | wire_closed_outside_0_005, wire_closed_outside_0_025, wire_closed_outside_0_075, wire_closed_inside_0_005, wire_closed_inside_0_025, wire_closed_inside_0_075, wire_unclosed_outside_0_005, wire_unclosed_outside_0_025, wire_unclosed_outside_0_075	|	mkoffset | 2d offset of closed and unclosed planar wires with different offset step and directions of offset ( inside / outside ) |
 	
-@subsubsection testmanual_5_1_15 pipe
+@subsubsection testmanual_5_1_16 pipe
 
 This group allows testing construction of pipes (sweeping of a contour along profile).
 
@@ -1011,7 +1022,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | Standard	| pipe	| |
 
-@subsubsection testmanual_5_1_16 prism
+@subsubsection testmanual_5_1_17 prism
 
 This group allows testing construction of prisms.
 
@@ -1021,7 +1032,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | seminf | prism	| |
 
-@subsubsection testmanual_5_1_17 sewing
+@subsubsection testmanual_5_1_18 sewing
 
 This group allows testing sewing of faces by connecting edges.
 
@@ -1033,7 +1044,7 @@ DRAW module: MODELING (package *BRepTest*)
 | tol_1	| sewing | Sewing faces with tolerance 1 |
 | tol_100 | sewing | Sewing faces with tolerance 100 | 
 
-@subsubsection testmanual_5_1_18 thrusection
+@subsubsection testmanual_5_1_19 thrusection
 
 This group allows testing construction of shell or a solid passing through a set of sections in a given sequence (loft).
 
@@ -1042,7 +1053,7 @@ This group allows testing construction of shell or a solid passing through a set
 | solids	| thrusection | Lofting with resulting solid | 
 | not_solids | thrusection	| Lofting with resulting shell or face | 
 
-@subsubsection testmanual_5_1_19 xcaf
+@subsubsection testmanual_5_1_20 xcaf
 
 This group allows  testing extended data exchange packages.
 

dox/dev_guides/upgrade/upgrade.md

@@ -1716,9 +1716,86 @@ aGroup->SetPrimitivesAspect (myDrawer->LineAspect()->Aspect()); //!< next array
 aGroup->AddPrimitiveArray (aLines);
 ~~~~
 
+@subsection upgrade_740_text Changes in Graphic3d_Text and OpenGl_Text API
+
+Parameters of *Text* in *Graphic3d_Group* are moved into a new *Graphic3d_Text* class. *AddText* of *Graphic3d_Group* should be used instead of the previous *Text*.
+
+The previous code:
+~~~~
+Standard_Real x, y, z;
+theAttachmentPoint.Coord(x,y,z);
+theGroup->Text (theText,
+                Graphic3d_Vertex(x,y,z),
+                theAspect->Height(),
+                theAspect->Angle(),
+                theAspect->Orientation(),
+                theAspect->HorizontalJustification(),
+                theAspect->VerticalJustification());
+~~~~
+should be replaced by the new code:
+~~~~
+Handle(Graphic3d_Text) aText = new Graphic3d_Text (theAspect->Height());
+aText->SetText (theText.ToExtString());
+aText->SetPosition (theAttachmentPoint);
+aText->SetHorizontalAlignment (theAspect->HorizontalJustification());
+aText->SetVerticalAlignment (theAspect->VerticalJustification());
+theGroup->AddText (aText);
+~~~~
+
+*OpenGl_Text* contains *Graphic3d_Text* field.
+
+*OpenGl_TextParam* struct is removed. Constructor and *Init* of *OpenGl_Text* with *OpenGl_TextParam* are also removed.
+Instead of using them, change *OpenGl_Text*.
+
+Please, note, that after modifying *OpenGl_Text*, *Reset* of *OpenGl_Text* should be called.
+
+*FormatParams* of *OpenGl_Text* is replaced by *Text*.
+
+@subsection upgrade_740_prsupdate Presentation invalidation
+
+Historically AIS_InteractiveObject provided two independent mechanisms invalidating presentation (asking presentation manager to recompute specific display mode or all modes):
+
+1. *AIS_InteractiveObject::SetToUpdate()*, marking existing presentation for update.
+   This is main invalidation API, which is expected to be followed by *AIS_InteractiveContext::Update()* call.
+2. *AIS_InteractiveObject::myToRecomputeModes* + *myRecomputeEveryPrs*.
+   This is auxiliary invalidation API, used internally by AIS_InteractiveContext::SetColor()/UnsetColor() and similar modification methods.
+
+The latter one has been removed to avoid confusion and unexpected behavior.
+In addition, two methods *AIS_InteractiveObject::Update()* have been deprecated in favor of new *AIS_InteractiveObject::UpdatePresentations()* recomputing only invalidated presentations.
+
+Custom presentations implementing interface methods *AIS_InteractiveObject::SetColor()* and others should be revised to use *AIS_InteractiveObject::SetToUpdate()*
+or updating presentation without recomputation (see *AIS_InteractiveObject::SynchronizeAspects()* and *AIS_InteractiveObject::replaceAspects()*).
+
 @subsection upgrade_740_interiorstyles Interior styles
 
 * *Aspect_IS_HOLLOW* is now an alias to *Aspect_IS_EMPTY* and does not implicitly enables drawing mesh edges anymore.
   Specify Graphic3d_AspectFillArea3d::SetDrawEdges(true) with Graphic3d_AspectFillArea3d::SetInteriorStyle(Aspect_IS_EMPTY) to get previous behavior of Aspect_IS_HOLLOW style.
 * *Aspect_IS_HIDDENLINE* does not implicitly enables drawing mesh edges anymore.
   Specify Graphic3d_AspectFillArea3d::SetDrawEdges(true) with Graphic3d_AspectFillArea3d::SetInteriorStyle(Aspect_IS_HIDDENLINE) to get previous behavior of Aspect_IS_HIDDENLINE style.
+
+@subsection upgrade_740_modedprs PrsMgr and SelectMgr hierarchy clean up
+
+Proxy classes *Prs3d_Presentation*, *PrsMgr_ModedPresentation* and *PrsMgr_Prs* have been removed.
+Code iterating through the list of low-level structures AIS_InteractiveObject::Presentations() should be updated to access PrsMgr_Presentation directly.
+Forward declarations of *Prs3d_Presentation* should be corrected, since it is now a typedef to *Graphic3d_Structure*.
+
+Proxy classes *SelectBasics_SensitiveEntity* and *SelectBasics_EntityOwner* have been removed - *Select3D_SensitiveEntity* and *SelectMgr_EntityOwner* should be now used directly instead.
+
+@subsection upgrade_740_geproj Custom defines within env.bat
+
+*env.bat* produced by Visual Studio project generator *genproj.bat* has been modified so that *%CSF_DEFINES%* variable is reset to initial state.
+Custom building environment relying on old behavior and setting extra macros within *%CSF_DEFINES%* before env.bat should be updated
+to either modify custom.bat or setup new variable *%CSF_DEFINES_EXTRA%* instead.
+
+@subsection upgrade_740_BVH_in_BOP Switching Boolean Operations algorithm to use BVH tree instead of UB tree
+
+Since OCCT 7.4.0 Boolean Operations algorithm uses BVH tree instead of UBTree to find the pairs of entities with interfering bounding boxes.
+The following API changes have been made:
+* BOPTools_BoxBndTree and BOPTools_BoxBndTreeSelector have been removed. Use the BOPTools_BoxTree and BOPTools_BoxTreeSelector instead.
+* BOPTools_BoxSelector::SetBox() method now accepts the BVH_Box instead of Bnd_Box.
+* Methods BOPTools_BoxSelector::Reject and BOPTools_BoxSelector::Accept have been removed as unused.
+* The RunParallel flag has been removed from the list of parameters of BOPAlgo_Tools::IntersectVertices method. Earlier, it performed selection from the UB tree in parallel mode. Now all interfering pairs are found in one pass, using pair traverse of the same BVH tree.
+
+@subsection upgrade_740_stdnamespace Standard_Stream.hxx no more has "using std::" statements
+*Standard_Stream.hxx* header, commonly included by other OCCT header files, does no more add entities from *std namespace* related to streams (like *std::cout*, *std::istream* and others) into global namespace.
+The application code relying on this matter should be updated to either specify std namespace explicitly (like std::cout) or add "using std::" statements locally.

dox/overview/overview.md

@@ -222,6 +222,7 @@ for which OCCT is certified to work.
 | Freetype (for text rendering) | FreeType 2.4.11-2.7.1 https://sourceforge.net/projects/freetype/files/ |
 | FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.17.0+ https://sourceforge.net/projects/freeimage/files |
 | FFmpeg (optional, for video recording) | FFmpeg 3.1+ https://www.ffmpeg.org/download.html |
+| RapidJSON (optional, for reading glTF) | RapidJSON 1.1+ http://rapidjson.org/ |
 | Intel TBB (optional, for multithreaded algorithms) | TBB 4.x or 5.x https://www.threadingbuildingblocks.org/ |
 | VTK (for VTK Integration Services | VTK 6.1+ http://www.vtk.org/download/ |
 | Doxygen (optional for building documentation) | Doxygen 1.8.5+ https://www.stack.nl/~dimitri/doxygen/download.html |

dox/resources/occt_rm.doxyfile

@@ -23,7 +23,7 @@ WARNINGS               = NO
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
-PREDEFINED             = Standard_EXPORT Standard_NODISCARD Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC
+PREDEFINED             = Standard_EXPORT Standard_NODISCARD Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC "Standard_DEPRECATED=//! @deprecated "
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
 SEARCH_INCLUDES        = YES

dox/user_guides/draw_test_harness/draw_test_harness.md

@@ -1,4 +1,4 @@
-Draw Test Harness  {#occt_user_guides__test_harness}
+Draw Test Harness  {#occt_user_guides__test_harness}
 ===============================
 
 @tableofcontents
@@ -5593,8 +5593,9 @@ Draw provides command to create curves and surfaces by approximation.
 
 * **2dapprox** fits a curve through 2d points; 
 * **appro** fits a curve through 3d points;
-* **surfapp** and **grilapp** fit a surface through 3d points;
-* **2dinterpolate** interpolates a curve. 
+* **surfapp** and **grilapp** fit a surface through 3d points by approximation;
+* **surfint** fit a surface through 3d points by interpolation;
+* **2dinterpole** interpolates a curve. 
 
 @subsubsection occt_draw_6_8_1   appro, dapprox
 
@@ -5614,17 +5615,28 @@ Let us pick points and they will be fitted
 2dapprox c 10 
 ~~~~~
 
-@subsubsection occt_draw_6_8_2  surfapp, grilapp
+@subsubsection occt_draw_6_8_2  surfapp, grilapp, surfint
 
 
 Syntax: 
 ~~~~~
 surfapp name nbupoints nbvpoints x y z .... 
+or
+surfapp name nbupoints nbvpoints surf [periodic_flag = 0]
 grilapp name nbupoints nbvpoints xo dx yo dy z11 z12 ... 
+surfint name surf nbupoints nbvpoints [periodic_flag = 0]
 ~~~~~
 
 * **surfapp** fits a surface through an array of u and v points, nbupoints*nbvpoints. 
 * **grilapp** has the same function, but the x,y coordinates of the points are on a grid starting at x0,y0 with steps dx,dy. 
+* **surfapp** can take array of points from other input surface, if alternative syntax
+**surfapp** name nbupoints nbvpoints surf [periodic_flag = 0]
+is used.
+Both command use for fitting approximation algorithm.
+**surfint** uses interpolation algorithm and can take array of point only from other input surface.
+Optional parameter **periodic_flag** allows to get correct periodical surfaces in U direction.
+U direction of result surface corresponds colums of initial array of points.
+If **periodic_flag** = 1, algorithm uses first row of array as last row and builds periodical surface.
 
 **Example:** 
 ~~~~~

dox/user_guides/modeling_data/modeling_data.md

@@ -1341,7 +1341,26 @@ Further, let us consider the triangle \f$ T_{0}\left \langle p_{0}, p_{1}, p_{2}
 <span>10.</span> Compute the center of OBB and its half dimensions.<br>
 <span>11.</span> Create OBB using the center, axes and half dimensions.<br>
 
-This algorithm is implemented in the *Bnd_OBB::ReBuild(...)* method.
+@subsubsection occt_modat_6_1_1_opt Creation of Optimal OBB from set of points
+
+For creation of the optimal OBB from set of points the same algorithm as described above is used but with some simplifications in logic and increased computation time.
+For the optimal OBB it is necessary to check all possible axes which can be created by the extremal points. And since the extremal points are only valid for the initial axes it is necessary to project the whole set of points on each axis.
+This approach usually provides much tighter OBB but the performance is lower. The complexity of the algorithm is still linear and with use of BVH for the set of points it is O(N + C*log(N)).
+
+Here is the example of optimal and not optimal OBB for the model using the set of 125K nodes:
+<table align="center">
+<tr>
+  <td>@figure{/user_guides/modeling_data/images/modeling_data_obb_125K.png,"Not optimal OBB by DiTo-14",160}</td>
+  <td>@figure{/user_guides/modeling_data/images/modeling_data_opt_obb_125K.png,"Optimal OBB by DiTo-14",160}</td>
+  <td>@figure{/user_guides/modeling_data/images/modeling_data_pca_obb_125K.png,"Not optimal OBB by PCA",160}</td>
+</tr>
+</table>
+
+Computation of the not optimal OBB in this case took 0.007 sec, optimal - 0.1 sec, which is about 14 times slower. Such performance is comparable to creation of the OBB for this shape by PCA approach (see below) which takes about 0.17 sec.
+
+The computation of optimal OBB is controlled by the same *theIsOptimal* flag in the BRepBndLib::AddOBB method as for PCA algorithm.
+
+These algorithms are implemented in the *Bnd_OBB::ReBuild(...)* method.
 
 @subsubsection occt_modat_6_1_2 Creation of OBB based on Axes of inertia
 

dox/user_guides/visualization/visualization.md

@@ -226,8 +226,6 @@ Selection is implemented as a combination of various algorithms divided among se
 #### SelectBasics
 
 *SelectBasics* package contains basic classes and interfaces for selection. The most notable are:
-  - *SelectBasics_SensitiveEntity* -- the base definition of a sensitive entity;
-  - *SelectBasics_EntityOwner* -- the base definition of the an entity owner -- the link between the sensitive entity and the object to be selected;
   - *SelectBasics_PickResult* -- the structure for storing quantitative results of detection procedure, for example, depth and distance to the center of geometry;
   - *SelectBasics_SelectingVolumeManager* -- the interface for interaction with the current selection frustum.
 
@@ -247,9 +245,11 @@ Each custom sensitive entity must inherit at least *SelectBasics_SensitiveEntity
   - triangulation;
   - wire.
 
-Each basic sensitive entity inherits *Select3D_SensitiveEntity*, which is a child class of *SelectBasics_SensitiveEntity*.
+Each basic sensitive entity inherits *Select3D_SensitiveEntity*.
 The package also contains two auxiliary classes, *Select3D_SensitivePoly* and *Select3D_SensitiveSet*.
 
+*Select3D_SensitiveEntity* -- the base definition of a sensitive entity.
+
 *Select3D_SensitiveSet* -- a base class for all complex sensitive entities that require the third level BVH usage. It implements traverse of the tree and defines an interface for the methods that check sub-entities.
 
 *Select3D_SensitivePoly* -- describes an arbitrary point set and implements basic functions for selection. It is important to know that this class does not perform any internal data checks. Hence, custom implementations of sensitive entity inherited from *Select3D_SensitivePoly* must satisfy the terms of Separating Axis Theorem to use standard OCCT overlap detection methods.

genproj

@@ -19,10 +19,6 @@ anOpt2=$2
 anOpt3=$3
 anOpt4=$4
 anOpt5=$5
-if [ "$aTarget" == "" ]; then
-  aTarget="cbp"
-  if [ "$aSystem" == "Darwin" ]; then aTarget="xcd"; fi;
-fi
 
 if [ ! -e "${aScriptPath}/custom.sh" ]; then
   tclsh "${aScriptPath}/adm/genconf.tcl"
@@ -37,6 +33,12 @@ source "${aScriptPath}/custom.sh"
 
 if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi
 
+if [ "$aTarget" == "" ]; then aTarget=$PRJFMT; fi;
+if [ "$aTarget" == "" ]; then
+  aTarget="cbp"
+  if [ "$aSystem" == "Darwin" ]; then aTarget="xcd"; fi;
+fi
+
 cd $aScriptPath
 tclsh "./adm/start.tcl" genproj ${aTarget} $anOpt2 $anOpt3 $anOpt4 $anOpt5
 

genproj.bat

@@ -49,6 +49,10 @@ if "%aPlatform%" == "" (
   )
 )
 
+set aPrjFmt=%PRJFMT%
+if "%aPrjFmt%" == "" ( set "aPrjFmt=vcxproj" )
+if "%aPrjFmt%" == "vcxproj" ( set "aPrjFmt=%VCFMT%" )
+
 cd %~dp0
-%TCL_EXEC% %~dp0adm/start.tcl genproj %VCFMT% %aPlatform% %3 %4 %5
+%TCL_EXEC% %~dp0adm/start.tcl genproj %aPrjFmt% %aPlatform% %3 %4 %5
 SET "PATH=%OLD_PATH%"

samples/mfc/occtdemo/GeomConstraints/GeomConstraints_Presentation.cpp

@@ -596,8 +596,8 @@ void GeomConstraints_Presentation::sample3()
   aFileName += "\\points.dat";
 
   // open file
-  ifstream aFile;
-  aFile.open(aFileName.ToCString(), ios::failbit);
+  std::ifstream aFile;
+  aFile.open(aFileName.ToCString(), std::ios::failbit);
   if(!aFile)
   {
     aFileName += " was not found.  The sample can not be shown.";

samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.cxx

@@ -80,7 +80,7 @@ void GeoAlgo_Sol::Build(const TColgp_SequenceOfXYZ& seqOfXYZ)
 
   //Filling plate
   Plate_Plate myPlate;
-  cout<<"  * Nunber of points  = "<< nbPnt << endl;
+  std::cout<<"  * Nunber of points  = "<< nbPnt << std::endl;
   for (i=1; i<= nbPnt; i++) {
     gp_Pnt ptProj(seqOfXYZ.Value(i).X(), seqOfXYZ.Value(i).Y(), 0. );
     gp_Vec aVec( ptProj, seqOfXYZ.Value(i));
@@ -90,7 +90,7 @@ void GeoAlgo_Sol::Build(const TColgp_SequenceOfXYZ& seqOfXYZ)
   }
   myPlate.SolveTI(2, 1.);// resolution 
   if (!myPlate.IsDone()) {
-    cout<<" plate computation has failed"<< endl;
+    std::cout<<" plate computation has failed"<< std::endl;
     myIsDone=Standard_False;
   }
 
@@ -144,11 +144,11 @@ Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName
   Standard_Integer nbPnt=0;
 
   // Read points from the file
-  filebuf fic;
-  istream in(&fic);
+  std::filebuf fic;
+  std::istream in(&fic);
 
-  if (!fic.open(aGroundName,ios::in)){
-    cout << " impossible to open a file : "<<aGroundName<<endl;
+  if (!fic.open(aGroundName,std::ios::in)){
+    std::cout << " impossible to open a file : "<<aGroundName<<std::endl;
     myIsDone = Standard_False;
     return 0;
   }

samples/mfc/standard/01_Geometry/src/GeomSources.cpp

@@ -1217,7 +1217,7 @@ Standard_Real ang = D1.Angle(D2);                \n\
   Handle(ISession_Direction) aDirection2 = new ISession_Direction(gp_Pnt(0,0,0),D2,3);
   aDoc->GetAISContext()->Display(aDirection2, Standard_False);
 
-  cout<<" D1.Angle(D2) : "<<ang<<endl;
+  std::cout<<" D1.Angle(D2) : "<<ang<<std::endl;
 
   TCollection_AsciiString Message2 (ang);
   TCollection_AsciiString Message3 (ang/M_PI/180);

samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp

@@ -1081,9 +1081,9 @@ void CGeometryDoc::OnCreateSol()
     SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
     CString filename = dlg.GetPathName();
 
-    filebuf fic;
-    istream in(&fic);  
-    if (!fic.open (filename, ios::in))
+    std::filebuf fic;
+    std::istream in(&fic);  
+    if (!fic.open (filename, std::ios::in))
       MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Unable to open file", L"CasCade Error", MB_ICONERROR);
 
     TColgp_SequenceOfXYZ seqOfXYZ;
@@ -1162,7 +1162,7 @@ void CGeometryDoc::OnSimplify()
 
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);
-  if (!aFileBuf.open (initfile, ios::in))
+  if (!aFileBuf.open (initfile, std::ios::in))
   {
     initfile += L" was not found. The sample can not be shown.";
     myCResultDialog.SetText (initfile);

samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp

@@ -4949,9 +4949,9 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/,
 				((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Building the tangent surface...");
 				SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
 				CString filename = dlg.GetPathName();
-				filebuf fic;
-				istream in(&fic);  
-				if (!fic.open(filename, ios::in))
+				std::filebuf fic;
+				std::istream in(&fic);  
+				if (!fic.open(filename, std::ios::in))
 					MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : Unable to open file", L"CasCade Error", MB_ICONERROR);
 				Standard_Real x,y,z;
 				BRep_Builder B;

samples/mfc/standard/03_Viewer2d/src/StdAfx.h

@@ -155,7 +155,6 @@ class ISession2D_InteractiveObject;
 class V3d_Viewer;
 class SelectMgr_SelectableObject;
 class TCollection_AsciiString;
-class SelectBasics_EntityOwner;
 class gp_Pnt2d;
 
 //{{AFX_INSERT_LOCATION}}

samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp

@@ -233,7 +233,7 @@ void CViewer2dDoc::OnBUTTONTestFace()
 
     std::filebuf aFileBuf;
     std::istream aStream (&aFileBuf);
-    if (!aFileBuf.open (dlg.GetPathName(), ios::in))
+    if (!aFileBuf.open (dlg.GetPathName(), std::ios::in))
     {
       AfxMessageBox (L"The shape must be not a null Face");
       return;

samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp

@@ -164,7 +164,7 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape,
 
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);
-  if (!aFileBuf.open (initfile, ios::in))
+  if (!aFileBuf.open (initfile, std::ios::in))
   {
     initfile += L" was not found. The sample can not be shown.";
     getDocument()->UpdateResultMessageDlg ("Textured Shape", initfile);

samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp

@@ -936,7 +936,7 @@ void CViewer3dDoc::DoSample()
     catch (Standard_Failure const& anException)
     {
       Standard_SStream aSStream;
-      aSStream << "An exception was caught: " << anException << ends;
+      aSStream << "An exception was caught: " << anException << std::ends;
       CString aMsg = aSStream.str().c_str();
       AfxMessageBox (aMsg);
     }

samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp

@@ -925,7 +925,7 @@ void COcafDoc::OnFileSaveAs()
 	CWaitCursor aWaitCursor;
 	CString CSPath = dlg.GetPathName();
 
-	cout << "Save As " << CSPath << endl;
+	std::cout << "Save As " << CSPath << std::endl;
 	PathName=CSPath;
         const wchar_t* SPath = CSPath;
 	TCollection_ExtendedString TPath (SPath);

samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx

@@ -76,7 +76,7 @@ Standard_Boolean TOcafFunction_CutDriver::MustExecute(const Handle(TFunction_Log
 */
   TCollection_AsciiString aEntry;
   TDF_Tool::Entry(Label(), aEntry);
-  cout << "Entry: "<<aEntry.ToCString()<<endl;
+  std::cout << "Entry: "<<aEntry.ToCString()<<std::endl;
   Label().FindChild(1).FindAttribute(TDF_Reference::GetID(),OriginalRef);
   if (log->IsModified(OriginalRef->Get()))   return Standard_True; // Original shape.
 

samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp

@@ -425,7 +425,7 @@ void Tesselate_Presentation::sample(const Standard_CString aFileName)
 
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);
-  if (!aFileBuf.open (initfile, ios::in))
+  if (!aFileBuf.open (initfile, std::ios::in))
   {
     initfile += L" was not found. The sample can not be shown.";
     GetDocument()->PocessTextInDialog ("Compute the triangulation on a shape", initfile);

samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp

@@ -349,7 +349,7 @@ void CTriangulationDoc::DoSample()
     catch (Standard_Failure const& anException)
     {
       Standard_SStream aSStream;
-      aSStream << "An exception was caught: " << anException << ends;
+      aSStream << "An exception was caught: " << anException << std::ends;
       CString aMsg = aSStream.str().c_str();
 //      aSStream.rdbuf()->freeze(0);   // allow deletion of dynamic array
       AfxMessageBox (aMsg);

samples/mfc/standard/09_Animation/src/AnimationDoc.cpp

@@ -83,35 +83,35 @@ CAnimationDoc::CAnimationDoc()
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);
   CString aPathCrankArm = aDataDirPath + "\\CrankArm.rle";
-  if (aFileBuf.open (aPathCrankArm, ios::in))
+  if (aFileBuf.open (aPathCrankArm, std::ios::in))
   {
     BRepTools::Read (CrankArm, aStream, B);
     aFileBuf.close();
   }
 
   CString aPathCylinderHead = aDataDirPath + "\\CylinderHead.rle";
-  if (aFileBuf.open (aPathCylinderHead, ios::in))
+  if (aFileBuf.open (aPathCylinderHead, std::ios::in))
   {
     BRepTools::Read (CylinderHead, aStream, B);
     aFileBuf.close();
   }
 
   CString aPathPropeller = aDataDirPath + "\\Propeller.rle";
-  if (aFileBuf.open (aPathPropeller, ios::in))
+  if (aFileBuf.open (aPathPropeller, std::ios::in))
   {
     BRepTools::Read (Propeller, aStream, B);
     aFileBuf.close();
   }
 
   CString aPathPiston = aDataDirPath + "\\Piston.rle";
-  if (aFileBuf.open (aPathPiston, ios::in))
+  if (aFileBuf.open (aPathPiston, std::ios::in))
   {
     BRepTools::Read (Piston, aStream, B);
     aFileBuf.close();
   }
 
   CString aPathEngineBlock = aDataDirPath + "\\EngineBlock.rle";
-  if (aFileBuf.open (aPathEngineBlock, ios::in))
+  if (aFileBuf.open (aPathEngineBlock, std::ios::in))
   {
     BRepTools::Read (EngineBlock, aStream, B);
     aFileBuf.close();

samples/mfc/standard/09_Animation/src/Fonc.cxx

@@ -49,7 +49,7 @@ Handle(TColStd_HArray2OfReal) ReadRegularGrid(CString FileName,
   if (fp) 
     {
       fscanf_s(fp, "%d %d", &R2, &C2);
-      cout << "Reading Grid : ( " << R2 << " , " << C2 << " )." << endl;
+      std::cout << "Reading Grid : ( " << R2 << " , " << C2 << " )." << std::endl;
       
       H = new TColStd_HArray2OfReal(C1, C2, R1, R2);
       
@@ -83,14 +83,14 @@ Handle(TColStd_HArray2OfReal) ReadRegularGrid(CString FileName,
 	    }
 	}
       
-      cout << "Deltax = " << Deltax << endl;
-      cout << "Deltay = " << Deltay << endl;
+      std::cout << "Deltax = " << Deltax << std::endl;
+      std::cout << "Deltay = " << Deltay << std::endl;
       
       fclose(fp);
     } 
   else 
     {
-      cout << "cannot open file : " << FileName << endl;
+      std::cout << "cannot open file : " << FileName << std::endl;
     }
   return H;
 }

samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp

@@ -153,7 +153,7 @@ void COCCDemoDoc::DoSample()
     catch (Standard_Failure const& anException)
     {
       Standard_SStream aSStream;
-      aSStream << "An exception was caught: " << anException << ends;
+      aSStream << "An exception was caught: " << anException << std::ends;
       CString aMsg = aSStream.str().c_str();
       AfxMessageBox (aMsg);
     }

samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp

@@ -17,7 +17,8 @@ void ISession2D_Shape::Add(const TopoDS_Shape& aShape)
   myListOfShape.Append(aShape);
   myAlgo.Nullify();
   myPolyAlgo.Nullify();
-  Update(); // protected method used to specify that the presentation are not up to date 
+  SetToUpdate();
+  UpdatePresentations();
 }
 
 void ISession2D_Shape::Remove (const TopoDS_Shape& theShape)
@@ -42,23 +43,17 @@ void ISession2D_Shape::SetProjector (HLRAlgo_Projector& aProjector)
   myProjector= aProjector;
   myAlgo.Nullify();
   myPolyAlgo.Nullify();
-  Update(); // protected method used to specify that the presentation are not up to date 
+  SetToUpdate();
+  UpdatePresentations();
 };
 
 
 void ISession2D_Shape::SetNbIsos(Standard_Integer& aNbIsos)
-{ 
-	myNbIsos= aNbIsos; 
-	myAlgo.Nullify(); 
-    
-	// declare the mode 100 to 110 as non valid
-	for (int i=100;i<=110;i++)
-       Update(i,Standard_False); // protected method used to specify that the presentation are not up to date 
-
-	// declare the mode 1100 to 1110 as non valid
-	for (int i=1100;i<=1110;i++)
-       Update(i,Standard_False); // protected method used to specify that the presentation are not up to date 
-
+{
+  myNbIsos= aNbIsos;
+  myAlgo.Nullify();
+  SetToUpdate();
+  UpdatePresentations();
 };
 
 void ISession2D_Shape::BuildAlgo() 

samples/mfc/standard/Common/ImportExport/ImportExport.cpp

@@ -156,7 +156,7 @@ Standard_Boolean CImportExport::ReadBREP(CString      aFileName,
 
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);
-  if (!aFileBuf.open (aFileName, ios::in))
+  if (!aFileBuf.open (aFileName, std::ios::in))
   {
     return Standard_False;
   }
@@ -230,7 +230,7 @@ Standard_Boolean CImportExport::SaveBREP (CString             aFileName,
 {
   std::filebuf aFileBuf;
   std::ostream aStream (&aFileBuf);
-  if (!aFileBuf.open (aFileName, ios::out))
+  if (!aFileBuf.open (aFileName, std::ios::out))
   {
     return Standard_False;
   }
@@ -811,7 +811,7 @@ Standard_Boolean CImportExport::SaveVRML(const Standard_CString&
     } // iterator of shapes
 
     // Call VRML writer
-    ofstream writer(aFileName);
+    std::ofstream writer(aFileName);
     writer<<scene;
     writer.close();
 

samples/mfc/standard/Common/User_Cylinder.cxx

@@ -129,7 +129,7 @@ case 6: //color
     // This triangulation is computed with the deflection myDeflection.
 
 #ifdef DEBUG
-    cout <<"Deflection = " << myDeflection << "\n" << endl;
+    std::cout <<"Deflection = " << myDeflection << "\n" << std::endl;
 #endif
 
     Standard_Integer NumFace;
@@ -145,7 +145,7 @@ case 6: //color
       TopLoc_Location myLocation = myFace.Location();
 
 #ifdef DEBUG
-      cout << "J\'explore actuellement la face " << NumFace << "\n" << endl;
+      std::cout << "J\'explore actuellement la face " << NumFace << "\n" << std::endl;
 #endif
       Handle(Poly_Triangulation) myT = BRep_Tool::Triangulation(myFace, myLocation);
       // Returns the Triangulation of the face. It is a null handle if there is no triangulation.
@@ -153,7 +153,7 @@ case 6: //color
       if (myT.IsNull())
       {
 #ifdef DEBUG
-        // cout << "Triangulation of the face "<< i <<" is null \n"<< endl;
+        // std::cout << "Triangulation of the face "<< i <<" is null \n"<< std::endl;
 #endif
         return;
       }
@@ -200,7 +200,7 @@ case 6: //color
       TopLoc_Location myLocation = myFace.Location();
 
 #ifdef DEBUG
-      cout << "J\'explore actuellement la face " << NumFace << "\n" << endl;
+      std::cout << "J\'explore actuellement la face " << NumFace << "\n" << std::endl;
 #endif
       Handle(Poly_Triangulation) myT = BRep_Tool::Triangulation(myFace, myLocation);
       // Returns the Triangulation of the face. It is a null handle if there is no triangulation.
@@ -208,7 +208,7 @@ case 6: //color
       if (myT.IsNull())
       {
 #ifdef DEBUG
-        //cout << "Triangulation of the face "<< i <<" is null \n"<< endl;
+        //std::cout << "Triangulation of the face "<< i <<" is null \n"<< std::endl;
 #endif
         return;
       }
@@ -255,7 +255,7 @@ case 6: //color
       for (nt = 1; nt <= nnn; nt++)
       {
 #ifdef DEBUG
-        cout << "On traite actuellement le triangle : "<< nt <<"\n";
+        std::cout << "On traite actuellement le triangle : "<< nt <<"\n";
 #endif
         if (myFace.Orientation() == TopAbs_REVERSED) // si la face est "reversed"
           triangles(nt).Get(n1,n3,n2); // le triangle est n1,n3,n2

samples/mfc/standard/Common/Winmain.cpp

@@ -50,7 +50,7 @@ int AFXAPI AfxWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
 //  int i = setvbuf( stdout, NULL, _IONBF, 0 );
 //  filebuf ff(hCrt);
 //  cout = &ff;
-  cout<<"This Debug Window is defined in WinMain.cpp and will disappear in release mode"<<endl;
+  std::cout<<"This Debug Window is defined in WinMain.cpp and will disappear in release mode"<<std::endl;
 
 #endif //  DISPLAYCONSOLE  // By Matra
 

samples/ocafsamples/TDataStd_Sample.cxx

@@ -354,7 +354,7 @@ static void Sample()
 
   Standard_Boolean isverified =  constraint->Verified();
   if( !isverified ) {
-   cout << "Constraint is not valid"   << endl;
+   std::cout << "Constraint is not valid"   << std::endl;
   }
 
 

samples/ocafsamples/TNaming_Sample.cxx

@@ -308,7 +308,7 @@ void Sample()
   BRepAlgo_Cut mkCUT (OBJECT, TOOL);
 
   if (!mkCUT.IsDone()) {
-    cout << "CUT: Algorithm failed" << endl;
+    std::cout << "CUT: Algorithm failed" << std::endl;
     return; 
   } else 
     {
@@ -318,7 +318,7 @@ void Sample()
 
       if (!BRepAlgo::IsValid(Larg, mkCUT.Shape(), Standard_True, Standard_False)) {
 
-	cout << "CUT: Result is not valid" << endl;
+	std::cout << "CUT: Result is not valid" << std::endl;
 	return;
       } else 
 	{

samples/ocafsamples/TPrsStd_Sample.cxx

@@ -101,9 +101,9 @@ static void Sample()
   Handle(TPrsStd_NamedShapeDriver) driver;
 
   if( table->FindDriver(driverguid,  driver) ) 
-    cout << "Driver was found " << endl;
+    std::cout << "Driver was found " << std::endl;
   else 
-    cout << "Driver wasn't found" << endl;
+    std::cout << "Driver wasn't found" << std::endl;
 
   // Driver can be used to build AIS_InteractiveObject for presenting the given label
 

samples/qt/FuncDemo/src/mainwindow.cpp

@@ -214,7 +214,7 @@ void MainWindow::compute()
     }
 
     aTimer.Show(seconds, minutes, hours, CPUTime);
-    cout << "Execution of "<<graph->getNbThreads()<< " threads took          " << hours << " hours, " << minutes << " minutes, " << seconds << " seconds" << endl;
+    std::cout << "Execution of "<<graph->getNbThreads()<< " threads took          " << hours << " hours, " << minutes << " minutes, " << seconds << " seconds" << std::endl;
 
     // Redraw the nodes (change their colour).            
     redrawGraph();

samples/qt/Interface/src/Translate.cxx

@@ -340,7 +340,7 @@ TranslateDlg* Translate::getDialog( const int format, const bool import )
 		filter.append( "\t" );
 	}
 
-  cout << filter.toLatin1().constData() << endl;
+  std::cout << filter.toLatin1().constData() << std::endl;
   QStringList filters = filter.split( "\t" );
   myDlg->setNameFilters ( filters );
 

samples/tcl/ANC101.tcl

@@ -264,11 +264,11 @@ bfuse _model _model t_s
 explode _model e
 
 # Make a weld at joint edges of platform and wedge 
-blend _model _model 2 _model_26
 blend _model _model 2 _model_27
 blend _model _model 2 _model_28
 blend _model _model 2 _model_29
-blend _model _model 2 _model_31
+blend _model _model 2 _model_30
+blend _model _model 2 _model_32
 
 # Cylinder on wedge
 blend result _model 2 _model_161
@@ -276,7 +276,7 @@ blend result _model 2 _model_161
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vsetcolorbg 200 200 255
+vbackground -color 0.784314 0.784314 1
 vdisplay -dispMode 1 result
 vfit
 vaspects result -setFaceBoundaryDraw 1 -mostContinuity c2

samples/tcl/MBBGehauseRohteil.tcl

@@ -262,7 +262,7 @@ unifysamedom result  p_1
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vsetcolorbg 200 200 255
+vbackground -color 0.784314 0.784314 1
 vdisplay -dispMode 1 result
 vfit
 vaspects result -setFaceBoundaryDraw 1

samples/tcl/Penrose.tcl

@@ -53,7 +53,7 @@ for {set i 1} {$i <= 1} {incr i} {
 
 # prepare a view
 vinit Penrose w=1024 h=512
-vsetcolorbg 255 255 255
+vbackground -color WHITE
 vrenderparams -rayTrace -fsaa on -reflections off -shadows off
 
 # set camera position and adjust lights

samples/tcl/dimensions.tcl

@@ -19,7 +19,7 @@ restore $aBotLoc b
 vinit View1 w=768 h=768
 vclear
 vsetdispmode 0
-vsetcolorbg 255 255 255
+vbackground -color WHITE
 vbottom
 
 puts "Getting cut projection..."

samples/tcl/logo2019.tcl

@@ -0,0 +1,90 @@
+# The following example constructs a 3D object looking like new OCC logo on top view.
+#
+#Category: Modeling
+#Title: OCC Logo 2019
+
+pload MODELING VISUALIZATION XDE OCAF
+
+# spheric body
+psphere s 1
+box b 0 0 -2 1.5 1.5 4
+bcut sb s b
+
+# toroidal handle
+ptorus t 1 0.5
+trotate t 0 0 0 0 0 1 -90
+ttranslate t 1.5 1.5 0
+bcut tb t b
+
+pcylinder p1 0.5 0.5
+trotate p1 0 0 0 0 0 1 180
+trotate p1 0 0 0 1 0 0 90
+ttranslate p1 0.5 1.5 0
+
+pcylinder p2 0.5 0.5
+trotate p2 0 0 0 0 0 1 180
+trotate p2 0 0 0 1 0 0 90
+trotate p2 0 0 0 0 0 1 90
+ttranslate p2 1 0.5 0
+
+bfuse tp tb p1
+bfuse tp tp p2
+
+# intermediate part
+
+# - get surfaces and edges on half of spheric and toroidal parts for filling
+box b -2 -2 -2 4 4 2
+bcut sbh sb b
+bcut tph tp b
+unset b
+
+explode sbh f
+renamevar sbh_1 sbf
+explode sbf e
+
+explode tph f
+renamevar tph_2 tpf1
+renamevar tph_13 tpf2
+explode tpf1 e
+explode tpf2 e
+
+# - make curved surface by plate
+#plate r 0 4 tpf1_1 tpf1 1 tpf2_3 tpf2 1 sbf_2 sbf 1 sbf_4 sbf 1
+approxplate r1 0 4 tpf1_1 tpf1 0 tpf2_1 tpf2 0 sbf_2 sbf 0 sbf_4 sbf 0 0.00001 100 3 0
+
+# - make solid
+tcopy r1 r2
+tmirror r2 0 0 0 0 0 1
+explode sb f
+explode tp f
+sewing rr 0.001 r1 r2 sb_2 sb_3 tp_2 tp_5
+ssolid rr rs
+
+# rotate all solids by 45 deg to have standard orientation of the logo on top view
+trotate sb 0 0 0 0 0 1 -45
+trotate tp 0 0 0 0 0 1 -45
+trotate rs 0 0 0 0 0 1 -45
+
+# create XDE document
+catch {Close D}
+XNewDoc D
+set main [XNewShape D]
+XAddComponent D $main sb
+XAddComponent D $main tp
+XAddComponent D $main rs
+XUpdateAssemblies D
+SetName D $main "OCC Logo 2019"
+SetName D [XFindShape D sb] "Core"
+SetName D [XFindShape D tp] "Loop"
+SetName D [XFindShape D rs] "Connector"
+XSetColor D sb 1 0.21 0.32
+XSetColor D tp 0 0.667 0.855
+XSetColor D rs 0 0.45 0.69
+
+# display
+vinit
+vsetcolorbg 1 1 1
+vsetdispmode 1
+XDisplay D
+vtop
+vfit

samples/tcl/materials.tcl

@@ -51,7 +51,7 @@ proc drawObjects {theRow theColor} {
     uplevel #0 box     $aBox $aCtr $aCtr $aCtr $aSize $aSize $aSize
     uplevel #0 ttranslate   $aSph $x $y 0
     uplevel #0 ttranslate   $aBox [expr $x + 10] $y 0
-    uplevel #0 vdisplay     -noredraw $aSph $aBox
+    uplevel #0 vdisplay     -noredraw -dispMode 1 $aSph $aBox
     uplevel #0 vsetmaterial -noredraw $aSph $aBox $aMatIter
     if {$theColor != ""} {
       uplevel #0 vsetcolor  -noredraw $aSph $aBox $theColor
@@ -64,21 +64,19 @@ proc drawObjects {theRow theColor} {
 # setup 3D viewer content
 pload MODELING VISUALIZATION
 
-catch { vclose View1 }
-vinit View1 w=768 h=768
 vclear
+vclose ALL
+vinit View1 w=768 h=768
 vtop
 vglinfo
-vsetgradientbg 180 200 255 180 180 180 2
+vbackground -gradient 0.705882 0.784314 1  0.705882 0.705882 0.705882 -gradientMode VERTICAL
 
 vlight -change 0 -dir 0.577 -0.577 -0.577
-vsetdispmode 1
 vrenderparams -msaa 8
 
 # adjust scene bounding box
 box bnd 0 0 0 180 210 1
-vdisplay -noredraw bnd
-vsetdispmode       bnd 0
+vdisplay -noredraw -dispMode 0 bnd
 vfit
 vremove -noredraw  bnd
 
@@ -88,5 +86,3 @@ drawObjects 0 ""
 drawObjects 1 red
 drawObjects 2 green
 drawObjects 3 blue1
-#vfit
-vzfit

samples/tcl/pencil.tcl

@@ -59,7 +59,7 @@ XShow D
 vfit
 vsetdispmode 1
 vrenderparams -msaa 8
-vsetcolorbg 255 255 255
+vbackground -color WHITE
 
 #param write.iges.brep.mode 1
 #WriteIges D d:/pencil3.igs

samples/tcl/raytrace.tcl

@@ -30,7 +30,7 @@ vsettransparency glass 0.6
 vlight new spot pos -100 -100 300
 
 # set white background and fit view
-vsetcolorbg 255 255 255
+vbackground -color WHITE
 vfit
 
 # set ray tracing

samples/tcl/snowflake.tcl

@@ -129,7 +129,7 @@ vrenderparams -msaa 8
 vsetcolor snowflake 0 0 0 
 vsetcolor lines 0 0 0 
 vsetcolor text 0 0 0 
-vsetcolorbg 255 255 255
+vbackground -color WHITE
 vtop
 vfit
 

samples/xaml/MainPage.xaml.cpp

@@ -273,7 +273,7 @@ Standard_Boolean MainPage::SaveBREP(const wchar_t* theFilePath, const TopoDS_Sha
   std::filebuf aFileBuf;
   std::ostream aStream(&aFileBuf);
 
-  if (!aFileBuf.open(theFilePath, ios::out)) {
+  if (!aFileBuf.open(theFilePath, std::ios::out)) {
     Output_TextBlock->Text += L"Error: cannot open file for export (brep)\n";
     return Standard_False;
   }
@@ -291,7 +291,7 @@ Standard_Boolean MainPage::SaveIGES(const wchar_t* theFilePath, const TopoDS_Sha
   std::filebuf aFileBuf;
   std::ostream aStream(&aFileBuf);
 
-  if (!aFileBuf.open(theFilePath, ios::out)) {
+  if (!aFileBuf.open(theFilePath, std::ios::out)) {
     Output_TextBlock->Text += L"Error: cannot open file for export (iges)\n";
     return Standard_False;
   }
@@ -319,7 +319,7 @@ Standard_Boolean MainPage::SaveSTEP(const wchar_t* theFilePath, const TopoDS_Sha
   std::filebuf aFileBuf;
   std::ostream aStream(&aFileBuf);
 
-  if (!aFileBuf.open(theFilePath, ios::out)) {
+  if (!aFileBuf.open(theFilePath, std::ios::out)) {
     Output_TextBlock->Text += L"Error: cannot open file for export (step)\n";
     return Standard_False;
   }

src/AIS/AIS.cxx

@@ -14,10 +14,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#include <AIS.hxx>
 
 #include <Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HSurface.hxx>
-#include <AIS.hxx>
 #include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
@@ -82,6 +82,24 @@
 
 const Standard_Real SquareTolerance = Precision::SquareConfusion();
 
+namespace
+{
+  static Standard_CString AIS_Table_PrintDisplayMode[2] =
+  {
+    "WIREFRAME", "SHADING"
+  };
+
+  static Standard_CString AIS_Table_PrintDisplayStatus[3] =
+  {
+    "DISPLAYED", "ERASED", "NONE"
+  };
+
+  static Standard_CString AIS_Table_PrintKindOfInteractive[6] =
+  {
+    "NONE", "DATUM", "SHAPE", "OBJECT", "RELATION", "DIMENSION"
+  };
+}
+
 //=======================================================================
 //function : Nearest
 //purpose  :
@@ -783,6 +801,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
   BRepAdaptor_Surface surf1( aFace );
   Handle( Adaptor3d_HSurface ) surf2;
   Standard_Boolean isOffset = Standard_False;
+  Offset = 0.0;
 
   if (surf1.GetType() == GeomAbs_OffsetSurface)
   {
@@ -801,7 +820,6 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
   {
     aPlane = surf2->Plane();
     aSurfType = AIS_KOS_Plane;
-    Offset = 0.;
     Result = Standard_True;
   }
 
@@ -817,7 +835,6 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
       gp_Pln thePlane( LinePos, LineDir ^ ExtrusionDir);
       aPlane = thePlane;
       aSurfType = AIS_KOS_Plane;
-      Offset = 0.;
       Result = Standard_True;
     }
   }
@@ -826,7 +843,6 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
   {
     aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface();
     aPlane = (Handle( Geom_Plane )::DownCast( aSurf ))->Pln();
-    Offset = 0.0e0;
   }
   if (Result == Standard_False)
   {
@@ -839,7 +855,6 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
         TheType == STANDARD_TYPE(Geom_ToroidalSurface))
       {
         aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface();
-        Offset = 0.0e0;
       }
       else
       {
@@ -899,20 +914,18 @@ gp_Pnt AIS::ProjectPointOnLine( const gp_Pnt & aPoint, const gp_Lin & aLine )
 //function : InitFaceLength
 //purpose  : 
 //=======================================================================
-void AIS::InitFaceLength (const TopoDS_Face& aFace,
-                          gp_Pln               & aPlane,
-                          Handle(Geom_Surface) & aSurface,
-                          AIS_KindOfSurface    & aSurfaceType,
-                          Standard_Real        & anOffset)
+void AIS::InitFaceLength (const TopoDS_Face& theFace,
+                          gp_Pln& thePlane,
+                          Handle(Geom_Surface)& theSurface,
+                          AIS_KindOfSurface& theSurfaceType,
+                          Standard_Real& theOffset)
 {
-  AIS::GetPlaneFromFace( aFace, aPlane, aSurface, aSurfaceType, anOffset );
-  
-  if (Abs( anOffset ) > Precision::Confusion())
-    {
-      aSurface = new Geom_OffsetSurface( aSurface, anOffset );
-      anOffset = 0.0e0;
-    }
-  
+  if (AIS::GetPlaneFromFace (theFace, thePlane, theSurface, theSurfaceType, theOffset)
+   && Abs (theOffset) > Precision::Confusion())
+  {
+    theSurface = new Geom_OffsetSurface (theSurface, theOffset);
+    theOffset = 0.0e0;
+  }
 }
 
 //=======================================================================
@@ -1538,3 +1551,93 @@ void AIS::ComputeProjVertexPresentation (const Handle( Prs3d_Presentation )& aPr
     StdPrs_WFShape::Add (aPresentation, MakEd.Edge(), aDrawer);
   }
 }
+
+//=======================================================================
+//function : DisplayModeToString
+//purpose  :
+//=======================================================================
+Standard_CString AIS::DisplayModeToString (AIS_DisplayMode theType)
+{
+  return AIS_Table_PrintDisplayMode[theType];
+}
+
+//=======================================================================
+//function : DisplayModeFromString
+//purpose  :
+//=======================================================================
+Standard_Boolean AIS::DisplayModeFromString (Standard_CString theTypeString,
+                                             AIS_DisplayMode& theType)
+{
+  TCollection_AsciiString aName (theTypeString);
+  aName.UpperCase();
+  for (Standard_Integer aTypeIter = 0; aTypeIter <= AIS_Shaded; ++aTypeIter)
+  {
+    Standard_CString aTypeName = AIS_Table_PrintDisplayMode[aTypeIter];
+    if (aName == aTypeName)
+    {
+      theType = AIS_DisplayMode (aTypeIter);
+      return Standard_True;
+    }
+  }
+  return Standard_False;
+}
+
+//=======================================================================
+//function : DisplayStatusToString
+//purpose  :
+//=======================================================================
+Standard_CString AIS::DisplayStatusToString (AIS_DisplayStatus theType)
+{
+  return AIS_Table_PrintDisplayStatus[theType];
+}
+
+//=======================================================================
+//function : DisplayStatusFromString
+//purpose  :
+//=======================================================================
+Standard_Boolean AIS::DisplayStatusFromString (Standard_CString theTypeString,
+                                               AIS_DisplayStatus& theType)
+{
+  TCollection_AsciiString aName (theTypeString);
+  aName.UpperCase();
+  for (Standard_Integer aTypeIter = 0; aTypeIter <= AIS_DS_None; ++aTypeIter)
+  {
+    Standard_CString aTypeName = AIS_Table_PrintDisplayStatus[aTypeIter];
+    if (aName == aTypeName)
+    {
+      theType = AIS_DisplayStatus (aTypeIter);
+      return Standard_True;
+    }
+  }
+  return Standard_False;
+}
+
+//=======================================================================
+//function : KindOfInteractiveToString
+//purpose  :
+//=======================================================================
+Standard_CString AIS::KindOfInteractiveToString (AIS_KindOfInteractive theType)
+{
+  return AIS_Table_PrintKindOfInteractive[theType];
+}
+
+//=======================================================================
+//function : KindOfInteractiveFromString
+//purpose  :
+//=======================================================================
+Standard_Boolean AIS::KindOfInteractiveFromString (Standard_CString theTypeString,
+                                                   AIS_KindOfInteractive& theType)
+{
+  TCollection_AsciiString aName (theTypeString);
+  aName.UpperCase();
+  for (Standard_Integer aTypeIter = 0; aTypeIter <= AIS_KOI_Dimension; ++aTypeIter)
+  {
+    Standard_CString aTypeName = AIS_Table_PrintKindOfInteractive[aTypeIter];
+    if (aName == aTypeName)
+    {
+      theType = AIS_KindOfInteractive (aTypeIter);
+      return Standard_True;
+    }
+  }
+  return Standard_False;
+}

src/AIS/AIS.hxx

@@ -17,73 +17,29 @@
 #ifndef _AIS_HeaderFile
 #define _AIS_HeaderFile
 
+#include <AIS_DisplayStatus.hxx>
+#include <AIS_DisplayMode.hxx>
+#include <AIS_KindOfInteractive.hxx>
+#include <AIS_KindOfSurface.hxx>
+#include <Aspect_TypeOfLine.hxx>
+#include <Aspect_TypeOfMarker.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Pnt.hxx>
+#include <Quantity_NameOfColor.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Prs3d_Presentation.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <AIS_KindOfSurface.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Quantity_NameOfColor.hxx>
-#include <Aspect_TypeOfLine.hxx>
-#include <Aspect_TypeOfMarker.hxx>
-class gp_Pnt;
-class TopoDS_Shape;
-class gp_Lin;
-class Geom_Curve;
-class TopoDS_Edge;
-class Geom_Plane;
-class TopoDS_Vertex;
-class TopoDS_Face;
-class gp_Pln;
-class Geom_Surface;
-class gp_Dir;
 class Bnd_Box;
-class gp_Elips;
-class Prs3d_Presentation;
-class AIS_Triangulation;
-class AIS_InteractiveContext;
-class AIS_GraphicTool;
-class AIS_GlobalStatus;
-class AIS_InteractiveObject;
-class AIS_Point;
-class AIS_Axis;
-class AIS_Trihedron;
-class AIS_PlaneTrihedron;
-class AIS_Line;
-class AIS_Circle;
-class AIS_Plane;
-class AIS_Shape;
-class AIS_ConnectedInteractive;
-class AIS_MultipleConnectedInteractive;
-class AIS_DimensionOwner;
-class AIS_Relation;
-class AIS_EllipseRadiusDimension;
-class AIS_MaxRadiusDimension;
-class AIS_MinRadiusDimension;
-class AIS_Chamf2dDimension;
-class AIS_Chamf3dDimension;
-class AIS_OffsetDimension;
-class AIS_FixRelation;
-class AIS_PerpendicularRelation;
-class AIS_ParallelRelation;
-class AIS_TangentRelation;
-class AIS_ConcentricRelation;
-class AIS_IdenticRelation;
-class AIS_SymmetricRelation;
-class AIS_MidPointRelation;
-class AIS_EqualRadiusRelation;
-class AIS_EqualDistanceRelation;
-class AIS_TypeFilter;
-class AIS_SignatureFilter;
-class AIS_ExclusionFilter;
-class AIS_AttributeFilter;
-class AIS_C0RegularityFilter;
-class AIS_BadEdgeFilter;
-class AIS_Selection;
-
+class Geom_Curve;
+class Geom_Plane;
+class Geom_Surface;
+class TopoDS_Edge;
+class TopoDS_Face;
+class TopoDS_Shape;
+class TopoDS_Vertex;
 
 //! Application Interactive Services provide the means to create links between an application GUI viewer and
 //! the packages which are used to manage selection and presentation.
@@ -250,6 +206,72 @@ public:
   
   Standard_EXPORT static void ComputeProjVertexPresentation (const Handle(Prs3d_Presentation)& aPres, const Handle(Prs3d_Drawer)& aDrawer, const TopoDS_Vertex& aVertex, const gp_Pnt& ProjPoint, const Quantity_NameOfColor aColor = Quantity_NOC_PURPLE, const Standard_Real aWidth = 2, const Aspect_TypeOfMarker aProjTOM = Aspect_TOM_PLUS, const Aspect_TypeOfLine aCallTOL = Aspect_TOL_DOT);
 
+  //! Returns the string name for a given enum type.
+  //! @param theType display mode
+  //! @return string identifier
+  Standard_EXPORT static Standard_CString DisplayModeToString (AIS_DisplayMode theType);
+
+  //! Returns the display mode from the given string identifier (using case-insensitive comparison).
+  //! @param theTypeString string identifier
+  //! @return status type or AIS_WireFrame if string identifier is invalid
+  static AIS_DisplayMode DisplayModeFromString (Standard_CString theTypeString)
+  {
+    AIS_DisplayMode aType = AIS_WireFrame;
+    DisplayModeFromString (theTypeString, aType);
+    return aType;
+  }
+
+  //! Determines the display mode from the given string identifier (using case-insensitive comparison).
+  //! @param theTypeString string identifier
+  //! @param theType detected display status
+  //! @return TRUE if string identifier is known
+  Standard_EXPORT static Standard_Boolean DisplayModeFromString (const Standard_CString theTypeString,
+                                                                 AIS_DisplayMode& theType);
+
+  //! Returns the string name for a given enum type.
+  //! @param theType display status
+  //! @return string identifier
+  Standard_EXPORT static Standard_CString DisplayStatusToString (AIS_DisplayStatus theType);
+
+  //! Returns the display status from the given string identifier (using case-insensitive comparison).
+  //! @param theTypeString string identifier
+  //! @return status type or AIS_DS_None if string identifier is invalid
+  static AIS_DisplayStatus DisplayStatusFromString (Standard_CString theTypeString)
+  {
+    AIS_DisplayStatus aType = AIS_DS_None;
+    DisplayStatusFromString (theTypeString, aType);
+    return aType;
+  }
+
+  //! Determines the shape type from the given string identifier (using case-insensitive comparison).
+  //! @param theTypeString string identifier
+  //! @param theType detected display status
+  //! @return TRUE if string identifier is known
+  Standard_EXPORT static Standard_Boolean DisplayStatusFromString (const Standard_CString theTypeString,
+                                                                   AIS_DisplayStatus& theType);
+
+  //! Returns the string name for a given enum type.
+  //! @param theType display status
+  //! @return string identifier
+  Standard_EXPORT static Standard_CString KindOfInteractiveToString (AIS_KindOfInteractive theType);
+
+  //! Returns the display status from the given string identifier (using case-insensitive comparison).
+  //! @param theTypeString string identifier
+  //! @return status type or AIS_KOI_None if string identifier is invalid
+  static AIS_KindOfInteractive KindOfInteractiveFromString (Standard_CString theTypeString)
+  {
+    AIS_KindOfInteractive aType = AIS_KOI_None;
+    KindOfInteractiveFromString (theTypeString, aType);
+    return aType;
+  }
+
+  //! Determines the shape type from the given string identifier (using case-insensitive comparison).
+  //! @param theTypeString string identifier
+  //! @param theType detected display status
+  //! @return TRUE if string identifier is known
+  Standard_EXPORT static Standard_Boolean KindOfInteractiveFromString (const Standard_CString theTypeString,
+                                                                       AIS_KindOfInteractive& theType);
+
 };
 
 #endif // _AIS_HeaderFile

src/AIS/AIS_Animation.cxx

@@ -168,7 +168,7 @@ void AIS_Animation::StartTimer (const Standard_Real    theStartPts,
 {
   if (myTimer.IsNull())
   {
-    myTimer = new AIS_AnimationTimer();
+    myTimer = new Media_Timer();
   }
   myTimer->Stop();
   myTimer->Seek (theStartPts);

src/AIS/AIS_Animation.hxx

@@ -191,7 +191,7 @@ protected:
 
 protected:
 
-  Handle(AIS_AnimationTimer) myTimer;
+  Handle(Media_Timer) myTimer;
 
   TCollection_AsciiString myName;           //!< animation name
   NCollection_Sequence<Handle(AIS_Animation)>

src/AIS/AIS_AnimationCamera.cxx

@@ -48,7 +48,7 @@ void AIS_AnimationCamera::update (const AIS_AnimationProgress& theProgress)
   Handle(Graphic3d_Camera) aCamera = myView->Camera();
 
   Graphic3d_CameraLerp aCamLerp (myCamStart, myCamEnd);
-  aCamLerp.Interpolate (theProgress.LocalNormalized, aCamera);
+  aCamLerp.Interpolate (HasOwnDuration() ? theProgress.LocalNormalized : 1.0, aCamera);
 
   const Standard_Boolean aPrevImmUpdate = myView->SetImmediateUpdate (Standard_False);
   myView->SetCamera (aCamera);

src/AIS/AIS_AnimationCamera.hxx

@@ -33,6 +33,9 @@ public:
   //! Return the target view.
   const Handle(V3d_View)& View() const { return myView; }
 
+  //! Set target view.
+  void SetView (const Handle(V3d_View)& theView) { myView = theView; }
+
   //! Return camera start position.
   const Handle(Graphic3d_Camera)& CameraStart() const { return myCamStart; }
 

src/AIS/AIS_AnimationTimer.hxx

@@ -15,60 +15,7 @@
 #ifndef _AIS_AnimationTimer_HeaderFile
 #define _AIS_AnimationTimer_HeaderFile
 
-#include <OSD_Timer.hxx>
-#include <Standard_Transient.hxx>
-#include <Standard_Type.hxx>
-
-//! Auxiliary class defining the animation timer.
-class AIS_AnimationTimer : public Standard_Transient
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_AnimationTimer, Standard_Transient)
-public:
-
-  //! Empty constructor.
-  AIS_AnimationTimer() : myTimerFrom (0.0), myTimerSpeed (1.0) {}
-
-  //! Return elapsed time in seconds.
-  Standard_Real ElapsedTime() const
-  {
-    return myTimerFrom + myTimer.ElapsedTime() * myTimerSpeed;
-  }
-
-  //! Return playback speed coefficient (1.0 means normal speed).
-  Standard_Real PlaybackSpeed() const { return myTimerSpeed; }
-
-  //! Setup playback speed coefficient.
-  Standard_EXPORT void SetPlaybackSpeed (const Standard_Real theSpeed);
-
-  //! Return true if timer has been started.
-  Standard_Boolean IsStarted() const
-  {
-    return myTimer.IsStarted();
-  }
-
-  //! Start the timer.
-  void Start()
-  {
-    myTimer.Start();
-  }
-
-  //! Pause the timer.
-  Standard_EXPORT void Pause();
-
-  //! Stop the timer.
-  Standard_EXPORT void Stop();
-
-  //! Seek the timer to specified position.
-  Standard_EXPORT void Seek (const Standard_Real theTime);
-
-protected:
-
-  OSD_Timer     myTimer;
-  Standard_Real myTimerFrom;
-  Standard_Real myTimerSpeed;
-
-};
-
-DEFINE_STANDARD_HANDLE(AIS_AnimationTimer, Standard_Transient)
+#include <Media_Timer.hxx>
+typedef Media_Timer AIS_AnimationTimer;
 
 #endif // _AIS_AnimationTimer_HeaderFile

src/AIS/AIS_Axis.cxx

@@ -34,10 +34,8 @@
 #include <Prs3d_Projector.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveSegment.hxx>
-#include <SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
-#include <Standard_Type.hxx>
 #include <StdPrs_Curve.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TopoDS.hxx>
@@ -81,7 +79,7 @@ myIsXYZAxis(Standard_True)
   Standard_Real aLength;
   try {
     aLength = UnitsAPI::AnyToLS(100. ,"mm");
-  } catch (Standard_Failure) {
+  } catch (Standard_Failure const&) {
     aLength = 0.1;
   }
   DA->SetAxisLength(aLength,aLength,aLength);
@@ -199,8 +197,7 @@ void AIS_Axis::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(G
 void AIS_Axis::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
 				const Standard_Integer)
 {
-  Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this);
-  eown -> SelectBasics_EntityOwner::Set(3);
+  Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner (this, 3);
   Handle(Select3D_SensitiveSegment) seg = new Select3D_SensitiveSegment(eown,
 									myPfirst,
 									myPlast);
@@ -221,7 +218,7 @@ void AIS_Axis::SetColor(const Quantity_Color &aCol)
   DA->LineAspect(Prs3d_DP_XAxis)->SetColor(aCol);
   DA->LineAspect(Prs3d_DP_YAxis)->SetColor(aCol);
   DA->LineAspect(Prs3d_DP_ZAxis)->SetColor(aCol);
-  
+  SynchronizeAspects();
 }
 
 //=======================================================================
@@ -230,7 +227,6 @@ void AIS_Axis::SetColor(const Quantity_Color &aCol)
 //=======================================================================
 void AIS_Axis::SetWidth(const Standard_Real aValue)
 {
-  
   if(aValue<0.0) return;
   if(aValue==0) UnsetWidth();
   
@@ -240,6 +236,7 @@ void AIS_Axis::SetWidth(const Standard_Real aValue)
   DA->LineAspect(Prs3d_DP_XAxis)->SetWidth(aValue);
   DA->LineAspect(Prs3d_DP_YAxis)->SetWidth(aValue);
   DA->LineAspect(Prs3d_DP_ZAxis)->SetWidth(aValue);
+  SynchronizeAspects();
 }
 
 
@@ -324,14 +321,13 @@ AcceptDisplayMode(const Standard_Integer aMode) const
 //=======================================================================
 void AIS_Axis::UnsetColor()
 {
-  
   myDrawer->LineAspect()->SetColor(Quantity_NOC_RED);
-
-  hasOwnColor=Standard_False;
+  hasOwnColor = Standard_False;
 
   myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis)->SetColor(Quantity_NOC_TURQUOISE);
   myDrawer->DatumAspect()->LineAspect(Prs3d_DP_YAxis)->SetColor(Quantity_NOC_TURQUOISE);
   myDrawer->DatumAspect()->LineAspect(Prs3d_DP_ZAxis)->SetColor(Quantity_NOC_TURQUOISE);
+  SynchronizeAspects();
 }
 //=======================================================================
 //function : UnsetWidth
@@ -340,10 +336,10 @@ void AIS_Axis::UnsetColor()
 
 void AIS_Axis::UnsetWidth()
 {
-  myOwnWidth = 0.0;
+  myOwnWidth = 0.0f;
   myDrawer->LineAspect()->SetWidth(1.);
   myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis)->SetWidth(1.);
   myDrawer->DatumAspect()->LineAspect(Prs3d_DP_YAxis)->SetWidth(1.);
   myDrawer->DatumAspect()->LineAspect(Prs3d_DP_ZAxis)->SetWidth(1.);
+  SynchronizeAspects();
 }
-

src/AIS/AIS_CameraFrustum.cxx

@@ -90,6 +90,7 @@ void AIS_CameraFrustum::SetColor (const Quantity_Color& theColor)
   AIS_InteractiveObject::SetColor (theColor);
   myDrawer->ShadingAspect()->SetColor (theColor);
   myDrawer->LineAspect()->SetColor (theColor);
+  SynchronizeAspects();
 }
 
 //=======================================================================
@@ -107,6 +108,7 @@ void AIS_CameraFrustum::UnsetColor()
 
   myDrawer->ShadingAspect()->SetColor (THE_DEFAULT_COLOR);
   myDrawer->LineAspect()->SetColor (THE_DEFAULT_COLOR);
+  SynchronizeAspects();
 }
 
 //=======================================================================
@@ -117,6 +119,7 @@ void AIS_CameraFrustum::UnsetTransparency()
 {
   myDrawer->ShadingAspect()->SetTransparency (0.0f);
   myDrawer->SetTransparency (0.0f);
+  SynchronizeAspects();
 }
 
 //=======================================================================

src/AIS/AIS_Chamf2dDimension.hxx

@@ -17,29 +17,13 @@
 #ifndef _AIS_Chamf2dDimension_HeaderFile
 #define _AIS_Chamf2dDimension_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <AIS_Relation.hxx>
-#include <Standard_Real.hxx>
-#include <DsgPrs_ArrowSide.hxx>
 #include <AIS_KindOfDimension.hxx>
-#include <Standard_Boolean.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <Standard_Integer.hxx>
-#include <SelectMgr_Selection.hxx>
-class TopoDS_Shape;
+#include <AIS_Relation.hxx>
+#include <DsgPrs_ArrowSide.hxx>
+#include <gp_Dir.hxx>
+
 class Geom_Plane;
-class TCollection_ExtendedString;
-class gp_Pnt;
-class Prs3d_Presentation;
-class Prs3d_Projector;
-class Geom_Transformation;
 
-
-class AIS_Chamf2dDimension;
 DEFINE_STANDARD_HANDLE(AIS_Chamf2dDimension, AIS_Relation)
 
 //! A framework to define display of 2D chamfers.
@@ -48,10 +32,9 @@ DEFINE_STANDARD_HANDLE(AIS_Chamf2dDimension, AIS_Relation)
 //! chamfer, or the angle if it is not.
 class AIS_Chamf2dDimension : public AIS_Relation
 {
-
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension, AIS_Relation)
 public:
 
-  
   //! Constructs the display object for 2D chamfers.
   //! This object is defined by the face aFShape, the
   //! dimension aVal, the plane aPlane and the text aText.
@@ -79,18 +62,7 @@ public:
   //! to the object to display before computation  !!!
   Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
 
-
-
-
-  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
-
-protected:
-
-
-
-
 private:
-
   
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
@@ -101,14 +73,8 @@ private:
   gp_Pnt myPntAttach;
   gp_Dir myDir;
 
-
 };
 
-
 #include <AIS_Chamf2dDimension.lxx>
 
-
-
-
-
 #endif // _AIS_Chamf2dDimension_HeaderFile

src/AIS/AIS_Chamf3dDimension.hxx

@@ -17,28 +17,11 @@
 #ifndef _AIS_Chamf3dDimension_HeaderFile
 #define _AIS_Chamf3dDimension_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <AIS_Relation.hxx>
-#include <Standard_Real.hxx>
-#include <DsgPrs_ArrowSide.hxx>
 #include <AIS_KindOfDimension.hxx>
-#include <Standard_Boolean.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <Standard_Integer.hxx>
-#include <SelectMgr_Selection.hxx>
-class TopoDS_Shape;
-class TCollection_ExtendedString;
-class gp_Pnt;
-class Prs3d_Presentation;
-class Prs3d_Projector;
-class Geom_Transformation;
+#include <AIS_Relation.hxx>
+#include <DsgPrs_ArrowSide.hxx>
+#include <gp_Dir.hxx>
 
-
-class AIS_Chamf3dDimension;
 DEFINE_STANDARD_HANDLE(AIS_Chamf3dDimension, AIS_Relation)
 
 //! A framework to define display of 3D chamfers.
@@ -47,10 +30,9 @@ DEFINE_STANDARD_HANDLE(AIS_Chamf3dDimension, AIS_Relation)
 //! chamfer, or the angle if it is not.
 class AIS_Chamf3dDimension : public AIS_Relation
 {
-
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension, AIS_Relation)
 public:
 
-  
   //! Constructs a display object for 3D chamfers.
   //! This object is defined by the shape aFShape, the
   //! dimension aVal and the text aText.
@@ -78,19 +60,8 @@ public:
   //! to the object to display before computation  !!!
   Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
 
-
-
-
-  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
-
-protected:
-
-
-
-
 private:
 
-  
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -100,14 +71,8 @@ private:
   gp_Pnt myPntAttach;
   gp_Dir myDir;
 
-
 };
 
-
 #include <AIS_Chamf3dDimension.lxx>
 
-
-
-
-
 #endif // _AIS_Chamf3dDimension_HeaderFile

src/AIS/AIS_Circle.cxx

@@ -112,6 +112,29 @@ void AIS_Circle::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
 
 }
 
+//=======================================================================
+//function : replaceWithNewLineAspect
+//purpose  :
+//=======================================================================
+void AIS_Circle::replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect)
+{
+  if (!myDrawer->HasLink())
+  {
+    myDrawer->SetLineAspect (theAspect);
+    return;
+  }
+
+  const Handle(Graphic3d_AspectLine3d) anAspectOld = myDrawer->LineAspect()->Aspect();
+  const Handle(Graphic3d_AspectLine3d) anAspectNew = !theAspect.IsNull() ? theAspect->Aspect() : myDrawer->Link()->LineAspect()->Aspect();
+  if (anAspectNew != anAspectOld)
+  {
+    myDrawer->SetLineAspect (theAspect);
+    Graphic3d_MapOfAspectsToAspects aReplaceMap;
+    aReplaceMap.Bind (anAspectOld, anAspectNew);
+    replaceAspects (aReplaceMap);
+  }
+}
+
 //=======================================================================
 //function : SetColor
 //purpose  : 
@@ -122,34 +145,41 @@ void AIS_Circle::SetColor(const Quantity_Color &aCol)
   hasOwnColor=Standard_True;
   myDrawer->SetColor (aCol);
 
-  Standard_Real WW = HasWidth() ? myOwnWidth :
-                                  myDrawer->HasLink() ?
-                                  AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) :
-                                  1.;
-
-  if (!myDrawer->HasOwnLineAspect ())
-    myDrawer->SetLineAspect (new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW));
+  if (!myDrawer->HasOwnLineAspect())
+  {
+    Standard_Real WW = HasWidth() ? myOwnWidth :
+                                    myDrawer->HasLink() ?
+                                    AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) :
+                                    1.;
+    replaceWithNewLineAspect (new Prs3d_LineAspect (aCol, Aspect_TOL_SOLID, WW));
+  }
   else
+  {
     myDrawer->LineAspect()->SetColor(aCol);
+    SynchronizeAspects();
+  }
 }
 
-
-
 //=======================================================================
 //function : SetWidth 
 //purpose  : 
 //=======================================================================
 void AIS_Circle::SetWidth(const Standard_Real aValue)
 {
-  myOwnWidth=aValue;
+  myOwnWidth = (Standard_ShortReal )aValue;
 
-  if (!myDrawer->HasOwnLineAspect ()) {
+  if (!myDrawer->HasOwnLineAspect())
+  {
     Quantity_Color CC = Quantity_NOC_YELLOW;
     if( HasColor() ) CC = myDrawer->Color();
     else if(myDrawer->HasLink()) AIS_GraphicTool::GetLineColor (myDrawer->Link(), AIS_TOA_Line, CC);
-    myDrawer->SetLineAspect (new Prs3d_LineAspect(CC,Aspect_TOL_SOLID,aValue));
-  } else
+    replaceWithNewLineAspect (new Prs3d_LineAspect (CC, Aspect_TOL_SOLID, aValue));
+  }
+  else
+  {
     myDrawer->LineAspect()->SetWidth(aValue);
+    SynchronizeAspects();
+  }
 }
 
 
@@ -161,15 +191,18 @@ void AIS_Circle::UnsetColor()
 {
   hasOwnColor = Standard_False;
 
-  Handle(Prs3d_LineAspect) NullAsp;
-
-  if (!HasWidth()) myDrawer->SetLineAspect(NullAsp);
-  else{
+  if (!HasWidth())
+  {
+    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
+  }
+  else
+  {
     Quantity_Color CC = Quantity_NOC_YELLOW;;
     if( HasColor() ) CC = myDrawer->Color();
     else if (myDrawer->HasLink()) AIS_GraphicTool::GetLineColor(myDrawer->Link(),AIS_TOA_Line,CC);
     myDrawer->LineAspect()->SetColor(CC);
     myDrawer->SetColor (CC);
+    SynchronizeAspects();
   }
 }
 
@@ -179,11 +212,13 @@ void AIS_Circle::UnsetColor()
 //=======================================================================
 void AIS_Circle::UnsetWidth()
 {
-  Handle(Prs3d_LineAspect) NullAsp;
-
-  if (!HasColor()) myDrawer->SetLineAspect(NullAsp);
-  else{
-   Standard_Real WW = myDrawer->HasLink() ? AIS_GraphicTool::GetLineWidth(myDrawer->Link(),AIS_TOA_Line) : 1.;
+  if (!HasColor())
+  {
+    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
+  }
+  else
+  {
+   Standard_ShortReal WW = myDrawer->HasLink() ? (Standard_ShortReal )AIS_GraphicTool::GetLineWidth(myDrawer->Link(),AIS_TOA_Line) : 1.0f;
    myDrawer->LineAspect()->SetWidth(WW);
    myOwnWidth = WW;
   }

src/AIS/AIS_Circle.hxx

@@ -115,6 +115,9 @@ private:
   
   Standard_EXPORT void ComputeArcSelection (const Handle(SelectMgr_Selection)& aSelection);
 
+  //! Replace aspects of already computed groups with the new value.
+  void replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect);
+
 private:
 
   Handle(Geom_Circle) myComponent;

src/AIS/AIS_ColorScale.cxx

@@ -26,6 +26,7 @@
 #include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
+#include <Graphic3d_Text.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Root.hxx>
 #include <Prs3d_ShadingAspect.hxx>
@@ -78,6 +79,31 @@ namespace
     Standard_Real aSaturation = NCollection_Lerp<Standard_Real>::Interpolate (theHlsMin[2], theHlsMax[2], aValue);
     return Quantity_Color (AIS_ColorScale::hueToValidRange (aHue), aLightness, aSaturation, Quantity_TOC_HLS);
   }
+
+  //! Return the index of discrete interval for specified value.
+  //! Note that when value lies exactly on the border between two intervals,
+  //! determining which interval to return is undefined operation;
+  //! Current implementation returns the following interval in this case.
+  //! @param theValue [in] value to map
+  //! @param theMin   [in] values range, lower value
+  //! @param theMax   [in] values range, upper value
+  //! @param theNbIntervals [in] number of discrete intervals
+  //! @return index of interval within [1, theNbIntervals] range
+  static Standard_Integer colorDiscreteInterval (Standard_Real theValue,
+                                                 Standard_Real theMin,
+                                                 Standard_Real theMax,
+                                                 Standard_Integer theNbIntervals)
+  {
+    if (Abs (theMax - theMin) <= Precision::Approximation())
+    {
+      return 1;
+    }
+
+    Standard_Integer anInterval = 1 + (Standard_Integer )Floor (Standard_Real (theNbIntervals) * (theValue - theMin) / (theMax - theMin));
+    // map the very upper value (theValue==theMax) to the largest color interval
+    anInterval = Min (anInterval, theNbIntervals);
+    return anInterval;
+  }
 }
 
 //=======================================================================
@@ -347,21 +373,14 @@ Standard_Boolean AIS_ColorScale::FindColor (const Standard_Real theValue,
 
   if (myColorType == Aspect_TOCSD_USER)
   {
-    Standard_Integer anIndex = 0;
-    if (Abs (myMax - myMin) > Precision::Approximation())
-    {
-      anIndex = (theValue - myMin < Precision::Confusion()) 
-        ? 1
-        : Standard_Integer (Ceiling (( theValue - myMin ) / ( (myMax - myMin) / myNbIntervals)));
-    }
-
-    if (anIndex <= 0 || anIndex > myColors.Length())
+    const Standard_Integer anInterval = colorDiscreteInterval (theValue, myMin, myMax, myNbIntervals);
+    if (anInterval < myColors.Lower() || anInterval > myColors.Upper())
     {
       theColor = Quantity_Color();
       return Standard_False;
     }
 
-    theColor = myColors.Value (anIndex);
+    theColor = myColors.Value (anInterval);
     return Standard_True;
   }
 
@@ -385,13 +404,8 @@ Standard_Boolean AIS_ColorScale::FindColor (const Standard_Real theValue,
     return Standard_False;
   }
 
-  Standard_Real anInterval = 0.0;
-  if (Abs (theMax - theMin) > Precision::Approximation())
-  {
-    anInterval = Floor (Standard_Real (theColorsCount) * (theValue - theMin) / (theMax - theMin));
-  }
-
-  theColor = colorFromValueEx (anInterval, 0, theColorsCount - 1, theColorHlsMin, theColorHlsMax);
+  const Standard_Integer anInterval = colorDiscreteInterval (theValue, theMin, theMax, theColorsCount);
+  theColor = colorFromValueEx (anInterval - 1, 0, theColorsCount - 1, theColorHlsMin, theColorHlsMax);
   return Standard_True;
 }
 
@@ -796,16 +810,14 @@ void AIS_ColorScale::drawText (const Handle(Graphic3d_Group)& theGroup,
                                const Graphic3d_VerticalTextAlignment theVertAlignment)
 {
   const Handle(Prs3d_TextAspect)& anAspect = myDrawer->TextAspect();
-  theGroup->Text (theText,
-                  gp_Ax2 (gp_Pnt (theX, theY, 0.0), gp::DZ()),
-                  anAspect->Height(),
-                  anAspect->Angle(),
-                  anAspect->Orientation(),
-                  Graphic3d_HTA_LEFT,
-                  theVertAlignment,
-                  Standard_True,
-                  Standard_False); // has own anchor
 
+  Handle(Graphic3d_Text) aText = new Graphic3d_Text ((Standard_ShortReal)anAspect->Height());
+  aText->SetText (theText.ToExtString());
+  aText->SetOrientation (gp_Ax2 (gp_Pnt (theX, theY, 0.0), gp::DZ()));
+  aText->SetOwnAnchorPoint (Standard_False);
+  aText->SetVerticalAlignment (theVertAlignment);
+
+  theGroup->AddText (aText);
 }
 
 //=======================================================================

src/AIS/AIS_ColoredShape.cxx

@@ -124,8 +124,7 @@ Handle(AIS_ColoredDrawer) AIS_ColoredShape::CustomAspects (const TopoDS_Shape& t
   {
     aDrawer = new AIS_ColoredDrawer (myDrawer);
     myShapeColors.Bind (theShape, aDrawer);
-    LoadRecomputable (AIS_WireFrame);
-    LoadRecomputable (AIS_Shaded);
+    SetToUpdate();
   }
   return aDrawer;
 }
@@ -141,8 +140,7 @@ void AIS_ColoredShape::ClearCustomAspects()
     return;
   }
   myShapeColors.Clear();
-  LoadRecomputable (AIS_WireFrame);
-  LoadRecomputable (AIS_Shaded);
+  SetToUpdate();
 }
 
 //=======================================================================
@@ -157,8 +155,7 @@ void AIS_ColoredShape::UnsetCustomAspects (const TopoDS_Shape&    theShape,
     return;
   }
 
-  LoadRecomputable (AIS_WireFrame);
-  LoadRecomputable (AIS_Shaded);
+  SetToUpdate();
   if (theToUnregister)
   {
     myShapeColors.UnBind (theShape);
@@ -183,8 +180,6 @@ void AIS_ColoredShape::SetCustomColor (const TopoDS_Shape&   theShape,
   const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
   setColor (aDrawer, theColor);
   aDrawer->SetOwnColor (theColor);
-  LoadRecomputable (AIS_WireFrame);
-  LoadRecomputable (AIS_Shaded);
 }
 
 //=======================================================================
@@ -202,8 +197,6 @@ void AIS_ColoredShape::SetCustomTransparency (const TopoDS_Shape& theShape,
   const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
   setTransparency (aDrawer, theTransparency);
   aDrawer->SetOwnTransparency (theTransparency);
-  LoadRecomputable (AIS_WireFrame);
-  LoadRecomputable (AIS_Shaded);
 }
 
 //=======================================================================
@@ -221,8 +214,6 @@ void AIS_ColoredShape::SetCustomWidth (const TopoDS_Shape& theShape,
   const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
   setWidth (aDrawer, theLineWidth);
   aDrawer->SetOwnWidth (theLineWidth);
-  LoadRecomputable (AIS_WireFrame);
-  LoadRecomputable (AIS_Shaded);
 }
 
 //=======================================================================
@@ -521,8 +512,8 @@ void AIS_ColoredShape::ComputeSelection (const Handle(SelectMgr_Selection)& theS
   Handle(SelectMgr_SelectableObject) aThis (this);
   for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (theSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next())
   {
-    Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast (aSelEntIter.Value()->BaseSensitive()->OwnerId());
-    anOwner->Set (aThis);
+    const Handle(SelectMgr_EntityOwner)& anOwner = aSelEntIter.Value()->BaseSensitive()->OwnerId();
+    anOwner->SetSelectable (aThis);
   }
 
   StdSelect_BRepSelectionTool::PreBuildBVH (theSelection);
@@ -642,6 +633,11 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
           {
             aShadedGroup = thePrs->NewGroup();
             aShadedGroup->SetClosed (isClosed);
+            if (isClosed)
+            {
+              if (aDrawer->HasOwnFillCappingAspect())
+                aShadedGroup->SetGroupPrimitivesAspect (aDrawer->FillCappingAspect());
+            }
           }
           aShadedGroup->SetPrimitivesAspect (aDrawer->ShadingAspect()->Aspect());
           aShadedGroup->AddPrimitiveArray (aTriangles);

src/AIS/AIS_ConcentricRelation.hxx

@@ -17,24 +17,11 @@
 #ifndef _AIS_ConcentricRelation_HeaderFile
 #define _AIS_ConcentricRelation_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
-#include <gp_Dir.hxx>
 #include <AIS_Relation.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <Standard_Integer.hxx>
-#include <SelectMgr_Selection.hxx>
-class TopoDS_Shape;
+#include <gp_Dir.hxx>
+
 class Geom_Plane;
-class Prs3d_Presentation;
-class Prs3d_Projector;
-class Geom_Transformation;
 
-
-class AIS_ConcentricRelation;
 DEFINE_STANDARD_HANDLE(AIS_ConcentricRelation, AIS_Relation)
 
 //! A framework to define a constraint by a relation of
@@ -44,10 +31,9 @@ DEFINE_STANDARD_HANDLE(AIS_ConcentricRelation, AIS_Relation)
 //! relation of concentricity can be extended.
 class AIS_ConcentricRelation : public AIS_Relation
 {
-
+  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation, AIS_Relation)
 public:
 
-  
   //! Constructs the display object for concentric relations
   //! between shapes.
   //! This object is defined by the two shapes, aFShape
@@ -65,19 +51,8 @@ public:
   //! to the object to display before computation  !!!
   Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
 
-
-
-
-  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
-
-protected:
-
-
-
-
 private:
 
-  
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -95,13 +70,6 @@ private:
   gp_Dir myDir;
   gp_Pnt myPnt;
 
-
 };
 
-
-
-
-
-
-
 #endif // _AIS_ConcentricRelation_HeaderFile

src/AIS/AIS_ConnectedInteractive.cxx

@@ -23,7 +23,6 @@
 #include <Precision.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Projector.hxx>
-#include <PrsMgr_ModedPresentation.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
@@ -92,12 +91,12 @@ void AIS_ConnectedInteractive::connect (const Handle(AIS_InteractiveObject)& the
 
 void AIS_ConnectedInteractive::Disconnect()
 {
-  for(Standard_Integer aPrsIter = 1; aPrsIter <= myPresentations.Length(); ++aPrsIter)
+  for (PrsMgr_Presentations::Iterator aPrsIter (myPresentations); aPrsIter.More(); aPrsIter.Next())
   {
-    const Handle(PrsMgr_Presentation)& aPrs = myPresentations (aPrsIter).Presentation();
+    const Handle(PrsMgr_Presentation)& aPrs = aPrsIter.Value();
     if (!aPrs.IsNull())
     {
-      aPrs->Presentation()->DisconnectAll (Graphic3d_TOC_DESCENDANT);
+      aPrs->DisconnectAll (Graphic3d_TOC_DESCENDANT);
     }
   }
 }
@@ -112,7 +111,7 @@ void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3
   if (HasConnection())
   {
     thePrs->Clear (Standard_False);
-    thePrs->RemoveAll();
+    thePrs->DisconnectAll (Graphic3d_TOC_DESCENDANT);
 
     if (!myReference->HasInteractiveContext())
     {
@@ -234,7 +233,7 @@ void AIS_ConnectedInteractive::ComputeSelection (const Handle(SelectMgr_Selectio
 
   for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (TheRefSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
   {
-    if (Handle(Select3D_SensitiveEntity) aSensitive = Handle(Select3D_SensitiveEntity)::DownCast (aSelEntIter.Value()->BaseSensitive()))
+    if (const Handle(Select3D_SensitiveEntity)& aSensitive = aSelEntIter.Value()->BaseSensitive())
     {
       // Get the copy of SE3D
       if (Handle(Select3D_SensitiveEntity) aNewSensitive = aSensitive->GetConnected())
@@ -272,7 +271,7 @@ void AIS_ConnectedInteractive::computeSubShapeSelection (const Handle(SelectMgr_
   Shapes2EntitiesMap aShapes2EntitiesMap;
   for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (aRefSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
   {
-    if (Handle(Select3D_SensitiveEntity) aSE = Handle(Select3D_SensitiveEntity)::DownCast (aSelEntIter.Value()->BaseSensitive()))
+    if (const Handle(Select3D_SensitiveEntity)& aSE = aSelEntIter.Value()->BaseSensitive())
     {
       if (Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast (aSE->OwnerId()))
       {

src/AIS/AIS_Dimension.cxx

@@ -335,31 +335,31 @@ TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidt
   if (myDrawer->DimensionAspect()->IsText3d())
   {
     // text width produced by BRepFont
-    Font_BRepFont aFont (aTextAspect->Aspect()->Font().ToCString(),
-                         aTextAspect->Aspect()->GetTextFontAspect(),
-                         aTextAspect->Height());
-
-    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
+    Font_BRepFont aFont;
+    if (aFont.FindAndInit (aTextAspect->Aspect()->Font(), aTextAspect->Aspect()->GetTextFontAspect(), aTextAspect->Height(), Font_StrictLevel_Any))
     {
-      Standard_Utf32Char aCurrChar = *anIter;
-      Standard_Utf32Char aNextChar = *(++anIter);
-      theWidth += aFont.AdvanceX (aCurrChar, aNextChar);
+      for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
+      {
+        Standard_Utf32Char aCurrChar = *anIter;
+        Standard_Utf32Char aNextChar = *(++anIter);
+        theWidth += aFont.AdvanceX (aCurrChar, aNextChar);
+      }
     }
   }
   else
   {
     // Text width for 1:1 scale 2D case
-    Handle(Font_FTFont) aFont = new Font_FTFont();
-    aFont->Init (aTextAspect->Aspect()->Font().ToCString(),
-                 aTextAspect->Aspect()->GetTextFontAspect(),
-                 (const unsigned int)aTextAspect->Height(),
-                 THE_2D_TEXT_RESOLUTION);
-
-    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
+    Font_FTFontParams aFontParams;
+    aFontParams.PointSize  = (unsigned int )aTextAspect->Height();
+    aFontParams.Resolution = THE_2D_TEXT_RESOLUTION;
+    if (Handle(Font_FTFont) aFont = Font_FTFont::FindAndCreate (aTextAspect->Aspect()->Font(), aTextAspect->Aspect()->GetTextFontAspect(), aFontParams, Font_StrictLevel_Any))
     {
-      Standard_Utf32Char aCurrChar = *anIter;
-      Standard_Utf32Char aNextChar = *(++anIter);
-      theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar);
+      for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
+      {
+        Standard_Utf32Char aCurrChar = *anIter;
+        Standard_Utf32Char aNextChar = *(++anIter);
+        theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar);
+      }
     }
   }