Compilation errors

HLRBRep_Surface::IsUPeriodic

CMakeLists.txt

@@ -86,11 +86,6 @@ 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}")
@@ -633,26 +628,6 @@ 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

@@ -1 +0,0 @@
-/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 TKRWMesh
+DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
 Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE

adm/UDLIST

@@ -203,7 +203,6 @@ n Aspect
 n DsgPrs
 n Graphic3d
 n Image
-n Media
 n MeshVS
 n OpenGl
 n D3DHost
@@ -439,7 +438,3 @@ 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}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
+        if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
           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}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
+          if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
             find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                                PATH_SUFFIXES bin  win${COMPILER_BITNESS}/${COMPILER}/bin
                                                                                NO_DEFAULT_PATH)
             if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")

adm/cmake/occt_csf.cmake

@@ -62,10 +62,8 @@ if (WIN32)
   set (CSF_advapi32      "advapi32.lib")
   set (CSF_gdi32         "gdi32.lib")
   set (CSF_user32        "user32.lib")
-  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")
@@ -79,29 +77,22 @@ else()
     set (CSF_objc        "objc")
 
     # frameworks
-    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 (IOS)
-      find_library (OpenGlLibs_LIB NAMES OpenGLES)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-    elseif (USE_GLX)
+    if (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()
     
@@ -117,6 +108,5 @@ else()
     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,7 +143,5 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
 endif()
 
-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,18 +163,13 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   OCCT_MAKE_COMPILER_BITNESS()
 
   string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
-  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

@@ -1,86 +0,0 @@
-# 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,11 +28,6 @@ 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
@@ -94,7 +89,6 @@ 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 ")
@@ -162,10 +156,6 @@ 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,30 +30,10 @@ 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 {}
@@ -121,7 +101,6 @@ 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]]
 
@@ -189,9 +168,6 @@ 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
@@ -414,8 +390,6 @@ 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
@@ -459,9 +433,6 @@ 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
@@ -523,10 +494,6 @@ 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
@@ -570,8 +537,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 12 -sticky e
-grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 13 -sticky w
+grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 10 -sticky e
+grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 11 -sticky w
 
 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
@@ -584,8 +551,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 12 -sticky e
-grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 10 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 11 -sticky w
 
 incr aCheckRowIter
 if { "$::tcl_platform(os)" == "Darwin" } {
@@ -594,10 +561,6 @@ 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
@@ -629,9 +592,6 @@ 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,10 +27,8 @@ 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 ""
@@ -41,7 +39,6 @@ if { "$tcl_platform(platform)" == "unix" } {
   set SYS_EXE_SUFFIX    ".exe"
   set VCVER  "vc10"
   set VCVARS ""
-  set PRJFMT "vcxproj"
 }
 
 set SHORTCUT_HEADERS "ShortCut"
@@ -68,7 +65,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_RAPIDJSON 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_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
 foreach anEnvIter $THE_ENV_VARIABLES {
   set ${anEnvIter} "false"
   if { [info exists ::env(${anEnvIter})] } {
@@ -85,7 +82,7 @@ if { "$tcl_platform(platform)" != "windows" } {
   set HAVE_D3D ""
   set HAVE_RelWithDebInfo ""
 }
-foreach anEnvIter {ARCH VCVER VCVARS PRJFMT PRODUCTS_PATH} {
+foreach anEnvIter {ARCH VCVER VCVARS PRODUCTS_PATH} {
   if { [info exists ::env(${anEnvIter})] } {
     set ${anEnvIter} "$::env(${anEnvIter})"
   }
@@ -858,25 +855,6 @@ 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"
@@ -1140,33 +1118,15 @@ 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 $aGenInfo"
+    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 ""
-    puts $aFile "set PRJFMT=$::PRJFMT"
     puts $aFile "set VCVER=$::VCVER"
     puts $aFile "set ARCH=$::ARCH"
     puts $aFile "set VCVARS=$::VCVARS"
@@ -1186,41 +1146,26 @@ 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\""
@@ -1230,10 +1175,9 @@ proc wokdep:SaveCustom {} {
     set aCustomFilePath "./custom.sh"
     set aFile [open $aCustomFilePath "w"]
     puts $aFile "#!/bin/bash"
-    puts $aFile "# $aGenInfo"
+    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 ""
-    puts $aFile "export PRJFMT=$::PRJFMT"
     puts $aFile "export ARCH=$::ARCH"
     puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
 
@@ -1251,88 +1195,22 @@ 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 [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringLib [regsub -all "$::PRODUCTS_PATH" $aStringLib "\${PRODUCTS_PATH}"]
-    }
+    set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
     puts $aFile ""
     puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib]\""
+    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""
 
-    set aStringBin [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
-    if { "$::PRODUCTS_PATH" != "" } {
-      set aStringBin [regsub -all "$::PRODUCTS_PATH" $aStringBin "\${PRODUCTS_PATH}"]
-    }
+    set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
     puts $aFile ""
     puts $aFile "# Additional ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin]\""
+    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""
 
     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" "pro"}
+  set aSupportedFormats { "vc7" "vc8" "vc9" "vc10" "vc11" "vc12" "vc14" "vc141" "cbp" "xcd"}
   set aSupportedPlatforms { "wnt" "uwp" "lin" "mac" "ios" "qnx" }
   set isHelpRequire false
 
@@ -314,7 +314,6 @@ proc genproj {theFormat args} {
       vc141    -  Visual Studio 2017
       cbp      -  CodeBlocks
       xcd      -  XCode
-      pro      -  Qt Creator
 
     Platform (optional):
       wnt   -  Windows Desktop
@@ -396,14 +395,9 @@ 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
-        set aPlatformAndCompiler "${thePlatform}/gcc"
-        if { "$thePlatform" == "mac" || "$thePlatform" == "ios" } {
-          set aPlatformAndCompiler "${thePlatform}/clang"
-        }
-        file mkdir "$::path/${aPlatformAndCompiler}/lib"
-        file mkdir "$::path/${aPlatformAndCompiler}/libd"
+        file mkdir "$::path/$thePlatform/cbp/lib"
+        file mkdir "$::path/$thePlatform/cbp/libd"
       }
       "xcd"   { file copy -force -- "$::THE_CASROOT/adm/templates/xcode.sh"      "$::path/xcode.sh" }
     }
@@ -478,6 +472,15 @@ 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"
@@ -488,19 +491,6 @@ 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"   -
@@ -1355,11 +1345,9 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
     set aLibsMap(CSF_advapi32)     "advapi32"
     set aLibsMap(CSF_gdi32)        "gdi32"
     set aLibsMap(CSF_user32)       "user32 comdlg32"
-    set aLibsMap(CSF_shell32)      "shell32"
     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"
@@ -1377,23 +1365,17 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
     set aLibsMap(CSF_TBB) ""
   } else {
     set aLibsMap(CSF_dl)           "dl"
-    if { "$theOS" == "mac" || "$theOS" == "ios" } {
+    if { "$theOS" == "mac" } {
       set aLibsMap(CSF_objc)       "objc"
-      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"
@@ -2312,10 +2294,6 @@ 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
   }
@@ -2372,17 +2350,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=\"../../../${aPlatformAndCompiler}/bin/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    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 type=\"1\" />"
   } else {
     if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      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\" />"
+      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\" />"
     } else {
-      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 output=\"../../../${thePlatform}/cbp/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=\"../../../${aPlatformAndCompiler}/obj\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/obj\" />"
   puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
   puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
   if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2405,7 +2383,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=\"../../../${aPlatformAndCompiler}/lib\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/lib\" />"
   if { "$thePlatform" == "mac" } {
     if { [ lsearch $theLibsList X11 ] >= 0} {
       puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2413,7 +2391,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=../../../${aPlatformAndCompiler}/lib\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/lib\" />"
   }
   puts $aFile "\t\t\t\t</Linker>"
 
@@ -2422,17 +2400,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=\"../../../${aPlatformAndCompiler}/bind/${theProjName}\" prefix_auto=\"0\" extension_auto=\"0\" />"
+    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 type=\"1\" />"
   } else {
     if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
-      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\" />"
+      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\" />"
     } else {
-      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 output=\"../../../${thePlatform}/cbp/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=\"../../../${aPlatformAndCompiler}/objd\" />"
+  puts $aFile "\t\t\t\t<Option object_output=\"../../../${thePlatform}/cbp/objd\" />"
   puts $aFile "\t\t\t\t<Option compiler=\"$aCmplCbp\" />"
   puts $aFile "\t\t\t\t<Option createDefFile=\"0\" />"
   if { "$thePlatform" == "wnt" || "$thePlatform" == "uwp" } {
@@ -2455,7 +2433,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=\"../../../${aPlatformAndCompiler}/libd\" />"
+  puts $aFile "\t\t\t\t\t<Add directory=\"../../../${thePlatform}/cbp/libd\" />"
   if { "$thePlatform" == "mac" } {
     if { [ lsearch $theLibsList X11 ] >= 0} {
       puts $aFile "\t\t\t\t\t<Add directory=\"/usr/X11/lib\" />"
@@ -2463,7 +2441,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=../../../${aPlatformAndCompiler}/libd\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-Wl,-rpath-link=../../../${thePlatform}/cbp/libd\" />"
   }
   puts $aFile "\t\t\t\t</Linker>"
 
@@ -2530,8 +2508,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/" "/${aPlatformAndCompiler}/obj/src/"]  $aSrcFile]]
-      set aFileObjd [string map {.cxx .o} [string map [list "/src/" "/${aPlatformAndCompiler}/objd/src/"] $aSrcFile]]
+      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]]
       puts -nonewline $aFileLnkObj  "$aFileObj "
       puts -nonewline $aFileLnkObjd "$aFileObjd "
     } else {
@@ -2676,7 +2654,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 thePlatform theIsStatic} {
+proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection theDepsGuids theDepsRefGuids theIsStatic} {
   upvar $theGuidsMap         aGuidsMap
   upvar $theFileRefSection   aFileRefSection
   upvar $theDepsGuids        aDepsGuids
@@ -2700,7 +2678,7 @@ proc osutils:xcdtk:deps {theToolKit theTargetType theGuidsMap theFileRefSection
     }
   }
 
-  osutils:usedOsLibs $theToolKit $thePlatform aLibs aFrameworks
+  osutils:usedOsLibs $theToolKit "mac" aLibs aFrameworks
   set aUsedLibs [concat $aUsedLibs $aLibs]
   set aUsedLibs [concat $aUsedLibs $aFrameworks]
   foreach tkx $aUsedLibs {
@@ -2915,7 +2893,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 $thePlatform $theIsStatic]
+  puts $aPbxprojFile [osutils:xcdtk:deps    $theToolKit $theTargetType aGuidsMap aDepsFileRefSection aDepsGuids aDepsRefGuids $theIsStatic]
   # End PBXBuildFile section
 
   # Begin PBXFileReference section

adm/qmake/.gitignore

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

adm/qmake/OccCppConfig.pri

@@ -1,157 +0,0 @@
-# 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

@@ -1,36 +0,0 @@
-# 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

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

adm/qmake/OccToolkit.pri

@@ -1,144 +0,0 @@
-# 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

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

adm/qmake/Occt.pro

@@ -1,41 +0,0 @@
-# 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

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

adm/qmake/custom.pri.template

@@ -1,17 +0,0 @@
-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,13 +24,11 @@ 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%"
@@ -164,7 +162,6 @@ 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 PRJFMT="";
+export TARGET="";
 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 PRJFMT="cbp";
+    export TARGET="cbp";
   elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
-    export PRJFMT="xcd";
+    export TARGET="xcd";
   fi
 done
 shopt -u nocasematch
@@ -64,32 +64,28 @@ else
 fi
 
 export CASBIN=""
-if [ "${PRJFMT}" == "xcd" ]; then
+if [ "${TARGET}" == "cbp" ]; then
+  export CASBIN="${WOKSTATION}/cbp"
+elif [ "${TARGET}" == "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 [ "${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
+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
+  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"
 fi
 
 export CSF_OPT_CMPL=""
@@ -178,7 +174,7 @@ export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
 export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
 export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"
 
-if [ "${PRJFMT}" == "xcd" ]; then
+if [ "${TARGET}" == "xcd" ]; then
   if [ "${CASDEB}" == "d" ]; then
     export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
   else

adm/templates/template.vc10

@@ -110,7 +110,7 @@
       <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -159,7 +159,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -206,7 +206,7 @@
       <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -255,7 +255,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

adm/templates/template.vc10x

@@ -103,7 +103,7 @@
       <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
@@ -149,7 +149,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -193,7 +193,7 @@
       <PreprocessorDefinitions>NDEBUG;No_Exception;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
@@ -238,7 +238,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>

dox/CMakeLists.txt

@@ -89,14 +89,6 @@ file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nEXTERNAL_SEARCH        = NO")
 # Formula options
 file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH        = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")
 
-# If MSVC is used as build system, change warning format to the one recognized by MSVC
-if (MSVC)
-  file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nWARN_FORMAT            = \"$file($line): $text\"")
-endif()
-
-# Avoid Doxygen parsing messages in the build log
-file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nQUIET                  = YES")
-
 # Copy index file to provide fast access to HTML documentation
 file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")
 

dox/dev_guides/tests/tests.md

@@ -878,18 +878,7 @@ 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 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
+@subsubsection testmanual_5_1_7 demo
 
 This group allows demonstrating how testing cases are created, and testing DRAW commands and the test system as a whole.
 
@@ -900,7 +889,7 @@ This group allows demonstrating how testing cases are created, and testing DRAW
 | samples	| |	OCCT samples | 
 
 
-@subsubsection testmanual_5_1_9 draft
+@subsubsection testmanual_5_1_8 draft
 
 This group allows testing draft operations.
 
@@ -911,7 +900,7 @@ DRAW module: MODELING.
 | Angle	| depouille	| Drafts with angle (inclined walls) |
 
 
-@subsubsection testmanual_5_1_10 feat
+@subsubsection testmanual_5_1_9 feat
 
 This group allows testing creation of features on a shape.
 
@@ -925,7 +914,7 @@ DRAW module: MODELING (package *BRepTest*).
 | featrevol		| | | 
 | featrf		| | |
 
-@subsubsection testmanual_5_1_11 heal
+@subsubsection testmanual_5_1_10 heal
 
 This group allows testing the functionality provided by *ShapeHealing* toolkit.
 
@@ -954,7 +943,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_12 mesh
+@subsubsection testmanual_5_1_11 mesh
 
 This group allows testing shape tessellation (*BRepMesh*) and shading.
 
@@ -971,7 +960,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_13 mkface
+@subsubsection testmanual_5_1_12 mkface
 
 This group allows testing creation of simple surfaces.
 
@@ -986,7 +975,7 @@ DRAW module: MODELING (package *BRepTest*)
 | after_revsurf_and_offset | mkface	| | 
 | mkplane | mkplane	| |
 
-@subsubsection testmanual_5_1_14 nproject
+@subsubsection testmanual_5_1_13 nproject
 
 This group allows testing normal projection of edges and wires onto a face.
 
@@ -996,7 +985,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | Base	| nproject	|  |
 
-@subsubsection testmanual_5_1_15 offset
+@subsubsection testmanual_5_1_14 offset
 
 This group allows testing offset functionality for curves and surfaces.
 
@@ -1012,7 +1001,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_16 pipe
+@subsubsection testmanual_5_1_15 pipe
 
 This group allows testing construction of pipes (sweeping of a contour along profile).
 
@@ -1022,7 +1011,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | Standard	| pipe	| |
 
-@subsubsection testmanual_5_1_17 prism
+@subsubsection testmanual_5_1_16 prism
 
 This group allows testing construction of prisms.
 
@@ -1032,7 +1021,7 @@ DRAW module: MODELING (package *BRepTest*)
 | :---- | :----- | :------- | 
 | seminf | prism	| |
 
-@subsubsection testmanual_5_1_18 sewing
+@subsubsection testmanual_5_1_17 sewing
 
 This group allows testing sewing of faces by connecting edges.
 
@@ -1044,7 +1033,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_19 thrusection
+@subsubsection testmanual_5_1_18 thrusection
 
 This group allows testing construction of shell or a solid passing through a set of sections in a given sequence (loft).
 
@@ -1053,7 +1042,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_20 xcaf
+@subsubsection testmanual_5_1_19 xcaf
 
 This group allows  testing extended data exchange packages.
 

dox/dev_guides/upgrade/upgrade.md

@@ -1091,7 +1091,7 @@ The following environment variables have become redundant:
 
 * *CSF_UnitsLexicon* and *CSF_UnitsDefinition* are no more used.  Units definition (*UnitsAPI/Lexi_Expr.dat* and *UnitsAPI/Units.dat*) is now embedded into source code.
 * *CSF_XSMessage* and *CSF_XHMessage* are now optional.
-  English messages (XSMessage/\*XSTEP.us* and SHMessage/\*SHAPE.us*) are now embedded into source code
+  English messages (XSMessage/*XSTEP.us* and SHMessage/*SHAPE.us*) are now embedded into source code
   and automatically loaded when environment variables are not set.
 * *CSF_ShadersDirectory* is not required any more, though it still can be used to load custom shaders.
   Mandatory GLSL resources are now embedded into source code.
@@ -1678,86 +1678,3 @@ Standard_Boolean meshing_new()
 Some public methods of the class BRepFilletAPI_MakeChamfer are released from excess arguments:
 - method Add for symmetric chamfer now takes only 2 arguments: distance and edge;
 - method GetDistAngle now takes only 3 arguments: index of contour, distance and angle.
-
-@subsection upgrade_740_aspects Aspects unification
-
-Fill Area, Line and Marker aspects (classes *Graphic3d_AspectFillArea3d*, *Graphic3d_AspectLine3d*, *Graphic3d_AspectMarker3d* and *Graphic3d_AspectText3d*)
-have been merged into new class *Graphic3d_Aspects* providing a single state for rendering primitives of any type.
-The old per-primitive type aspect classes have been preserved as sub-classes of *Graphic3d_Aspects* with default values close to the previous behavior.
-All aspects except Graphic3d_AspectFillArea3d define Graphic3d_TOSM_UNLIT shading model.
-
-The previous approach with dedicated aspects per primitive type was handy in simplified case, but lead to confusion otherwise.
-In fact, drawing points or lines with lighting applied is a valid use case, but only *Graphic3d_AspectFillArea3d* previously defined necessary material properties.
-
-As aspects for different primitive types have been merged, Graphic3d_Group does no more provide per-type aspect properties.
-Existing code relying on old behavior and putting interleaved per-type aspects into single Graphic3d_Group should be updated.
-For example, the following pseudo-code will not work anymore, because all *SetGroupPrimitivesAspect* calls will setup the same property:
-~~~~
-Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-aGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect());    //!< overrides previous aspect
-
-Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments (2);
-Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles (3);
-aGroup->AddPrimitiveArray (aLines); //!< both arrays will use the same aspect
-aGroup->AddPrimitiveArray (aTris);
-~~~~
-
-To solve the problem, the code should be modified to either put primitives into dedicated groups (preferred approach), or using *SetPrimitivesAspect* in proper order:
-~~~~
-Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-
-aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-Handle(Graphic3d_ArrayOfTriangles) aTris = new Graphic3d_ArrayOfTriangles (3);
-aGroup->AddPrimitiveArray (aTris);
-
-Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments (2);
-aGroup->SetPrimitivesAspect (myDrawer->LineAspect()->Aspect()); //!< next array will use the new aspect
-aGroup->AddPrimitiveArray (aLines);
-~~~~
-
-@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.
-

dox/overview/overview.md

@@ -222,7 +222,6 @@ 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 "Standard_DEPRECATED=//! @deprecated "
+PREDEFINED             = Standard_EXPORT Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
 SEARCH_INCLUDES        = YES

dox/resources/occt_ug_html.doxyfile

@@ -16,6 +16,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = \\$file:\$line: \$text\
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.md *.dox 
 RECURSIVE              = YES
@@ -55,6 +56,6 @@ USE_MATHJAX            = YES
 MATHJAX_FORMAT         = HTML-CSS
 
 # Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image html \1"
-ALIASES += figure{2}="\image html \1 \2"
-ALIASES += figure{3}="\image html \1 \2"
+ALIASES += figure{1}="\image html \1 \n"
+ALIASES += figure{2}="\image html \1 \2 \n"
+ALIASES += figure{3}="\image html \1 \2 \n"

dox/resources/occt_ug_pdf.doxyfile

@@ -16,6 +16,7 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = \\$file:\$line: \$text\
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.md *.dox 
 RECURSIVE              = YES
@@ -48,6 +49,6 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 
 # Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image latex \1"
-ALIASES += figure{2}="\image latex \1 \2"
-ALIASES += figure{3}="\image latex \1 \2 width=\3"
+ALIASES += figure{1}="\image latex \1 \n"
+ALIASES += figure{2}="\image latex \1 \2 \n"
+ALIASES += figure{3}="\image latex \1 \2 width=\3 \n"

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,9 +5593,8 @@ 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 by approximation;
-* **surfint** fit a surface through 3d points by interpolation;
-* **2dinterpole** interpolates a curve. 
+* **surfapp** and **grilapp** fit a surface through 3d points;
+* **2dinterpolate** interpolates a curve. 
 
 @subsubsection occt_draw_6_8_1   appro, dapprox
 
@@ -5615,28 +5614,17 @@ Let us pick points and they will be fitted
 2dapprox c 10 
 ~~~~~
 
-@subsubsection occt_draw_6_8_2  surfapp, grilapp, surfint
+@subsubsection occt_draw_6_8_2  surfapp, grilapp
 
 
 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/iges/iges.md

@@ -178,10 +178,10 @@ if  (!Interface_Static::SetRVal ("read.maxprecision.val",0.1))
 Default value is 1.  
 
 <h4>read.stdsameparameter.mode</h4>
-defines the using of  *BRepLib\::SameParameter*. Its possible values are:  
-* 0 (Off) -- *BRepLib\::SameParameter* is not called,  
-* 1 (On) -- *BRepLib\::SameParameter* is called.  
-*BRepLib\::SameParameter* is used through  *ShapeFix_Edge\::SameParameter*. It ensures that the resulting edge will have the  lowest tolerance taking pcurves either unmodified from the IGES file or  modified by *BRepLib\::SameParameter*.  
+defines the using of  *BRepLib::SameParameter*. Its possible values are:  
+* 0 (Off) -- *BRepLib::SameParameter* is not called,  
+* 1 (On) -- *BRepLib::SameParameter* is called.  
+*BRepLib::SameParameter* is used through  *ShapeFix_Edge::SameParameter*. It ensures that the resulting edge will have the  lowest tolerance taking pcurves either unmodified from the IGES file or  modified by *BRepLib::SameParameter*.  
 Read this parameter  with:  
 ~~~~~
 Standard_Integer mv =  Interface_Static::IVal("read.stdsameparameter.mode"); 

dox/user_guides/modeling_data/modeling_data.md

@@ -723,6 +723,137 @@ When you write an algorithm which operates on geometric objects, use <i> Adaptor
 As a result, you can use the algorithm with any kind of object, if you provide for this object an interface derived from *Adaptor3d* or *Adaptor2d*.
 These interfaces are easy to use: simply create an adapted curve or surface from a *Geom2d* curve, and then use this adapted curve as an argument for the algorithm? which requires it.
 
+@section occt_modat_4per Concept of periodicity applied in OCCT-algorithms
+
+@subsection occt_modat_4per_1 Mathematical definition
+
+In math, the following definition of periodicity is applied (detailed information can be found in <a href="https://en.wikipedia.org/wiki/Periodic_function">Wikipedia</a> or on the site of <a href="http://mathworld.wolfram.com/PeriodicFunction.html">WolframMathWorld</a>):
+
+A function of a real variable \f$ f(x) \f$ is said to be periodic with period \f$ T \neq 0 \f$ if<br>
+<span>1.</span>	For every \f$ x \in \mathfrak{D}_{f} \f$ (\f$ \mathfrak{D}_{f} \f$ is the domain of the function \f$ f(x) \f$), the point \f$ \left (x \pm T*n  \right ) \in \mathfrak{D}_{f} \f$ (where \f$ n \f$ applies positive integer values only: \f$ n=1,2,... \f$ ) and the condition
+\f[ f(x-T*n)=f(x+T*n)=f(x) \f]
+is satisfied.<br>
+<span>2.</span>	For every \f$ x \notin \mathfrak{D}_{f} \f$, the point \f$ \left (x \pm T*n  \right ) \notin \mathfrak{D}_{f} \f$, (where \f$ n=1,2,... \f$ ).<br>
+
+@subsubsection occt_modat_4per_1_1 Example
+
+For example, the tangent function \f$ f(x)=\tan(x) \f$ is periodic with least period (a least positive constant \f$ T \f$, which will be called later as period) \f$ \pi \f$ because \f$ \tan(x) \f$ is not defined only in points \f$ x=\left (\frac{\pi }{2}\pm \pi *n  \right ) \f$ (where \f$ n=0,1,2,... \f$) and for other points the condition<br>
+\f[ \tan(x-\pi*n)=\tan(x+\pi*n)=\tan(x) \f]
+is satisfied.
+
+As we can see from the definition, any periodic function cannot have bounded domain (because product \f$ T*n \f$ tends to infinite) but can be discontinuous. Let us look, how it is realized in OCCT.
+
+@subsection occt_modat_4per_2 Periodicity of bounded curves
+
+First of all, OCCT works only with continuous elements (curves and surfaces). <b>I.e. work with curves having continuity less than C0 (e.g. with any gaps) is not supported.</b>
+
+In OCCT, set of bounded curves includes only Bezier curves, B-spline curves and trimmed curves. Let us consider these objects from point of view to be periodic.
+
+@subsubsection occt_modat_4per_2_1 Bezier curves
+
+Bezier curve is always defined in the range \f$ \mathfrak{D}=\left [ 0,1 \right ] \f$ and does not allow any analytical extension. Therefore, <b>Bezier curve cannot be periodic at all</b>.
+
+@subsubsection occt_modat_4per_2_2 B-spline curve
+
+OCCT can create <a href="https://en.wikiversity.org/wiki/CAGD/B-splines#Periodic_B-splines">periodic B-spline</a> and can convert any closed B-spline into periodic one. At that, any periodic B-spline is defined on the set of real numbers (\f$ \mathfrak{D}=\mathbb{R} \f$). Nevertheless, in OCCT, periodic B-splines are included in set of bounded curves, too. The class of Bounded curves does not separate periodic and not-periodic B-splines.<br>
+
+However, <b>range of not-periodic B-spline must be considered as its domain</b>. I.e. if any not-periodic B-spline curve is parametrized in the range \f$ t \in \left [ 0,1 \right ] \f$ then its evaluation in the point \f$ t=1.5 \f$ is forbidden (in general). Evaluation of B-spline curve on its analytical extension can be used in some cases. However, it is out of scope of this article.
+
+@subsubsection occt_modat_4per_2_3 Trimmed curve
+
+OCCT-algorithms allow trimmed curve’s existing out of trim boundaries (exceptionally, if these boundaries match the domain completely). Evidently, the trimmed curve is not defined in the region where its basis curve is not defined.<br>
+
+E.g. if some trimmed curve is an arc of circle and the trim boundaries are \f$ t \in \left [ \frac{\pi }{2},\pi \right ] \f$ then nothing prevents us to compute the value of this arc in the point \f$ t=\frac{3\pi}{2} \f$. Analogically, for some line trimmed in the range \f$ t \in \left [ 0,1 \right ] \f$ nothing prevents us to compute the value in the point \f$ t=100 \f$. In other words, <b>trim boundaries must not be considered as domain boundaries</b>. And curve trimmed from any periodic curve exists out of trim boundaries. Consequently, this trimmed curve can be considered as periodic curve.<br>
+
+Also, let us make the final conclusion. <b>In OCCT-algorithms, trimmed curve is considered to be periodic if its basis curve is periodic. At that trim boundaries do not play any role. I.e. the curve itself can be periodic and not-closed</b>.<br>
+
+@subsubsection occt_modat_4per_2_4 Trim boundaries
+
+@ref occt_modat_4per_2_3 "We have just found out" that the trim boundaries are not domain boundaries. But what is their real role in OCCT-algorithms?
+
+Trim boundaries define some work range of the trimmed curve. Indeed, this (default) work range exists for any OCCT-curve (not only for trimmed one). For any periodic not-trimmed curve, the work range is \f$ \mathfrak{W}=\left [ 0,T \right ) \f$ (where \f$ T \f$ is the period of the curve). For bounded not-trimmed curve, this work range matches its domain. For other not-trimmed curves (e.g. line), the work range is \f$ \mathfrak{W}=\left ( -\infty ,+\infty  \right ) \f$ (i.e. matches its domain, too).
+
+Operation <b><i>"TRIM"</i></b> applied to the curve allows changing its default work range (shift or reduce but not increase). <b>Setting work range greater than the default one is strictly forbidden</b>.
+
+E.g. the default work range of any circle is \f$ \mathfrak{W}=\left [ 0,2\pi \right ) \f$. With <b><i>"TRIM"</i></b> operation you can create trimmed circle (i.e. arc) with work ranges \f$ \left [ 0,\pi \right ] \f$, \f$ \left [ 5\pi,\frac{11\pi}{2} \right ] \f$, \f$ \left [ 100\pi,102\pi \right ] \f$ etc. However, you must have failed to create arc with work range \f$ \left [ 50\pi,55\pi \right ] \f$, because this new work range is greater than \f$ \mathfrak{W} \f$.
+
+For not-periodic B-spline curve with default work range \f$ \mathfrak{W}=\left [ 0,1 \right ] \f$, you can create trimmed B-spline curve with work ranges \f$ \left [ 0,0.1 \right ] \f$, \f$ \left [ 0.6,0.78 \right ] \f$, \f$ \left [ 0.5,1 \right ] \f$ etc. However, you must have failed to set work range to \f$ \left [ 0.8,1.5 \right ] \f$ (because the input B-spline is not defined in the range \f$ \left ( 1,1.5 \right ] \f$).
+
+For a line, you can create any work range with <b><i>"TRIM"</i></b> operation. Every work range will be valid.
+
+Use the method **GeomLib::AllowExtend(...)** in order to check whether the new work range can be applied to the curve. Please see documentation about this method.
+
+However, what does work range bring to OCCT? The point is that the most OCCT-algorithms tend to work in work ranges of their input data. So, if you call extrema high-level tool (exactly API) then you will obtain point with parameters already adjusted in work range of the arguments. If you call surface-surface intersection algorithm (API again) then you will obtain 3D-curve and two 2D-curves, which are already in surfaces’ work ranges (you do not need any shifting them). So, correct using work ranges makes work with OCCT more convenient.
+
+@subsection occt_modat_4per_3 Periodicity of curves’ adaptors
+
+In OCCT, periodicity of adaptors depends on the periodicity of its curves only. Any ranges are not taken into account.
+
+At that, it is useful to note the fact that adaptor’s curve is always not trimmed. I.e. if some trimmed curve is sent into some adaptor then the adaptor will store the basis (not trimmed) curve and First/Last parameters of adaptor will be set to the corresponding trim-boundaries.
+
+Moreover, there are some specific adaptors in OCCT. E.g. **BRepAdaptor_CompCurve**. Periodicity of such adaptors is defined in a special way. So, it is necessary to read reference manual about these classes in order to get more clear understanding of their behavior.
+
+@subsection occt_modat_4per_4 Periodicity of surfaces
+
+In OCCT, surface(s) is set in parametric form by vector-function of two real variables: \f$ S(U,V) \f$. As result, term of periodicity is considered for every such variable separately (\f$ U\f$-periodic and \f$ V \f$-periodic surfaces are considered). Also, there exist bi-periodic surfaces (e.g. Toroidal surface), which are periodic in both \f$ U \f$- and \f$ V \f$-directions (OCCT does not work with univariate function of a complex argument; therefore commonly-used terms "Double periodic" or "Triple periodic" are not figured in OCCT).
+
+So, \f$ U \f$-periodic surface can be defined as follows: <b>The surface \f$ S(U,V) \f$ is \f$ U \f$-periodic if for every fixed value of \f$ V \f$-argument \f$ (V=V_{0})\f$ one of the following conditions is satisfied:<br>
+<span>1.</span>	For every \f$ U\in \mathbb{R} \f$, the point \f$ (U, V_{0}) \notin \mathfrak{D}_{S} \f$, where \f$ \mathfrak{D}_{S} \f$ is the domain of the surface \f$ S \f$;<br>
+<span>2.</span>	Otherwise, the univariate function of real variable \f$ F(U)=S(U,V_{0} ) \f$ is periodic.</b><br>
+
+V-periodic surface can be defined analogically: <b>The surface \f$ S(U,V) \f$ is \f$ V \f$-periodic if for every fixed value of \f$ U \f$-argument \f$ (U=U_{0})\f$ one of the following conditions is satisfied:<br>
+<span>1.</span>	For every \f$ V\in \mathbb{R} \f$, the point \f$ (U_{0}, V) \notin \mathfrak{D}_{S} \f$, where \f$ \mathfrak{D}_{S} \f$ is the domain of the surface \f$ S \f$;<br>
+<span>2.</span>	Otherwise, the univariate function of real variable \f$ F(V)=S(U_{0}, V) \f$ is periodic.</b><br>
+
+All remarks made @ref occt_modat_4per_2 "above" considering bounded curves are satisfied for bounded surfaces. At that, a work range of any surface is a region in 2D (rectangular) Cartesian coordinate system taking into account permissible values of U and V parameters. The example is given @ref occt_modat_4per_5 "below".
+
+There exist some methods analogical to **GeomLib::AllowExtend(...)** but can be applied to surface. These methods are called **GeomLib::AllowExtendUParameter(...)** and **GeomLib::AllowExtendVParameter(...)**.
+
+@subsection occt_modat_4per_5 Special questions about periodicity of surfaces
+@subsubsection occt_modat_4per_5_1 Periodicity of a spherical surface
+
+Let us consider a spherical surface having radius \f$ R \f$. It can be defined in local coordinate system (<a href="http://help.autodesk.com/view/INVNTOR/2014/ENU/?guid=GUID-FF15BB0D-5FE9-45F9-92FD-D70A3F6A8FD0">UCS</a>) by the vector function of two scalar arguments:
+\f[ 
+  S\left ( U,V \right )=R* \begin{pmatrix}
+                            \cos (U)*\cos (V)\\ 
+                            \sin (U)*\cos (V)\\ 
+                            \sin (V)
+                          \end{pmatrix} 
+\f]
+
+As we can see, this function is \f$ V \f$-periodic and its \f$ V \f$-period is equal to \f$ 2\pi \f$. And it is \f$ U \f$-periodic with \f$ U \f$-period \f$ 2\pi \f$. I.e. (theoretically) the default work range of any surface with such equation is the set of 2D-points such \f$ \mathfrak{W}=\left \{(U,V)|0\leq U < 2\pi, 0\leq V < 2\pi \right \} \f$.
+
+However, let us take two different points in the parametric space: \f$ (0,0) \f$ and \f$ (\pi,\pi) \f$. Their 3D-images are: \f$ S\left ( 0,0 \right )=\begin{pmatrix}R & 0 & 0\end{pmatrix}^{T} \f$, \f$ S\left ( \pi,\pi \right )=\begin{pmatrix}R & 0 & 0\end{pmatrix}^{T} \f$. As we can see, 3D-points are the same. This fact is inappropriate for different points from one work range. Such result says about that the surface \f$ S(U,V) \f$ is self-interfered surface.
+
+<b>Working with self-interfered elements is not supported by OCCT at all</b>. Therefore, in order to make spherical surface valid, specific domain is assigned to sphere. Namely:<br>
+
+\f[ \mathfrak{D}_{S}= \left \{(U,V)|-\infty < U < +\infty , -\frac{\pi}{2}\leq V \leq  \frac{\pi}{2} \right \} \f]
+
+Of course, the range for V-parameter must be \f$ -\frac{\pi}{2}+2\pi n\leq V \leq  \frac{\pi}{2}+2\pi n \f$ (where \f$ n \f$ applies positive integer values only: \f$ n=1,2,... \f$). However, this range is discontinuous and is not supported (see the section @ref occt_modat_4per_2). Therefore, \f$ V \f$-parameter of spherical surface is considered to be bounded. Consequently, <b>sphere is considered to be not \f$ V \f$-periodic</b>.
+
+Based on this fact, the default sphere’s work range is \f$ \mathfrak{W}=\left \{(U,V)|0\leq U < 2\pi, -\frac{\pi}{2}\leq V \leq  \frac{\pi}{2} \right \} \f$. Please pay attention to the fact that the spherical surface is \f$ U \f$-periodic surface. Therefore, value of \f$ U \f$-parameter can be any real number (the set \f$ \mathbb{R} \f$ ). However, its work range in \f$ U \f$-direction cannot be greater than \f$ 2\pi \f$. In that way the sphere is not self-interfered (the point \f$ (\pi,\pi) \f$ is out of its domain) and is valid completely.
+
+@subsubsection occt_modat_4per_5_2 Periodicity of a Surface-of-Revolution
+
+@ref occt_modat_4per_5_1 "Analogical situation" exists with surface of revolution. Having taken into account all said above, let us formulate conditions when the surface of revolution is \f$ V \f$-periodic.
+
+Evidently, for that case, the basis curve must be periodic curve. Additionally, revolving full curve (taken with its default work range) must not lead to create self-interfered surface of revolution (i.e. this curve must not intersect the rotation axis). In other words, <b>the valid (not self-interfered) surface of revolution must be based on closed periodic curve in order to be \f$ V \f$-periodic</b>.
+
+Please note that the basis curve can be not-closed by different reasons (not only in order to avoid creating self-interfered surface of revolution), which are neither nor separated nor analyzed by OCCT. OCCT uses simple check: periodicity of basis curve and its closure. It is connected with the fact that the property of periodicity of a Surface-of-Revolution is not very important for OCCT-algorithms because almost all algorithms work only with work range of a Surface-of-Revolution (i.e. in most cases we do not need in adjusting parameters).
+
+Based on the foregoing, the domain of any not \f$ V \f$-periodic surface of revolution is \f$ \mathfrak{D}_{S}= \left \{(U,V)|-\infty < U < +\infty , C_{f} \leq V \leq  C_{l} \right \} \f$, where \f$ \left [C_{f},C_{l}  \right ] \f$ is the work range of the basis curve (i.e. the work range of the basis curve defines the domain of the surface). The default work range of this surface is \f$ \mathfrak{W}=\left \{(U,V)|0\leq U < 2\pi, C_{f} \leq V \leq  C_{l} \right \} \f$.
+
+Finally, it is got to be said that the constructors of surface of revolution do not check the situation when invalid result can be created. It must be done on application level (e.g. by using **GeomLib::AllowExtendVParameter(...)** method). We offer to use the following steps (which should be used only in places where you doubt in validity of created surface of revolution):
+
+<span>1.</span>Create a surface of revolution with default work-range of the basis curve;<br>
+<span>2.</span>Compute new work range of the basis curve (it depends on your requirements only);<br>
+<span>3.</span>Call **GeomLib::AllowExtendVParameter(...)** method with existing surface of revolution and the new range. If the new range is valid the method will return TRUE.<br>
+
+The method **GeomLib::AllowExtendVParameter(...)** works with spherical surface, too.
+
+@subsection occt_modat_4per_6 Periodicity of surfaces’ adaptors
+
+@ref occt_modat_4per_3 "As for curves", periodicity of adaptors depends on the periodicity of its surfaces only. All remarks about curve's adaptor are fair to surfaces.
 
 @section occt_modat_5 Topology
 
@@ -1341,26 +1472,7 @@ 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>
 
-@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.
+This algorithm is 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,6 +226,8 @@ 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.
 
@@ -245,11 +247,9 @@ Each custom sensitive entity must inherit at least *SelectBasics_SensitiveEntity
   - triangulation;
   - wire.
 
-Each basic sensitive entity inherits *Select3D_SensitiveEntity*.
+Each basic sensitive entity inherits *Select3D_SensitiveEntity*, which is a child class of *SelectBasics_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.
@@ -1793,11 +1793,12 @@ Create facet attributes.
 Handle(Graphic3d_AspectFillArea3d) aFaceAspect =  new Graphic3d_AspectFillArea3d();
 Graphic3d_MaterialAspect aBrassMaterial (Graphic3d_NOM_BRASS);
 Graphic3d_MaterialAspect aGoldMaterial  (Graphic3d_NOM_GOLD);
-aFaceAspect->SetInteriorStyle (Aspect_IS_SOLID_WIREFRAME);
+aFaceAspect->SetInteriorStyle (Aspect_IS_SOLID);
 aFaceAspect->SetInteriorColor (aMyColor);
 aFaceAspect->SetDistinguishOn ();
 aFaceAspect->SetFrontMaterial (aGoldMaterial);
 aFaceAspect->SetBackMaterial  (aBrassMaterial);
+aFaceAspect->SetEdgeOn();
 ~~~~~
 
 Create text attributes.

genproj

@@ -19,6 +19,10 @@ 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"
@@ -33,12 +37,6 @@ 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,10 +49,6 @@ if "%aPlatform%" == "" (
   )
 )
 
-set aPrjFmt=%PRJFMT%
-if "%aPrjFmt%" == "" ( set "aPrjFmt=vcxproj" )
-if "%aPrjFmt%" == "vcxproj" ( set "aPrjFmt=%VCFMT%" )
-
 cd %~dp0
-%TCL_EXEC% %~dp0adm/start.tcl genproj %aPrjFmt% %aPlatform% %3 %4 %5
+%TCL_EXEC% %~dp0adm/start.tcl genproj %VCFMT% %aPlatform% %3 %4 %5
 SET "PATH=%OLD_PATH%"

samples/glfw/CMakeLists.txt

@@ -1,68 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(glfw-occt-demo)
-
-set(CMAKE_CXX_STANDARD 11)
-set(APP_VERSION_MAJOR 1)
-set(APP_VERSION_MINOR 0)
-set(APP_TARGET glfwocct)
-
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
-file(GLOB SOURCES
-  *.h
-  *.cpp
-)
-source_group ("Headers" FILES
-  GlfwOcctView.h
-  GlfwOcctWindow.h)
-source_group ("Sources" FILES
-  GlfwOcctView.cpp
-  GlfwOcctWindow.cpp
-  main.cpp)
-
-# OpenGL
-find_package(OpenGL REQUIRED)
-
-# Open CASCADE Technology
-find_package(OpenCASCADE REQUIRED NO_DEFAULT_PATH)
-if (OpenCASCADE_FOUND)
-  message (STATUS "Using OpenCASCADE from \"${OpenCASCADE_DIR}\"" )
-  INCLUDE_DIRECTORIES(${OpenCASCADE_INCLUDE_DIR})
-  LINK_DIRECTORIES(${OpenCASCADE_LIBRARY_DIR})
-else()
-  message (WARNING "Could not find OpenCASCADE, please set OpenCASCADE_DIR variable." )
-  set (OCCT_LIBRARY_DIR)
-  set (OCCT_BIN_DIR)
-endif()
-
-SET(OpenCASCADE_LIBS 
-  TKernel
-  TKService
-  TKV3d
-  TKOpenGl
-  TKBRep
-  TKGeomBase
-  TKGeomAlgo
-  TKG3d
-  TKG2d
-  TKTopAlgo
-  TKPrim
-)
-
-# glfw
-find_package(glfw3 REQUIRED)
-if (glfw3_FOUND)
-  message (STATUS "Using glfw3 ${glfw3_VERSION}" )
-  INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS})
-  LINK_DIRECTORIES(${GLFW_LIBRARY_DIRS})
-else()
-  message (STATUS "glfw3 is not found." )
-endif()
-
-add_executable(${APP_TARGET} ${SOURCES})
-target_link_libraries(
-  ${APP_TARGET}
-  ${OpenCASCADE_LIBS}
-  glfw
-  ${OPENGL_LIBRARIES}
-)

samples/glfw/GlfwOcctView.cpp

@@ -1,324 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#include "GlfwOcctView.h"
-
-#include <AIS_Shape.hxx>
-#include <Aspect_Handle.hxx>
-#include <Aspect_DisplayConnection.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeCone.hxx>
-#include <Message.hxx>
-#include <Message_Messenger.hxx>
-#include <OpenGl_GraphicDriver.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-
-#include <iostream>
-
-#include <GLFW/glfw3.h>
-
-// ================================================================
-// Function : GlfwOcctView
-// Purpose  :
-// ================================================================
-GlfwOcctView::GlfwOcctView()
-: myCurAction3d (CurAction3d_Nothing),
-  myToRedraw (true)
-{
-}
-
-// ================================================================
-// Function : ~GlfwOcctView
-// Purpose  :
-// ================================================================
-GlfwOcctView::~GlfwOcctView()
-{
-}
-
-// ================================================================
-// Function : toView
-// Purpose  :
-// ================================================================
-GlfwOcctView* GlfwOcctView::toView (GLFWwindow* theWin)
-{
-  return static_cast<GlfwOcctView*>(glfwGetWindowUserPointer (theWin));
-}
-
-// ================================================================
-// Function : errorCallback
-// Purpose  :
-// ================================================================
-void GlfwOcctView::errorCallback (int theError, const char* theDescription)
-{
-  Message::DefaultMessenger()->Send (TCollection_AsciiString ("Error") + theError + ": " + theDescription, Message_Fail);
-}
-
-// ================================================================
-// Function : run
-// Purpose  :
-// ================================================================
-void GlfwOcctView::run()
-{
-  initWindow (800, 600, "glfw occt");
-  initViewer();
-  initDemoScene();
-  if (myView.IsNull())
-  {
-    return;
-  }
-
-  myView->MustBeResized();
-  myOcctWindow->Map();
-  mainloop();
-  cleanup();
-}
-
-// ================================================================
-// Function : initWindow
-// Purpose  :
-// ================================================================
-void GlfwOcctView::initWindow (int theWidth, int theHeight, const char* theTitle)
-{
-  glfwSetErrorCallback (GlfwOcctView::errorCallback);
-  glfwInit();
-  const bool toAskCoreProfile = true;
-  if (toAskCoreProfile)
-  {
-    glfwWindowHint (GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint (GLFW_CONTEXT_VERSION_MINOR, 3);
-#if defined (__APPLE__)
-    glfwWindowHint (GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-#endif
-    glfwWindowHint (GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-  }
-  myOcctWindow = new GlfwOcctWindow (theWidth, theHeight, theTitle);
-  glfwSetWindowUserPointer       (myOcctWindow->getGlfwWindow(), this);
-  // window callback
-  glfwSetWindowSizeCallback      (myOcctWindow->getGlfwWindow(), GlfwOcctView::onResizeCallback);
-  glfwSetFramebufferSizeCallback (myOcctWindow->getGlfwWindow(), GlfwOcctView::onFBResizeCallback);
-  // mouse callback
-  glfwSetScrollCallback          (myOcctWindow->getGlfwWindow(), GlfwOcctView::onMouseScrollCallback);
-  glfwSetMouseButtonCallback     (myOcctWindow->getGlfwWindow(), GlfwOcctView::onMouseButtonCallback);
-  glfwSetCursorPosCallback       (myOcctWindow->getGlfwWindow(), GlfwOcctView::onMouseMoveCallback);
-}
-
-// ================================================================
-// Function : initViewer
-// Purpose  :
-// ================================================================
-void GlfwOcctView::initViewer()
-{
-  if (myOcctWindow.IsNull()
-   || myOcctWindow->getGlfwWindow() == nullptr)
-  {
-    return;
-  }
-
-  Handle(OpenGl_GraphicDriver) aGraphicDriver = new OpenGl_GraphicDriver (myOcctWindow->GetDisplay(), false);
-  Handle(V3d_Viewer) aViewer = new V3d_Viewer (aGraphicDriver);
-  aViewer->SetDefaultLights();
-  aViewer->SetLightOn();
-  aViewer->SetDefaultTypeOfView (V3d_PERSPECTIVE);
-  aViewer->ActivateGrid (Aspect_GT_Rectangular, Aspect_GDM_Lines);
-  myView = aViewer->CreateView();
-  myView->SetImmediateUpdate (false);
-  myView->SetWindow (myOcctWindow, myOcctWindow->NativeGlContext());
-  myView->ChangeRenderingParams().ToShowStats = true;
-  myContext = new AIS_InteractiveContext (aViewer);
-}
-
-// ================================================================
-// Function : initDemoScene
-// Purpose  :
-// ================================================================
-void GlfwOcctView::initDemoScene()
-{
-  if (myContext.IsNull())
-  {
-    return;
-  }
-
-  myView->TriedronDisplay (Aspect_TOTP_LEFT_LOWER, Quantity_NOC_GOLD, 0.08, V3d_WIREFRAME);
-
-  gp_Ax2 anAxis;
-  anAxis.SetLocation (gp_Pnt (0.0, 0.0, 0.0));
-  Handle(AIS_Shape) aBox = new AIS_Shape (BRepPrimAPI_MakeBox (anAxis, 50, 50, 50).Shape());
-  myContext->Display (aBox, AIS_Shaded, 0, false);
-  anAxis.SetLocation (gp_Pnt (25.0, 125.0, 0.0));
-  Handle(AIS_Shape) aCone = new AIS_Shape (BRepPrimAPI_MakeCone (anAxis, 25, 0, 50).Shape());
-  myContext->Display (aCone, AIS_Shaded, 0, false);
-
-  TCollection_AsciiString aGlInfo;
-  {
-    TColStd_IndexedDataMapOfStringString aRendInfo;
-    myView->DiagnosticInformation (aRendInfo, Graphic3d_DiagnosticInfo_Basic);
-    for (TColStd_IndexedDataMapOfStringString::Iterator aValueIter (aRendInfo); aValueIter.More(); aValueIter.Next())
-    {
-      if (!aGlInfo.IsEmpty()) { aGlInfo += "\n"; }
-      aGlInfo += TCollection_AsciiString("  ") + aValueIter.Key() + ": " + aValueIter.Value();
-    }
-  }
-  Message::DefaultMessenger()->Send (TCollection_AsciiString("OpenGL info:\n") + aGlInfo, Message_Info);
-}
-
-// ================================================================
-// Function : mainloop
-// Purpose  :
-// ================================================================
-void GlfwOcctView::mainloop()
-{
-  while (!glfwWindowShouldClose (myOcctWindow->getGlfwWindow()))
-  {
-    // glfwPollEvents() for continuous rendering (immediate return if there are no new events)
-    // and glfwWaitEvents() for rendering on demand (something actually happened in the viewer)
-    //glfwPollEvents();
-    glfwWaitEvents();
-    if (!myView.IsNull())
-    {
-      if (myView->IsInvalidated())
-      {
-        myView->Redraw();
-      }
-      else if (myToRedraw)
-      {
-        myView->RedrawImmediate();
-      }
-      myToRedraw = false;
-    }
-  }
-}
-
-// ================================================================
-// Function : cleanup
-// Purpose  :
-// ================================================================
-void GlfwOcctView::cleanup()
-{
-  if (!myView.IsNull())
-  {
-    myView->Remove();
-  }
-  if (!myOcctWindow.IsNull())
-  {
-    myOcctWindow->Close();
-  }
-  glfwTerminate();
-}
-
-// ================================================================
-// Function : onResize
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onResize (int theWidth, int theHeight)
-{
-  if (theWidth  != 0
-   && theHeight != 0
-   && !myView.IsNull())
-  {
-    myView->Window()->DoResize();
-    myView->MustBeResized();
-    myView->Invalidate();
-    myView->Redraw();
-    //myToRedraw = true;
-  }
-}
-
-// ================================================================
-// Function : onMouseScroll
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onMouseScroll (double theOffsetX, double theOffsetY)
-{
-  if (myView.IsNull()) { return; }
-
-  const Graphic3d_Vec2i aPos = myOcctWindow->CursorPosition();
-  myView->StartZoomAtPoint (aPos.x(), aPos.y());
-  myView->ZoomAtPoint (0, 0, int(theOffsetY * 4.0), int(theOffsetY * 4.0));
-  myView->Invalidate();
-  myToRedraw = true;
-}
-
-// ================================================================
-// Function : onMouseButton
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onMouseButton (int theButton, int theAction, int theMods)
-{
-  if (myView.IsNull()) { return; }
-
-  const Graphic3d_Vec2i aPos = myOcctWindow->CursorPosition();
-  if (theAction != GLFW_PRESS)
-  {
-    myCurAction3d = CurAction3d_Nothing;
-    return;
-  }
-
-  myMouseMin = aPos;
-  myMouseMax = aPos;
-  switch (theButton)
-  {
-    case GLFW_MOUSE_BUTTON_RIGHT:
-    {
-      myCurAction3d = CurAction3d_DynamicRoation;
-      myView->StartRotation (aPos.x(), aPos.y());
-      break;
-    }
-    case GLFW_MOUSE_BUTTON_MIDDLE:
-    {
-      myCurAction3d = CurAction3d_DynamicPanning;
-      break;
-    }
-  }
-}
-
-// ================================================================
-// Function : onMouseMove
-// Purpose  :
-// ================================================================
-void GlfwOcctView::onMouseMove (int thePosX, int thePosY)
-{
-  if (myView.IsNull()) { return; }
-
-  switch (myCurAction3d)
-  {
-    case CurAction3d_DynamicRoation:
-    {
-      myView->Rotation (thePosX, thePosY);
-      myView->Invalidate();
-      myToRedraw = true;
-      break;
-    }
-    case CurAction3d_DynamicPanning:
-    {
-      myView->Pan (thePosX - myMouseMax.x(), -(thePosY - myMouseMax.y()));
-      myView->Invalidate();
-      myToRedraw = true;
-      myMouseMax.SetValues (thePosX, thePosY);
-      break;
-    }
-    default:
-    {
-      myContext->MoveTo (thePosX, thePosY, myView, false);
-      myToRedraw = true;
-      break;
-    }
-  }
-}

samples/glfw/GlfwOcctView.h

@@ -1,125 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#ifndef _GlfwOcctView_Header
-#define _GlfwOcctView_Header
-
-#include "GlfwOcctWindow.h"
-
-#include <AIS_InteractiveContext.hxx>
-#include <V3d_View.hxx>
-
-//! Sample class creating 3D Viewer within GLFW window.
-class GlfwOcctView
-{
-public:
-  enum CurAction3d
-  {
-    CurAction3d_Nothing,
-    CurAction3d_DynamicZooming,
-    CurAction3d_DynamicPanning,
-    CurAction3d_DynamicRoation
-  };
-
-public:
-  //! Default constructor.
-	GlfwOcctView();
-
-  //! Destructor.
-	~GlfwOcctView();
-
-  //! Main application entry point.
-  void run();
-
-private:
-
-  //! Create GLFW window.
-  void initWindow (int theWidth, int theHeight, const char* theTitle);
-
-  //! Create 3D Viewer.
-  void initViewer();
-
-  //! Fill 3D Viewer with a DEMO items.
-  void initDemoScene();
-
-  //! Application event loop.
-  void mainloop();
-
-  //! Clean up before .
-  void cleanup();
-
-//! @name GLWF callbacks
-private:
-  //! Window resize event.
-  void onResize (int theWidth, int theHeight);
-
-  //! Mouse scroll event.
-  void onMouseScroll (double theOffsetX, double theOffsetY);
-
-  //! Mouse click event.
-  void onMouseButton (int theButton, int theAction, int theMods);
-
-  //! Mouse move event.
-  void onMouseMove (int thePosX, int thePosY);
-
-//! @name GLWF callbacks (static functions)
-private:
-
-  //! GLFW callback redirecting messages into Message::DefaultMessenger().
-  static void errorCallback (int theError, const char* theDescription);
-
-  //! Wrapper for glfwGetWindowUserPointer() returning this class instance.
-  static GlfwOcctView* toView (GLFWwindow* theWin);
-
-  //! Window resize callback.
-  static void onResizeCallback (GLFWwindow* theWin, int theWidth, int theHeight)
-  { toView(theWin)->onResize (theWidth, theHeight); }
-
-  //! Frame-buffer resize callback.
-  static void onFBResizeCallback (GLFWwindow* theWin, int theWidth, int theHeight)
-  { toView(theWin)->onResize (theWidth, theHeight); }
-
-  //! Mouse scroll callback.
-  static void onMouseScrollCallback (GLFWwindow* theWin, double theOffsetX, double theOffsetY)
-  { toView(theWin)->onMouseScroll (theOffsetX, theOffsetY); }
-
-  //! Mouse click callback.
-  static void onMouseButtonCallback (GLFWwindow* theWin, int theButton, int theAction, int theMods)
-  { toView(theWin)->onMouseButton (theButton, theAction, theMods); }
-
-  //! Mouse move callback.
-  static void onMouseMoveCallback (GLFWwindow* theWin, double thePosX, double thePosY)
-  { toView(theWin)->onMouseMove ((int )thePosX, (int )thePosY); }
-
-private:
-
-  Handle(GlfwOcctWindow) myOcctWindow;
-  Handle(V3d_View) myView;
-  Handle(AIS_InteractiveContext) myContext;
-
-  CurAction3d myCurAction3d;
-  Graphic3d_Vec2i myMouseMin;
-  Graphic3d_Vec2i myMouseMax;
-  bool myToRedraw;
-
-};
-
-#endif // _GlfwOcctView_Header

samples/glfw/GlfwOcctWindow.cpp

@@ -1,161 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#include "GlfwOcctWindow.h"
-
-#if defined (__APPLE__)
-  #undef Handle // avoid name collisions in macOS headers
-  #define GLFW_EXPOSE_NATIVE_COCOA
-  #define GLFW_EXPOSE_NATIVE_NSGL
-#elif defined (_WIN32)
-  #define GLFW_EXPOSE_NATIVE_WIN32
-  #define GLFW_EXPOSE_NATIVE_WGL
-#else
-  #define GLFW_EXPOSE_NATIVE_X11
-  #define GLFW_EXPOSE_NATIVE_GLX
-#endif
-#include <GLFW/glfw3.h>
-#include <GLFW/glfw3native.h>
-
-// ================================================================
-// Function : GlfwOcctWindow
-// Purpose  :
-// ================================================================
-GlfwOcctWindow::GlfwOcctWindow (int theWidth, int theHeight, const TCollection_AsciiString& theTitle)
-: myGlfwWindow (glfwCreateWindow (theWidth, theHeight, theTitle.ToCString(), NULL, NULL)),
-  myXLeft  (0),
-  myYTop   (0),
-  myXRight (0),
-  myYBottom(0)
-{
-  if (myGlfwWindow != nullptr)
-  {
-    int aWidth = 0, aHeight = 0;
-    glfwGetWindowPos (myGlfwWindow, &myXLeft, &myYTop);
-    glfwGetWindowSize(myGlfwWindow, &aWidth, &aHeight);
-    myXRight  = myXLeft + aWidth;
-    myYBottom = myYTop + aHeight;
-
-  #if !defined(_WIN32) && !defined(__APPLE__)
-    myDisplay = new Aspect_DisplayConnection (glfwGetX11Display());
-  #endif
-  }
-}
-
-// ================================================================
-// Function : Close
-// Purpose  :
-// ================================================================
-void GlfwOcctWindow::Close()
-{
-  if (myGlfwWindow != nullptr)
-  {
-    glfwDestroyWindow (myGlfwWindow);
-    myGlfwWindow = nullptr;
-  }
-}
-
-// ================================================================
-// Function : NativeHandle
-// Purpose  :
-// ================================================================
-Aspect_Drawable GlfwOcctWindow::NativeHandle() const
-{
-#if defined (__APPLE__)
-  return (Aspect_Drawable)glfwGetCocoaWindow (myGlfwWindow);
-#elif defined (_WIN32)
-  return (Aspect_Drawable)glfwGetWin32Window (myGlfwWindow);
-#else
-  return (Aspect_Drawable)glfwGetX11Window (myGlfwWindow);
-#endif
-}
-
-// ================================================================
-// Function : NativeGlContext
-// Purpose  :
-// ================================================================
-Aspect_RenderingContext GlfwOcctWindow::NativeGlContext() const
-{
-#if defined (__APPLE__)
-  return (NSOpenGLContext*)glfwGetNSGLContext (myGlfwWindow);
-#elif defined (_WIN32)
-  return glfwGetWGLContext (myGlfwWindow);
-#else
-  return glfwGetGLXContext (myGlfwWindow);
-#endif
-}
-
-// ================================================================
-// Function : IsMapped
-// Purpose  :
-// ================================================================
-Standard_Boolean GlfwOcctWindow::IsMapped() const
-{
-  return glfwGetWindowAttrib (myGlfwWindow, GLFW_VISIBLE) != 0;
-}
-
-// ================================================================
-// Function : Map
-// Purpose  :
-// ================================================================
-void GlfwOcctWindow::Map() const
-{
-  glfwShowWindow (myGlfwWindow);
-}
-
-// ================================================================
-// Function : Unmap
-// Purpose  :
-// ================================================================
-void GlfwOcctWindow::Unmap() const
-{
-  glfwHideWindow (myGlfwWindow);
-}
-
-// ================================================================
-// Function : DoResize
-// Purpose  :
-// ================================================================
-Aspect_TypeOfResize GlfwOcctWindow::DoResize() const
-{
-  if (glfwGetWindowAttrib (myGlfwWindow, GLFW_VISIBLE) == 1)
-  {
-    int anXPos = 0, anYPos = 0, aWidth = 0, aHeight = 0;
-    glfwGetWindowPos (myGlfwWindow, &anXPos, &anYPos);
-    glfwGetWindowSize(myGlfwWindow, &aWidth, &aHeight);
-    *const_cast<Standard_Integer*>(&myXLeft  ) = anXPos;
-    *const_cast<Standard_Integer*>(&myXRight ) = anXPos + aWidth;
-    *const_cast<Standard_Integer*>(&myYTop   ) = anYPos;
-    *const_cast<Standard_Integer*>(&myYBottom) = anYPos + aHeight;
-  }
-  return Aspect_TOR_UNKNOWN;
-}
-
-// ================================================================
-// Function : CursorPosition
-// Purpose  :
-// ================================================================
-Graphic3d_Vec2i GlfwOcctWindow::CursorPosition() const
-{
-  Graphic3d_Vec2d aPos;
-  glfwGetCursorPos (myGlfwWindow, &aPos.x(), &aPos.y());
-  return Graphic3d_Vec2i ((int )aPos.x(), (int )aPos.y());
-}

samples/glfw/GlfwOcctWindow.h

@@ -1,115 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#ifndef _GlfwOcctWindow_Header
-#define _GlfwOcctWindow_Header
-
-#include <Aspect_DisplayConnection.hxx>
-#include <Aspect_RenderingContext.hxx>
-#include <Aspect_Window.hxx>
-#include <Graphic3d_Vec.hxx>
-#include <TCollection_AsciiString.hxx>
-
-struct GLFWwindow;
-
-//! GLFWwindow wrapper implementing Aspect_Window interface.
-class GlfwOcctWindow : public Aspect_Window
-{
-  DEFINE_STANDARD_RTTI_INLINE(GlfwOcctWindow, Aspect_Window)
-public:
-  //! Main constructor.
-  GlfwOcctWindow (int theWidth, int theHeight, const TCollection_AsciiString& theTitle);
-
-  //! Close the window.
-  virtual ~GlfwOcctWindow() { Close(); }
-
-  //! Close the window.
-  void Close();
-
-  //! Return X Display connection.
-  const Handle(Aspect_DisplayConnection)& GetDisplay() const { return myDisplay; }
-
-  //! Return GLFW window.
-  GLFWwindow* getGlfwWindow() { return myGlfwWindow; }
-
-  //! Return native OpenGL context.
-  Aspect_RenderingContext NativeGlContext() const;
-
-  //! Return cursor position.
-  Graphic3d_Vec2i CursorPosition() const;
-
-public:
-
-  //! Returns native Window handle
-  virtual Aspect_Drawable NativeHandle() const Standard_OVERRIDE;
-
-  //! Returns parent of native Window handle.
-  virtual Aspect_Drawable NativeParentHandle() const Standard_OVERRIDE { return 0; }
-
-  //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE;
-
-  //! Returns True if the window <me> is opened and False if the window is closed.
-  virtual Standard_Boolean IsMapped() const Standard_OVERRIDE;
-
-  //! Apply the mapping change to the window <me> and returns TRUE if the window is mapped at screen.
-  virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }
-
-  //! Opens the window <me>.
-  virtual void Map() const Standard_OVERRIDE;
-
-  //! Closes the window <me>.
-  virtual void Unmap() const Standard_OVERRIDE;
-
-  virtual void Position (Standard_Integer& theX1, Standard_Integer& theY1,
-                         Standard_Integer& theX2, Standard_Integer& theY2) const Standard_OVERRIDE
-  {
-    theX1 = myXLeft;
-    theX2 = myXRight;
-    theY1 = myYTop;
-    theY2 = myYBottom;
-  }
-
-  //! Returns The Window RATIO equal to the physical WIDTH/HEIGHT dimensions.
-  virtual Standard_Real Ratio() const Standard_OVERRIDE
-  {
-    return Standard_Real (myXRight - myXLeft) / Standard_Real (myYBottom - myYTop);
-  }
-
-  //! Return window size.
-  virtual void Size (Standard_Integer& theWidth, Standard_Integer& theHeight) const Standard_OVERRIDE
-  {
-    theWidth  = myXRight - myXLeft;
-    theHeight = myYBottom - myYTop;
-  }
-
-  virtual Aspect_FBConfig NativeFBConfig() const Standard_OVERRIDE { return NULL; }
-
-protected:
-  Handle(Aspect_DisplayConnection) myDisplay;
-  GLFWwindow*      myGlfwWindow;
-  Standard_Integer myXLeft;
-  Standard_Integer myYTop;
-  Standard_Integer myXRight;
-  Standard_Integer myYBottom;
-};
-
-#endif // _GlfwOcctWindow_Header

samples/glfw/main.cpp

@@ -1,37 +0,0 @@
-// Copyright (c) 2019 OPEN CASCADE SAS
-//
-// This file is part of the examples of the Open CASCADE Technology software library.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-
-#include "GlfwOcctView.h"
-
-int main (int, char**)
-{
-  GlfwOcctView anApp;
-  try
-  {
-    anApp.run();
-  }
-  catch (const std::runtime_error& theError)
-  {
-    std::cerr << theError.what() << std::endl;
-    return EXIT_FAILURE;
-  }
-  return 0;
-}

samples/glfw/readme.md

@@ -1,4 +0,0 @@
-A sample demonstrating usage of OCCT 3D Viewer within a window created using GLFW.
-
-Platforms: Windows, macOS, Linux
-Required: glfw

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

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

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

@@ -17,8 +17,7 @@ void ISession2D_Shape::Add(const TopoDS_Shape& aShape)
   myListOfShape.Append(aShape);
   myAlgo.Nullify();
   myPolyAlgo.Nullify();
-  SetToUpdate();
-  UpdatePresentations();
+  Update(); // protected method used to specify that the presentation are not up to date 
 }
 
 void ISession2D_Shape::Remove (const TopoDS_Shape& theShape)
@@ -43,8 +42,7 @@ void ISession2D_Shape::SetProjector (HLRAlgo_Projector& aProjector)
   myProjector= aProjector;
   myAlgo.Nullify();
   myPolyAlgo.Nullify();
-  SetToUpdate();
-  UpdatePresentations();
+  Update(); // protected method used to specify that the presentation are not up to date 
 };
 
 
@@ -52,8 +50,15 @@ void ISession2D_Shape::SetNbIsos(Standard_Integer& aNbIsos)
 { 
 	myNbIsos= aNbIsos; 
 	myAlgo.Nullify(); 
-  SetToUpdate();
-  UpdatePresentations();
+    
+	// 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 
+
 };
 
 void ISession2D_Shape::BuildAlgo() 

samples/qt/AndroidQt/ReadMe.md

@@ -14,9 +14,9 @@ Requirements for building sample:
 * Android NDK r9d or newer
 * Apache Ant 1.9.4 or higher
 * OCCT compiled under Android platform and placed in directories:
-  * occt/libs/armeabi-v7a/\*.so and occt/inc/\*.hxx (libraries and include files of OCCT install)
-  * android/assets/opencascade/shared/Shaders/\* (Shaders folder of OCCT install: /share/opencascade/resources/Shaders)
-  * 3rdparty/include/freetype2/\*, 3rdparty/include/FreeImage.h and 3rdparty/libs/armeabi-v7a/libFreeImage.so and 3rdparty/libs/armeabi-v7a/libfreetype.so
+  * occt/libs/armeabi-v7a/*.so and occt/inc/*.hxx (libraries and include files of OCCT install)
+  * android/assets/opencascade/shared/Shaders/* (Shaders folder of OCCT install: /share/opencascade/resources/Shaders)
+  * 3rdparty/include/freetype2/*, 3rdparty/include/FreeImage.h and 3rdparty/libs/armeabi-v7a/libFreeImage.so and 3rdparty/libs/armeabi-v7a/libfreetype.so
 
 It is also possible to to correct OCCT.pri file an get resources from another tree of directories.
 

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_30
-blend _model _model 2 _model_32
+blend _model _model 2 _model_31
 
 # Cylinder on wedge
 blend result _model 2 _model_161
@@ -276,7 +276,8 @@ blend result _model 2 _model_161
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vbackground -color 0.784314 0.784314 1
-vdisplay -dispMode 1 result
+vsetcolorbg 200 200 255
+vdisplay result
 vfit
-vaspects result -setFaceBoundaryDraw 1 -mostContinuity c2
+vsetdispmode 1
+vshowfaceboundary result 1

samples/tcl/MBBGehauseRohteil.tcl

@@ -262,7 +262,8 @@ unifysamedom result  p_1
 # Show result
 pload VISUALIZATION
 vinit Driver1/Viewer1/View1
-vbackground -color 0.784314 0.784314 1
-vdisplay -dispMode 1 result
+vsetcolorbg 200 200 255
+vdisplay result
 vfit
-vaspects result -setFaceBoundaryDraw 1
+vsetdispmode 1
+vshowfaceboundary result 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
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 vrenderparams -rayTrace -fsaa on -reflections off -shadows off
 
 # set camera position and adjust lights

samples/tcl/cad.tcl

@@ -57,7 +57,9 @@ bcommon res b9 c2
 # show result
 donly res
 trotate res 0 0 0 0 0 1 90
-vinit View1
-vdisplay -dispMode 1 res
-vaspects res -setFaceBoundaryDraw 1 -setFaceBoundaryColor WHITE -isoontriangulation 1
+vinit
+vdisplay res
+vsetdispmode 1
+vshowfaceboundary res 1 255 255 255
+vaspects -isoontriangulation 1
 vfit

samples/tcl/dimensions.tcl

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

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 -dispMode 1 $aSph $aBox
+    uplevel #0 vdisplay     -noredraw $aSph $aBox
     uplevel #0 vsetmaterial -noredraw $aSph $aBox $aMatIter
     if {$theColor != ""} {
       uplevel #0 vsetcolor  -noredraw $aSph $aBox $theColor
@@ -64,19 +64,21 @@ proc drawObjects {theRow theColor} {
 # setup 3D viewer content
 pload MODELING VISUALIZATION
 
-vclear
-vclose ALL
+catch { vclose View1 }
 vinit View1 w=768 h=768
+vclear
 vtop
 vglinfo
-vbackground -gradient 0.705882 0.784314 1  0.705882 0.705882 0.705882 -gradientMode VERTICAL
+vsetgradientbg 180 200 255 180 180 180 2
 
 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 -dispMode 0 bnd
+vdisplay -noredraw bnd
+vsetdispmode       bnd 0
 vfit
 vremove -noredraw  bnd
 
@@ -86,3 +88,5 @@ 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
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 
 #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
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 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 
-vbackground -color WHITE
+vsetcolorbg 255 255 255
 vtop
 vfit
 

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>
@@ -783,7 +783,6 @@ 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)
   {
@@ -802,6 +801,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
   {
     aPlane = surf2->Plane();
     aSurfType = AIS_KOS_Plane;
+    Offset = 0.;
     Result = Standard_True;
   }
 
@@ -817,6 +817,7 @@ 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;
     }
   }
@@ -825,6 +826,7 @@ 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)
   {
@@ -837,6 +839,7 @@ Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face&            aFace,
         TheType == STANDARD_TYPE(Geom_ToroidalSurface))
       {
         aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface();
+        Offset = 0.0e0;
       }
       else
       {
@@ -896,18 +899,20 @@ gp_Pnt AIS::ProjectPointOnLine( const gp_Pnt & aPoint, const gp_Lin & aLine )
 //function : InitFaceLength
 //purpose  : 
 //=======================================================================
-void AIS::InitFaceLength (const TopoDS_Face& theFace,
-                          gp_Pln& thePlane,
-                          Handle(Geom_Surface)& theSurface,
-                          AIS_KindOfSurface& theSurfaceType,
-                          Standard_Real& theOffset)
+void AIS::InitFaceLength (const TopoDS_Face& aFace,
+                          gp_Pln               & aPlane,
+                          Handle(Geom_Surface) & aSurface,
+                          AIS_KindOfSurface    & aSurfaceType,
+                          Standard_Real        & anOffset)
 {
-  if (AIS::GetPlaneFromFace (theFace, thePlane, theSurface, theSurfaceType, theOffset)
-   && Abs (theOffset) > Precision::Confusion())
+  AIS::GetPlaneFromFace( aFace, aPlane, aSurface, aSurfaceType, anOffset );
+  
+  if (Abs( anOffset ) > Precision::Confusion())
     {
-    theSurface = new Geom_OffsetSurface (theSurface, theOffset);
-    theOffset = 0.0e0;
+      aSurface = new Geom_OffsetSurface( aSurface, anOffset );
+      anOffset = 0.0e0;
     }
+  
 }
 
 //=======================================================================
@@ -1217,7 +1222,7 @@ void AIS::InitLengthBetweenCurvilinearFaces (const TopoDS_Face&    theFirstFace,
     BRepTopAdaptor_FClass2d aClassifier (theSecondFace, Precision::Confusion());
 
     TopAbs_State aState = 
-      aClassifier.Perform (gp_Pnt2d (aPU, aPV), theSecondSurf->IsUPeriodic() || theSecondSurf->IsVPeriodic());
+      aClassifier.Perform (gp_Pnt2d (aPU, aPV), theSecondSurf->IsUPeriodic111() || theSecondSurf->IsVPeriodic111());
 
     if (aState == TopAbs_OUT || aState == TopAbs_UNKNOWN)
     {

src/AIS/AIS.hxx

@@ -17,26 +17,73 @@
 #ifndef _AIS_HeaderFile
 #define _AIS_HeaderFile
 
-#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>
 
-class Bnd_Box;
-class Geom_Curve;
-class Geom_Plane;
-class Geom_Surface;
-class TopoDS_Edge;
-class TopoDS_Face;
+#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;
+
 
 //! 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.

src/AIS/AIS_Animation.cxx

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

src/AIS/AIS_Animation.hxx

@@ -191,7 +191,7 @@ protected:
 
 protected:
 
-  Handle(Media_Timer) myTimer;
+  Handle(AIS_AnimationTimer) 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 (HasOwnDuration() ? theProgress.LocalNormalized : 1.0, aCamera);
+  aCamLerp.Interpolate (theProgress.LocalNormalized, aCamera);
 
   const Standard_Boolean aPrevImmUpdate = myView->SetImmediateUpdate (Standard_False);
   myView->SetCamera (aCamera);

src/AIS/AIS_AnimationCamera.hxx

@@ -33,9 +33,6 @@ 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.cxx

@@ -12,15 +12,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Media_Timer.hxx>
+#include <AIS_AnimationTimer.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(Media_Timer, Standard_Transient)
+IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationTimer, Standard_Transient)
 
 //=============================================================================
 //function : Pause
 //purpose  :
 //=============================================================================
-void Media_Timer::Pause()
+void AIS_AnimationTimer::Pause()
 {
   myTimer.Stop();
   myTimerFrom += myTimer.ElapsedTime() * myTimerSpeed;
@@ -31,7 +31,7 @@ void Media_Timer::Pause()
 //function : Stop
 //purpose  :
 //=============================================================================
-void Media_Timer::Stop()
+void AIS_AnimationTimer::Stop()
 {
   myTimer.Stop();
   myTimer.Reset();
@@ -42,7 +42,7 @@ void Media_Timer::Stop()
 //function : SetPlaybackSpeed
 //purpose  :
 //=============================================================================
-void Media_Timer::SetPlaybackSpeed (const Standard_Real theSpeed)
+void AIS_AnimationTimer::SetPlaybackSpeed (const Standard_Real theSpeed)
 {
   if (!myTimer.IsStarted())
   {
@@ -61,7 +61,7 @@ void Media_Timer::SetPlaybackSpeed (const Standard_Real theSpeed)
 //function : SetPlaybackSpeed
 //purpose  :
 //=============================================================================
-void Media_Timer::Seek (const Standard_Real theTime)
+void AIS_AnimationTimer::Seek (const Standard_Real theTime)
 {
   const Standard_Boolean isStarted = myTimer.IsStarted();
   myTimer.Stop();

src/AIS/AIS_AnimationTimer.hxx

@@ -15,7 +15,60 @@
 #ifndef _AIS_AnimationTimer_HeaderFile
 #define _AIS_AnimationTimer_HeaderFile
 
-#include <Media_Timer.hxx>
-typedef Media_Timer AIS_AnimationTimer;
+#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)
 
 #endif // _AIS_AnimationTimer_HeaderFile

src/AIS/AIS_Axis.cxx

@@ -34,8 +34,10 @@
 #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>
@@ -79,7 +81,7 @@ myIsXYZAxis(Standard_True)
   Standard_Real aLength;
   try {
     aLength = UnitsAPI::AnyToLS(100. ,"mm");
-  } catch (Standard_Failure const&) {
+  } catch (Standard_Failure) {
     aLength = 0.1;
   }
   DA->SetAxisLength(aLength,aLength,aLength);
@@ -197,7 +199,8 @@ 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, 3);
+  Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this);
+  eown -> SelectBasics_EntityOwner::Set(3);
   Handle(Select3D_SensitiveSegment) seg = new Select3D_SensitiveSegment(eown,
 									myPfirst,
 									myPlast);
@@ -218,7 +221,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();
+  
 }
 
 //=======================================================================
@@ -227,6 +230,7 @@ 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();
   
@@ -236,7 +240,6 @@ 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();
 }
 
 
@@ -321,13 +324,14 @@ AcceptDisplayMode(const Standard_Integer aMode) const
 //=======================================================================
 void AIS_Axis::UnsetColor()
 {
+  
   myDrawer->LineAspect()->SetColor(Quantity_NOC_RED);
+
   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
@@ -336,10 +340,10 @@ void AIS_Axis::UnsetColor()
 
 void AIS_Axis::UnsetWidth()
 {
-  myOwnWidth = 0.0f;
+  myOwnWidth = 0.0;
   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

@@ -1,289 +0,0 @@
-// Created on: 2018-12-12
-// Created by: Olga SURYANINOVA
-// Copyright (c) 2018 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <AIS_CameraFrustum.hxx>
-
-#include <AIS_DisplayMode.hxx>
-#include <Graphic3d_ArrayOfTriangles.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Prs3d_LineAspect.hxx>
-#include <Prs3d_ShadingAspect.hxx>
-#include <Select3D_SensitiveGroup.hxx>
-#include <Select3D_SensitivePrimitiveArray.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(AIS_CameraFrustum, AIS_InteractiveObject)
-
-namespace
-{
-  static const Standard_ShortReal THE_DEFAULT_TRANSPARENCY = 0.7f;
-  static const Quantity_Color     THE_DEFAULT_COLOR = Quantity_NOC_WHITE;
-}
-
-//=======================================================================
-//function : Constructor
-//purpose  :
-//=======================================================================
-AIS_CameraFrustum::AIS_CameraFrustum()
-: myPoints (0, Graphic3d_Camera::FrustumVerticesNB)
-{
-  myDrawer->SetLineAspect (new Prs3d_LineAspect (THE_DEFAULT_COLOR, Aspect_TOL_SOLID, 1.0));
-
-  Handle(Prs3d_ShadingAspect) aShadingAspect = new Prs3d_ShadingAspect();
-  aShadingAspect->SetMaterial (Graphic3d_NOM_PLASTIC);
-  aShadingAspect->Aspect()->SetAlphaMode (Graphic3d_AlphaMode_Blend);
-  aShadingAspect->SetTransparency (THE_DEFAULT_TRANSPARENCY);
-  aShadingAspect->SetColor (THE_DEFAULT_COLOR);
-  myDrawer->SetShadingAspect (aShadingAspect);
-
-  myDrawer->SetTransparency (THE_DEFAULT_TRANSPARENCY);
-  SetDisplayMode (AIS_Shaded);
-}
-
-//=======================================================================
-//function : AcceptDisplayMode
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_CameraFrustum::AcceptDisplayMode (const Standard_Integer theMode) const
-{
-  return theMode == AIS_Shaded || theMode == AIS_WireFrame;
-}
-
-//=======================================================================
-//function : SetCameraFrustum
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::SetCameraFrustum (const Handle(Graphic3d_Camera)& theCamera)
-{
-  if (theCamera.IsNull())
-  {
-    return;
-  }
-
-  theCamera->FrustumPoints (myPoints);
-
-  fillTriangles();
-  fillBorders();
-
-  SetToUpdate();
-}
-
-//=======================================================================
-//function : SetColor
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::SetColor (const Quantity_Color& theColor)
-{
-  AIS_InteractiveObject::SetColor (theColor);
-  myDrawer->ShadingAspect()->SetColor (theColor);
-  myDrawer->LineAspect()->SetColor (theColor);
-  SynchronizeAspects();
-}
-
-//=======================================================================
-//function : UnsetColor
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::UnsetColor()
-{
-  if (!HasColor())
-  {
-    return;
-  }
-
-  AIS_InteractiveObject::UnsetColor();
-
-  myDrawer->ShadingAspect()->SetColor (THE_DEFAULT_COLOR);
-  myDrawer->LineAspect()->SetColor (THE_DEFAULT_COLOR);
-  SynchronizeAspects();
-}
-
-//=======================================================================
-//function : UnsetColor
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::UnsetTransparency()
-{
-  myDrawer->ShadingAspect()->SetTransparency (0.0f);
-  myDrawer->SetTransparency (0.0f);
-  SynchronizeAspects();
-}
-
-//=======================================================================
-//function : fillTriangles
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::fillTriangles()
-{
-  if (myTriangles.IsNull())
-  {
-    const Standard_Integer aPlaneTriangleVertsNb = 2 * 3;
-    const Standard_Integer aPlanesNb             = 3 * 2;
-
-    myTriangles = new Graphic3d_ArrayOfTriangles (Graphic3d_Camera::FrustumVerticesNB, aPlaneTriangleVertsNb * aPlanesNb);
-    myTriangles->SetVertice (Graphic3d_Camera::FrustumVerticesNB, gp_Pnt (0.0, 0.0, 0.0));
-
-    // Triangles go in order (clockwise vertices traversing for correct normal):
-    // (0, 2, 1), (3, 1, 2)
-    const Standard_Integer aLookup1_clockwise[]     = { 0, 1, 0, 1, 0, 1 };
-    const Standard_Integer aLookup2_clockwise[]     = { 0, 0, 1, 1, 1, 0 };
-    // Triangles go in order (counterclockwise vertices traversing for correct normal):
-    // (1, 2, 0), (2, 1, 3)
-    const Standard_Integer aLookup1_anticlockwise[] = { 0, 1, 0, 1, 0, 1 };
-    const Standard_Integer aLookup2_anticlockwise[] = { 1, 0, 0, 0, 1, 1 };
-    Standard_Integer aShifts[]        = { 0, 0, 0 };
-
-    // Planes go in order:
-    // LEFT, RIGHT, BOTTOM, TOP, NEAR, FAR
-    for (Standard_Integer aFaceIdx = 0; aFaceIdx < 3; ++aFaceIdx)
-    {
-      for (Standard_Integer i = 0; i < 2; ++i)
-      {
-        for (Standard_Integer aPntIter = 0; aPntIter < aPlaneTriangleVertsNb; ++aPntIter)
-        {
-          aShifts[aFaceIdx] = i;
-          if (i == 0)
-          {
-            aShifts[(aFaceIdx + 1) % 3] = aLookup1_clockwise[aPntIter];
-            aShifts[(aFaceIdx + 2) % 3] = aLookup2_clockwise[aPntIter];
-          }
-          else
-          {
-            aShifts[(aFaceIdx + 1) % 3] = aLookup1_anticlockwise[aPntIter];
-            aShifts[(aFaceIdx + 2) % 3] = aLookup2_anticlockwise[aPntIter];
-          }
-
-          Standard_Integer anIndex = aShifts[0] * 2 * 2 + aShifts[1] * 2 + aShifts[2];
-          myTriangles->AddEdge (anIndex + 1);
-        }
-      }
-    }
-  }
-
-  for (Standard_Integer aPointIter = 0; aPointIter < Graphic3d_Camera::FrustumVerticesNB; ++aPointIter)
-  {
-    const Graphic3d_Vec3d aPnt = myPoints[aPointIter];
-    myTriangles->SetVertice (aPointIter + 1, gp_Pnt (aPnt.x(), aPnt.y(), aPnt.z()));
-  }
-}
-
-//=======================================================================
-//function : fillBorders
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::fillBorders()
-{
-  if (myBorders.IsNull())
-  {
-    const Standard_Integer aPlaneSegmVertsNb = 2 * 4;
-    const Standard_Integer aPlanesNb         = 3 * 2;
-    myBorders = new Graphic3d_ArrayOfSegments (Graphic3d_Camera::FrustumVerticesNB, aPlaneSegmVertsNb * aPlanesNb);
-    myBorders->SetVertice (Graphic3d_Camera::FrustumVerticesNB, gp_Pnt (0.0, 0.0, 0.0));
-
-    // Segments go in order:
-    // (0, 2), (2, 3), (3, 1), (1, 0)
-    const Standard_Integer aLookup1[] = { 0, 1, 1, 1, 1, 0, 0, 0 };
-    const Standard_Integer aLookup2[] = { 0, 0, 0, 1, 1, 1, 1, 0 };
-    Standard_Integer aShifts[] = { 0, 0, 0 };
-
-    // Planes go in order:
-    // LEFT, RIGHT, BOTTOM, TOP, NEAR, FAR
-    for (Standard_Integer aFaceIdx = 0; aFaceIdx < 3; ++aFaceIdx)
-    {
-      for (Standard_Integer i = 0; i < 2; ++i)
-      {
-        for (Standard_Integer aSegmVertIter = 0; aSegmVertIter < aPlaneSegmVertsNb; ++aSegmVertIter)
-        {
-          aShifts[aFaceIdx] = i;
-          aShifts[(aFaceIdx + 1) % 3] = aLookup1[aSegmVertIter];
-          aShifts[(aFaceIdx + 2) % 3] = aLookup2[aSegmVertIter];
-
-          Standard_Integer anIndex = aShifts[0] * 2 * 2 + aShifts[1] * 2 + aShifts[2];
-          myBorders->AddEdge (anIndex + 1);
-        }
-      }
-    }
-  }
-
-  for (Standard_Integer aPointIter = 0; aPointIter < Graphic3d_Camera::FrustumVerticesNB; ++aPointIter)
-  {
-    const Graphic3d_Vec3d aPnt = myPoints[aPointIter];
-    myBorders->SetVertice (aPointIter + 1, gp_Pnt (aPnt.x(), aPnt.y(), aPnt.z()));
-  }
-}
-
-//=======================================================================
-//function : Compute
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
-                                 const Handle(Prs3d_Presentation)&           thePrs,
-                                 const Standard_Integer                      theMode)
-{
-  thePrs->SetInfiniteState (true);
-  if (myTriangles.IsNull())
-  {
-    return;
-  }
-
-  switch (theMode)
-  {
-    case AIS_Shaded:
-    {
-      Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-      aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
-      aGroup->AddPrimitiveArray (myTriangles);
-    }
-    Standard_FALLTHROUGH
-    case AIS_WireFrame:
-    {
-      Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-      aGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect());
-      aGroup->AddPrimitiveArray (myBorders);
-      break;
-    }
-  }
-}
-
-//=======================================================================
-//function : ComputeSelection
-//purpose  :
-//=======================================================================
-void AIS_CameraFrustum::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                          const Standard_Integer             theMode)
-{
-  Handle(SelectMgr_EntityOwner) anOwner = new SelectMgr_EntityOwner (this);
-  switch (theMode)
-  {
-    case SelectionMode_Edges:
-    {
-      Handle(Select3D_SensitiveGroup) aSensitiveEntity = new Select3D_SensitiveGroup (anOwner);
-      for (Standard_Integer anIter = 1; anIter <= myBorders->EdgeNumber(); anIter += 2)
-      {
-        aSensitiveEntity->Add (new Select3D_SensitiveSegment (anOwner, myBorders->Vertice (myBorders->Edge (anIter)), myBorders->Vertice(myBorders->Edge (anIter + 1))));
-      }
-      theSelection->Add (aSensitiveEntity);
-      break;
-    }
-    case SelectionMode_Volume:
-    {
-      Handle(Select3D_SensitivePrimitiveArray) aSelArray = new Select3D_SensitivePrimitiveArray (anOwner);
-      aSelArray->InitTriangulation (myTriangles->Attributes(), myTriangles->Indices(), TopLoc_Location());
-      theSelection->Add (aSelArray);
-      break;
-    }
-  }
-}

src/AIS/AIS_CameraFrustum.hxx

@@ -1,85 +0,0 @@
-// Created on: 2018-12-12
-// Created by: Olga SURYANINOVA
-// Copyright (c) 2018 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_CameraFrustum_HeaderFile
-#define _AIS_CameraFrustum_HeaderFile
-
-#include <AIS_InteractiveObject.hxx>
-
-class Graphic3d_ArrayOfSegments;
-class Graphic3d_ArrayOfTriangles;
-
-//! Presentation for drawing camera frustum.
-//! Default configuration is built with filling and some transparency.
-class AIS_CameraFrustum : public AIS_InteractiveObject
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_CameraFrustum, AIS_InteractiveObject)
-public:
-
-  //! Selection modes supported by this object
-  enum SelectionMode
-  {
-    SelectionMode_Edges  = 0, //!< detect by edges (default)
-    SelectionMode_Volume = 1, //!< detect by volume
-  };
-
-public:
-
-  //! Constructs camera frustum with default configuration.
-  Standard_EXPORT AIS_CameraFrustum();
-
-  //! Sets camera frustum.
-  Standard_EXPORT void SetCameraFrustum (const Handle(Graphic3d_Camera)& theCamera);
-
-  //! Setup custom color.
-  Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE;
-
-  //! Restore default color.
-  Standard_EXPORT virtual void UnsetColor() Standard_OVERRIDE;
-
-  //! Restore transparency setting.
-  Standard_EXPORT virtual void UnsetTransparency() Standard_OVERRIDE;
-
-  //! Return true if specified display mode is supported.
-  Standard_EXPORT virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE;
-
-protected:
-
-  //! Computes presentation of camera frustum.
-  Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
-                                        const Handle(Prs3d_Presentation)&           thePrs,
-                                        const Standard_Integer                      theMode) Standard_OVERRIDE;
-
-  //! Compute selection.
-  Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                                 const Standard_Integer             theMode) Standard_OVERRIDE;
-
-private:
-
-  //! Fills triangles primitive array for camera frustum filling.
-  void fillTriangles();
-
-  //! Fills polylines primitive array for camera frustum borders.
-  void fillBorders();
-
-protected:
-
-  NCollection_Array1<Graphic3d_Vec3d> myPoints;    //!< Array of points
-  Handle(Graphic3d_ArrayOfTriangles)  myTriangles; //!< Triangles for camera frustum filling
-  Handle(Graphic3d_ArrayOfSegments)   myBorders;   //!< Segments for camera frustum borders
-
-};
-
-#endif // _AIS_CameraFrustum_HeaderFile

src/AIS/AIS_Chamf2dDimension.hxx

@@ -17,13 +17,29 @@
 #ifndef _AIS_Chamf2dDimension_HeaderFile
 #define _AIS_Chamf2dDimension_HeaderFile
 
-#include <AIS_KindOfDimension.hxx>
-#include <AIS_Relation.hxx>
-#include <DsgPrs_ArrowSide.hxx>
+#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 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.
@@ -32,9 +48,10 @@ 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.
@@ -62,8 +79,19 @@ 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;
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -73,8 +101,14 @@ private:
   gp_Pnt myPntAttach;
   gp_Dir myDir;
 
+
 };
 
+
 #include <AIS_Chamf2dDimension.lxx>
 
+
+
+
+
 #endif // _AIS_Chamf2dDimension_HeaderFile

src/AIS/AIS_Chamf3dDimension.hxx

@@ -17,11 +17,28 @@
 #ifndef _AIS_Chamf3dDimension_HeaderFile
 #define _AIS_Chamf3dDimension_HeaderFile
 
-#include <AIS_KindOfDimension.hxx>
-#include <AIS_Relation.hxx>
-#include <DsgPrs_ArrowSide.hxx>
-#include <gp_Dir.hxx>
+#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;
+
+
+class AIS_Chamf3dDimension;
 DEFINE_STANDARD_HANDLE(AIS_Chamf3dDimension, AIS_Relation)
 
 //! A framework to define display of 3D chamfers.
@@ -30,9 +47,10 @@ 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.
@@ -60,8 +78,19 @@ 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;
@@ -71,8 +100,14 @@ private:
   gp_Pnt myPntAttach;
   gp_Dir myDir;
 
+
 };
 
+
 #include <AIS_Chamf3dDimension.lxx>
 
+
+
+
+
 #endif // _AIS_Chamf3dDimension_HeaderFile

src/AIS/AIS_Circle.cxx

@@ -112,29 +112,6 @@ 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  : 
@@ -145,41 +122,34 @@ void AIS_Circle::SetColor(const Quantity_Color &aCol)
   hasOwnColor=Standard_True;
   myDrawer->SetColor (aCol);
 
-  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));
-  }
+
+  if (!myDrawer->HasOwnLineAspect ())
+    myDrawer->SetLineAspect (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 = (Standard_ShortReal )aValue;
+  myOwnWidth=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);
-    replaceWithNewLineAspect (new Prs3d_LineAspect (CC, Aspect_TOL_SOLID, aValue));
-  }
-  else
-  {
+    myDrawer->SetLineAspect (new Prs3d_LineAspect(CC,Aspect_TOL_SOLID,aValue));
+  } else
     myDrawer->LineAspect()->SetWidth(aValue);
-    SynchronizeAspects();
-  }
 }
 
 
@@ -191,18 +161,15 @@ void AIS_Circle::UnsetColor()
 {
   hasOwnColor = Standard_False;
 
-  if (!HasWidth())
-  {
-    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
-  }
-  else
-  {
+  Handle(Prs3d_LineAspect) NullAsp;
+
+  if (!HasWidth()) myDrawer->SetLineAspect(NullAsp);
+  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();
   }
 }
 
@@ -212,13 +179,11 @@ void AIS_Circle::UnsetColor()
 //=======================================================================
 void AIS_Circle::UnsetWidth()
 {
-  if (!HasColor())
-  {
-    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
-  }
-  else
-  {
-   Standard_ShortReal WW = myDrawer->HasLink() ? (Standard_ShortReal )AIS_GraphicTool::GetLineWidth(myDrawer->Link(),AIS_TOA_Line) : 1.0f;
+  Handle(Prs3d_LineAspect) NullAsp;
+
+  if (!HasColor()) myDrawer->SetLineAspect(NullAsp);
+  else{
+   Standard_Real WW = myDrawer->HasLink() ? AIS_GraphicTool::GetLineWidth(myDrawer->Link(),AIS_TOA_Line) : 1.;
    myDrawer->LineAspect()->SetWidth(WW);
    myOwnWidth = WW;
   }

src/AIS/AIS_Circle.hxx

@@ -115,9 +115,6 @@ 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

@@ -107,10 +107,6 @@ AIS_ColorScale::AIS_ColorScale()
   myTextHeight (20)
 {
   SetDisplayMode (0);
-  myDrawer->SetupOwnShadingAspect();
-  myDrawer->ShadingAspect()->Aspect()->SetShadingModel (Graphic3d_TOSM_UNLIT);
-  myDrawer->ShadingAspect()->Aspect()->SetAlphaMode (Graphic3d_AlphaMode_Opaque);
-  myDrawer->ShadingAspect()->Aspect()->SetInteriorColor (Quantity_NOC_WHITE);
 }
 
 //=======================================================================
@@ -462,6 +458,15 @@ void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
   const Standard_Integer aBarTop     = myYPos + myHeight - aTitleOffset - aBarYOffset;
   const Standard_Integer aBarHeight  = aBarTop - aBarBottom;
 
+  // draw title
+  if (!myTitle.IsEmpty())
+  {
+    drawText (Prs3d_Root::CurrentGroup (thePrs), myTitle,
+              myXPos + mySpacing,
+              aBarTop + aBarYOffset,
+              Graphic3d_VTA_BOTTOM);
+  }
+
   TColStd_SequenceOfExtendedString aLabels;
   if (myLabelType == Aspect_TOCSD_USER)
   {
@@ -491,27 +496,11 @@ void AIS_ColorScale::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
     aColorBreadth += aTextWidth;
   }
 
-  // draw title
-  Handle(Graphic3d_Group) aLabelsGroup;
-  if (!myTitle.IsEmpty()
-   || !aLabels.IsEmpty())
-  {
-    aLabelsGroup = thePrs->NewGroup();
-    aLabelsGroup->SetGroupPrimitivesAspect (myDrawer->TextAspect()->Aspect());
-  }
-  if (!myTitle.IsEmpty())
-  {
-    drawText (aLabelsGroup, myTitle,
-              myXPos + mySpacing,
-              aBarTop + aBarYOffset,
-              Graphic3d_VTA_BOTTOM);
-  }
-
   // draw colors
   drawColorBar (thePrs, aBarBottom, aBarHeight, aTextWidth, aColorBreadth);
 
   // draw Labels
-  drawLabels (aLabelsGroup, aLabels, aBarBottom, aBarHeight, aTextWidth, aColorBreadth);
+  drawLabels (thePrs, aLabels, aBarBottom, aBarHeight, aTextWidth, aColorBreadth);
 }
 
 //=======================================================================
@@ -638,8 +627,7 @@ void AIS_ColorScale::drawColorBar (const Handle(Prs3d_Presentation)& thePrs,
     }
   }
 
-  Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-  aGroup->SetGroupPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup (thePrs);
   aGroup->AddPrimitiveArray (aTriangles);
 
   const Quantity_Color aFgColor (hasOwnColor ? myDrawer->Color() : Quantity_NOC_WHITE);
@@ -654,7 +642,7 @@ void AIS_ColorScale::drawColorBar (const Handle(Prs3d_Presentation)& thePrs,
 //function : drawLabels
 //purpose  :
 //=======================================================================
-void AIS_ColorScale::drawLabels (const Handle(Graphic3d_Group)& theGroup,
+void AIS_ColorScale::drawLabels (const Handle(Prs3d_Presentation)& thePrs,
                                  const TColStd_SequenceOfExtendedString& theLabels,
                                  const Standard_Integer theBarBottom,
                                  const Standard_Integer theBarHeight,
@@ -728,14 +716,14 @@ void AIS_ColorScale::drawLabels (const Handle(Graphic3d_Group)& theGroup,
     Standard_Integer aPos2 = aNbLabels - 1 - i2;
     if (aFilter && !(aPos1 % aFilter))
     {
-      drawText (theGroup, theLabels.Value (i1 + 1),
+      drawText (Prs3d_Root::CurrentGroup (thePrs), theLabels.Value (i1 + 1),
                 anXLeft, anYBottom + Standard_Integer(i1 * aStepY + anAscent),
                 Graphic3d_VTA_CENTER);
       aLast1 = i1;
     }
     if (aFilter && !(aPos2 % aFilter))
     {
-      drawText (theGroup, theLabels.Value (i2 + 1),
+      drawText (Prs3d_Root::CurrentGroup (thePrs), theLabels.Value (i2 + 1),
                 anXLeft, anYBottom + Standard_Integer(i2 * aStepY + anAscent),
                 Graphic3d_VTA_CENTER);
       aLast2 = i2;
@@ -758,7 +746,7 @@ void AIS_ColorScale::drawLabels (const Handle(Graphic3d_Group)& theGroup,
 
   if (i0 != -1)
   {
-    drawText (theGroup, theLabels.Value (i0 + 1),
+    drawText (Prs3d_Root::CurrentGroup (thePrs), theLabels.Value (i0 + 1),
               anXLeft, anYBottom + Standard_Integer(i0 * aStepY + anAscent),
               Graphic3d_VTA_CENTER);
   }
@@ -781,8 +769,8 @@ void AIS_ColorScale::drawFrame (const Handle(Prs3d_Presentation)& thePrs,
   aPrim->AddVertex (theX,            theY, 0.0);
 
   Handle(Graphic3d_AspectLine3d) anAspect = new Graphic3d_AspectLine3d (theColor, Aspect_TOL_SOLID, 1.0);
-  Handle(Graphic3d_Group) aGroup = thePrs->NewGroup();
-  aGroup->SetGroupPrimitivesAspect (anAspect);
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup (thePrs);
+  aGroup->SetPrimitivesAspect (anAspect);
   aGroup->AddPrimitiveArray (aPrim);
 }
 
@@ -796,6 +784,7 @@ void AIS_ColorScale::drawText (const Handle(Graphic3d_Group)& theGroup,
                                const Graphic3d_VerticalTextAlignment theVertAlignment)
 {
   const Handle(Prs3d_TextAspect)& anAspect = myDrawer->TextAspect();
+  theGroup->SetPrimitivesAspect (anAspect->Aspect());
   theGroup->Text (theText,
                   gp_Ax2 (gp_Pnt (theX, theY, 0.0), gp::DZ()),
                   anAspect->Height(),

src/AIS/AIS_ColorScale.hxx

@@ -406,7 +406,7 @@ private:
   Standard_Integer computeMaxLabelWidth (const TColStd_SequenceOfExtendedString& theLabels) const;
 
   //! Draw labels.
-  void drawLabels (const Handle(Graphic3d_Group)& theGroup,
+  void drawLabels (const Handle(Prs3d_Presentation)& thePrs,
                    const TColStd_SequenceOfExtendedString& theLabels,
                    const Standard_Integer theBarBottom,
                    const Standard_Integer theBarHeight,

src/AIS/AIS_ColoredDrawer.hxx

@@ -27,7 +27,6 @@ public:
   AIS_ColoredDrawer (const Handle(Prs3d_Drawer)& theLink)
   : myIsHidden    (false),
     myHasOwnColor (false),
-    myHasOwnTransp(false),
     myHasOwnWidth (false)
   {
     Link (theLink);
@@ -35,15 +34,9 @@ public:
 
   bool IsHidden() const                                 { return myIsHidden;     }
   void SetHidden (const bool theToHide)                 { myIsHidden = theToHide;}
-
   bool HasOwnColor() const                              { return myHasOwnColor;  }
   void UnsetOwnColor()                                  { myHasOwnColor = false; }
   void SetOwnColor (const Quantity_Color& /*theColor*/) { myHasOwnColor = true;  }
-
-  bool HasOwnTransparency() const                       { return myHasOwnTransp;  }
-  void UnsetOwnTransparency()                           { myHasOwnTransp = false; }
-  void SetOwnTransparency (Standard_Real /*theTransp*/) { myHasOwnTransp = true;  }
-
   bool HasOwnWidth() const                              { return myHasOwnWidth;  }
   void UnsetOwnWidth()                                  { myHasOwnWidth = false; }
   void SetOwnWidth (const Standard_Real /*theWidth*/)   { myHasOwnWidth = true;  }
@@ -52,7 +45,6 @@ public:  //! @name list of overridden properties
 
   bool myIsHidden;
   bool myHasOwnColor;
-  bool myHasOwnTransp;
   bool myHasOwnWidth;
 
 };

src/AIS/AIS_ColoredShape.cxx

@@ -124,7 +124,8 @@ Handle(AIS_ColoredDrawer) AIS_ColoredShape::CustomAspects (const TopoDS_Shape& t
   {
     aDrawer = new AIS_ColoredDrawer (myDrawer);
     myShapeColors.Bind (theShape, aDrawer);
-    SetToUpdate();
+    LoadRecomputable (AIS_WireFrame);
+    LoadRecomputable (AIS_Shaded);
   }
   return aDrawer;
 }
@@ -140,7 +141,8 @@ void AIS_ColoredShape::ClearCustomAspects()
     return;
   }
   myShapeColors.Clear();
-  SetToUpdate();
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
 }
 
 //=======================================================================
@@ -155,7 +157,8 @@ void AIS_ColoredShape::UnsetCustomAspects (const TopoDS_Shape&    theShape,
     return;
   }
 
-  SetToUpdate();
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
   if (theToUnregister)
   {
     myShapeColors.UnBind (theShape);
@@ -180,23 +183,8 @@ void AIS_ColoredShape::SetCustomColor (const TopoDS_Shape&   theShape,
   const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
   setColor (aDrawer, theColor);
   aDrawer->SetOwnColor (theColor);
-}
-
-//=======================================================================
-//function : SetCustomTransparency
-//purpose  :
-//=======================================================================
-void AIS_ColoredShape::SetCustomTransparency (const TopoDS_Shape& theShape,
-                                              Standard_Real theTransparency)
-{
-  if (theShape.IsNull())
-  {
-    return;
-  }
-
-  const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
-  setTransparency (aDrawer, theTransparency);
-  aDrawer->SetOwnTransparency (theTransparency);
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
 }
 
 //=======================================================================
@@ -212,8 +200,10 @@ void AIS_ColoredShape::SetCustomWidth (const TopoDS_Shape& theShape,
   }
 
   const Handle(AIS_ColoredDrawer)& aDrawer = CustomAspects (theShape);
-  setWidth (aDrawer, theLineWidth);
+  setWidth (CustomAspects (theShape), theLineWidth);
   aDrawer->SetOwnWidth (theLineWidth);
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
 }
 
 //=======================================================================
@@ -223,6 +213,11 @@ void AIS_ColoredShape::SetCustomWidth (const TopoDS_Shape& theShape,
 
 void AIS_ColoredShape::SetColor (const Quantity_Color&  theColor)
 {
+  setColor (myDrawer, theColor);
+  myDrawer->SetColor (theColor);
+  hasOwnColor = Standard_True;
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
   for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
   {
     const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
@@ -248,7 +243,6 @@ void AIS_ColoredShape::SetColor (const Quantity_Color&  theColor)
       aDrawer->FaceBoundaryAspect()->SetColor (theColor);
     }
   }
-  AIS_Shape::SetColor (theColor);
 }
 
 //=======================================================================
@@ -258,6 +252,10 @@ void AIS_ColoredShape::SetColor (const Quantity_Color&  theColor)
 
 void AIS_ColoredShape::SetWidth (const Standard_Real    theLineWidth)
 {
+  setWidth (myDrawer, theLineWidth);
+  myOwnWidth = theLineWidth;
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
   for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
   {
     const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
@@ -279,16 +277,6 @@ void AIS_ColoredShape::SetWidth (const Standard_Real    theLineWidth)
       aDrawer->FaceBoundaryAspect()->SetWidth (theLineWidth);
     }
   }
-  AIS_Shape::SetWidth (theLineWidth);
-}
-
-//=======================================================================
-//function : UnsetWidth
-//purpose  :
-//=======================================================================
-void AIS_ColoredShape::UnsetWidth()
-{
-  SetWidth (1.0f);
 }
 
 //=======================================================================
@@ -298,20 +286,18 @@ void AIS_ColoredShape::UnsetWidth()
 
 void AIS_ColoredShape::SetTransparency (const Standard_Real theValue)
 {
+  setTransparency (myDrawer, theValue);
+  myDrawer->SetTransparency ((Standard_ShortReal )theValue);
+  LoadRecomputable (AIS_WireFrame);
+  LoadRecomputable (AIS_Shaded);
   for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
   {
-    const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
-    if (aDrawer->HasOwnTransparency())
-    {
-      continue;
-    }
-
+    const Handle(Prs3d_Drawer)& aDrawer = anIter.Value();
     if (aDrawer->HasOwnShadingAspect())
     {
       aDrawer->ShadingAspect()->SetTransparency (theValue, myCurrentFacingModel);
     }
   }
-  AIS_Shape::SetTransparency (theValue);
 }
 
 //=======================================================================
@@ -320,7 +306,27 @@ void AIS_ColoredShape::SetTransparency (const Standard_Real theValue)
 //=======================================================================
 void AIS_ColoredShape::UnsetTransparency()
 {
-  SetTransparency (0.0f);
+  myDrawer->SetTransparency (0.0f);
+  if (myDrawer->HasOwnShadingAspect())
+  {
+    myDrawer->ShadingAspect()->SetTransparency (0.0, myCurrentFacingModel);
+    if (!HasColor()
+     && !HasMaterial()
+     && !myDrawer->ShadingAspect()->Aspect()->ToMapTexture())
+    {
+      myDrawer->SetShadingAspect (Handle(Prs3d_ShadingAspect)());
+    }
+  }
+
+  for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
+  {
+    const Handle(Prs3d_Drawer)& aDrawer = anIter.Value();
+    if (aDrawer->HasOwnShadingAspect())
+    {
+      aDrawer->ShadingAspect()->SetTransparency (0.0, myCurrentFacingModel);
+    }
+  }
+  SynchronizeAspects();
 }
 
 //=======================================================================
@@ -330,16 +336,19 @@ void AIS_ColoredShape::UnsetTransparency()
 
 void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
 {
+  setMaterial (myDrawer, theMaterial, HasColor(), IsTransparent());
+  //myOwnMaterial = theMaterial;
+  hasOwnMaterial = Standard_True;
+  LoadRecomputable (AIS_Shaded);
   for (AIS_DataMapOfShapeDrawer::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
   {
     const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
     //if (aDrawer->HasOwnMaterial()) continue;
     if (aDrawer->HasOwnShadingAspect())
     {
-      setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), aDrawer->HasOwnTransparency());
+      setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), Standard_False); // aDrawer->IsTransparent()
     }
   }
-  AIS_Shape::SetMaterial (theMaterial);
 }
 
 //=======================================================================
@@ -512,8 +521,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())
   {
-    const Handle(SelectMgr_EntityOwner)& anOwner = aSelEntIter.Value()->BaseSensitive()->OwnerId();
-    anOwner->SetSelectable (aThis);
+    Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast (aSelEntIter.Value()->BaseSensitive()->OwnerId());
+    anOwner->Set (aThis);
   }
 
   StdSelect_BRepSelectionTool::PreBuildBVH (theSelection);
@@ -577,7 +586,7 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
                                                  const DataMapOfDrawerCompd& theDrawerClosedFaces,
                                                  const Standard_Integer theMode)
 {
-  Handle(Graphic3d_Group) anOpenGroup, aClosedGroup, anEdgesGroup;
+  Handle(Graphic3d_Group) anOpenGroup, aClosedGroup;
   for (size_t aShType = 0; aShType <= (size_t )TopAbs_SHAPE; ++aShType)
   {
     const Standard_Boolean isClosed = aShType == TopAbs_SHAPE;
@@ -631,7 +640,7 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
         {
           if (aShadedGroup.IsNull())
           {
-            aShadedGroup = thePrs->NewGroup();
+            aShadedGroup = Prs3d_Root::NewGroup (thePrs);
             aShadedGroup->SetClosed (isClosed);
           }
           aShadedGroup->SetPrimitivesAspect (aDrawer->ShadingAspect()->Aspect());
@@ -640,15 +649,18 @@ void AIS_ColoredShape::addShapesWithCustomProps (const Handle(Prs3d_Presentation
 
         if (aDrawer->FaceBoundaryDraw())
         {
-          if (Handle(Graphic3d_ArrayOfSegments) aBndSegments = StdPrs_ShadedShape::FillFaceBoundaries (aShapeDraw, aDrawer->FaceBoundaryUpperContinuity()))
+          Handle(Graphic3d_ArrayOfSegments) aBndSegments = StdPrs_ShadedShape::FillFaceBoundaries (aShapeDraw);
+          if (!aBndSegments.IsNull())
           {
-            if (anEdgesGroup.IsNull())
+            if (aShadedGroup.IsNull())
             {
-              anEdgesGroup = thePrs->NewGroup();
+              aShadedGroup = Prs3d_Root::NewGroup (thePrs);
+              aShadedGroup->SetClosed (isClosed);
             }
 
-            anEdgesGroup->SetPrimitivesAspect (aDrawer->FaceBoundaryAspect()->Aspect());
-            anEdgesGroup->AddPrimitiveArray (aBndSegments);
+            Handle(Graphic3d_AspectLine3d) aBoundaryAspect = aDrawer->FaceBoundaryAspect()->Aspect();
+            aShadedGroup->SetPrimitivesAspect (aBoundaryAspect);
+            aShadedGroup->AddPrimitiveArray (aBndSegments);
           }
         }
       }
@@ -703,29 +715,13 @@ Standard_Boolean AIS_ColoredShape::dispatchColors (const Handle(AIS_ColoredDrawe
       {
         const TopoDS_Shape& aFace = aFaceIter.Value();
         Handle(AIS_ColoredDrawer) aFaceDrawer;
-        if (aFace.ShapeType() != TopAbs_FACE
-        || !theShapeDrawerMap.Find (aFace, aFaceDrawer))
-        {
-          continue;
-        }
-
-        if (aFaceDrawer->IsHidden())
+        if (aFace.ShapeType() == TopAbs_FACE
+         && theShapeDrawerMap.Find (aFace, aFaceDrawer)
+         && aFaceDrawer->IsHidden())
         {
           isClosedShell = Standard_False;
           break;
         }
-        else if (aFaceDrawer->HasOwnShadingAspect()
-              && aFaceDrawer->ShadingAspect()->Aspect()->AlphaMode() != Graphic3d_AlphaMode_Opaque)
-        {
-          if (aFaceDrawer->ShadingAspect()->Aspect()->AlphaMode() != Graphic3d_AlphaMode_BlendAuto
-           || aFaceDrawer->ShadingAspect()->Aspect()->FrontMaterial().Alpha() < 1.0f
-           || (aFaceDrawer->ShadingAspect()->Aspect()->Distinguish()
-            && aFaceDrawer->ShadingAspect()->Aspect()->BackMaterial().Alpha()  < 1.0f))
-          {
-            isClosedShell = Standard_False;
-            break;
-          }
-        }
       }
     }
 

src/AIS/AIS_ColoredShape.hxx

@@ -56,10 +56,6 @@ public: //! @name sub-shape aspects
   Standard_EXPORT void SetCustomColor (const TopoDS_Shape&   theShape,
                                        const Quantity_Color& theColor);
 
-  //! Customize transparency of specified sub-shape
-  Standard_EXPORT void SetCustomTransparency (const TopoDS_Shape& theShape,
-                                              Standard_Real theTransparency);
-
   //! Customize line width of specified sub-shape
   Standard_EXPORT void SetCustomWidth (const TopoDS_Shape& theShape,
                                        const Standard_Real theLineWidth);
@@ -81,16 +77,11 @@ public: //! @name global aspects
   //! Sets transparency value.
   Standard_EXPORT virtual void SetTransparency (const Standard_Real theValue) Standard_OVERRIDE;
 
-  //! Sets the material aspect.
-  Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE;
-
-public:
-
   //! Removes the setting for transparency in the reconstructed compound shape.
   Standard_EXPORT virtual void UnsetTransparency() Standard_OVERRIDE;
 
-  //! Setup line width of entire shape.
-  Standard_EXPORT virtual void UnsetWidth() Standard_OVERRIDE;
+  //! Sets the material aspect.
+  Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE;
 
 protected: //! @name override presentation computation
 

src/AIS/AIS_ConcentricRelation.hxx

@@ -17,11 +17,24 @@
 #ifndef _AIS_ConcentricRelation_HeaderFile
 #define _AIS_ConcentricRelation_HeaderFile
 
-#include <AIS_Relation.hxx>
+#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;
 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
@@ -31,9 +44,10 @@ 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
@@ -51,8 +65,19 @@ 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;
@@ -70,6 +95,13 @@ private:
   gp_Dir myDir;
   gp_Pnt myPnt;
 
+
 };
 
+
+
+
+
+
+
 #endif // _AIS_ConcentricRelation_HeaderFile

src/AIS/AIS_ConnectedInteractive.cxx

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

src/AIS/AIS_Dimension.cxx

@@ -335,9 +335,10 @@ TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidt
   if (myDrawer->DimensionAspect()->IsText3d())
   {
     // text width produced by BRepFont
-    Font_BRepFont aFont;
-    if (aFont.FindAndInit (aTextAspect->Aspect()->Font(), aTextAspect->Aspect()->GetTextFontAspect(), aTextAspect->Height(), Font_StrictLevel_Any))
-    {
+    Font_BRepFont aFont (aTextAspect->Aspect()->Font().ToCString(),
+                         aTextAspect->Aspect()->GetTextFontAspect(),
+                         aTextAspect->Height());
+
     for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
     {
       Standard_Utf32Char aCurrChar = *anIter;
@@ -345,15 +346,15 @@ TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidt
       theWidth += aFont.AdvanceX (aCurrChar, aNextChar);
     }
   }
-  }
   else
   {
     // Text width for 1:1 scale 2D case
-    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))
-    {
+    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; )
     {
       Standard_Utf32Char aCurrChar = *anIter;
@@ -361,7 +362,6 @@ TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidt
       theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar);
     }
   }
-  }
 
   return aValueStr;
 }
@@ -431,7 +431,6 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
                               const TCollection_ExtendedString& theText,
                               const Standard_Integer theLabelPosition)
 {
-  Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
   if (myDrawer->DimensionAspect()->IsText3d())
   {
     // getting font parameters
@@ -518,7 +517,7 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
     aCenterOfLabel.Transform (aTextPlaneTrsf);
 
     gp_Ax2 aFlippingAxes (aCenterOfLabel, GetPlane().Axis().Direction(), aTextDir);
-    aGroup->SetFlippingOptions (Standard_True, aFlippingAxes);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_True, aFlippingAxes);
 
     // draw text
     if (myDrawer->DimensionAspect()->IsTextShaded())
@@ -547,14 +546,11 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
       {
         myDrawer->SetFreeBoundaryAspect (new Prs3d_LineAspect (aColor, Aspect_TOL_SOLID, 1.0));
       }
+
       myDrawer->FreeBoundaryAspect()->Aspect()->SetColor (aColor);
 
       // drawing text
-      if (Handle(Graphic3d_ArrayOfPrimitives) anEdges = StdPrs_WFShape::AddAllEdges (aTextShape, myDrawer))
-      {
-        aGroup->SetGroupPrimitivesAspect (myDrawer->FreeBoundaryAspect()->Aspect());
-        aGroup->AddPrimitiveArray (anEdges);
-      }
+      StdPrs_WFShape::Add (thePresentation, aTextShape, myDrawer);
     }
     Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_False, gp_Ax2());
 
@@ -569,7 +565,7 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation,
   // generate primitives for 2D text
   myDrawer->DimensionAspect()->TextAspect()->Aspect()->SetDisplayType (Aspect_TODT_DIMENSION);
 
-  Prs3d_Text::Draw (aGroup,
+  Prs3d_Text::Draw (Prs3d_Root::CurrentGroup (thePresentation),
                     myDrawer->DimensionAspect()->TextAspect(),
                     theText,
                     theTextPos);
@@ -603,7 +599,6 @@ void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresenta
     gp_Pnt aTextPos = ElCLib::Value (theExtensionSize, anExtensionLine);
     gp_Dir aTextDir = theExtensionDir;
 
-    Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
     drawText (thePresentation,
               aTextPos,
               aTextDir,
@@ -635,17 +630,16 @@ void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresenta
   aSensitiveCurve.Append (anExtStart);
   aSensitiveCurve.Append (anExtEnd);
 
-  Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
   if (!myDrawer->DimensionAspect()->IsText3d() && theMode == ComputeMode_All)
   {
-    aGroup->SetStencilTestOptions (Standard_True);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_True);
   }
   Handle(Graphic3d_AspectLine3d) aDimensionLineStyle = myDrawer->DimensionAspect()->LineAspect()->Aspect();
-  aGroup->SetPrimitivesAspect (aDimensionLineStyle);
-  aGroup->AddPrimitiveArray (anExtPrimitive);
+  Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionLineStyle);
+  Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (anExtPrimitive);
   if (!myDrawer->DimensionAspect()->IsText3d() && theMode == ComputeMode_All)
   {
-    aGroup->SetStencilTestOptions (Standard_False);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_False);
   }
 }
 
@@ -739,6 +733,8 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
     case LabelPosition_HCenter:
     {
       // add label on dimension or extension line to presentation
+      Prs3d_Root::NewGroup (thePresentation);
+
       gp_Pnt aTextPos = IsTextPositionCustom() ? myFixedTextPosition
                                               : (aCenterLineBegin.XYZ() + aCenterLineEnd.XYZ()) * 0.5;
       gp_Dir aTextDir = aDimensionLine.Direction();
@@ -746,7 +742,6 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
       // add text primitives
       if (theMode == ComputeMode_All || theMode == ComputeMode_Text)
       {
-        thePresentation->NewGroup();
         drawText (thePresentation,
                   aTextPos,
                   aTextDir,
@@ -804,29 +799,25 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         aDimensionAspect->TextAspect()->SetVerticalJustification (aTextJustificaton);
 
         // main dimension line, short extension
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
         if (!aDimensionAspect->IsText3d() && theMode == ComputeMode_All)
         {
-            aGroup->SetStencilTestOptions (Standard_True);
+          Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_True);
         }
-          aGroup->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-          aGroup->AddPrimitiveArray (aPrimSegments);
+        Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+        Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);
         if (!aDimensionAspect->IsText3d() && theMode == ComputeMode_All)
         {
-            aGroup->SetStencilTestOptions (Standard_False);
-          }
+          Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_False);
         }
 
         // add arrows to presentation
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);
+
         DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
         if (!theIsOneSide)
         {
           DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
         }
-        }
 
         if (!isArrowsExternal)
         {
@@ -834,7 +825,8 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         }
 
         // add arrow extension lines to presentation
-        {
+        Prs3d_Root::NewGroup (thePresentation);
+
         DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
                        aFirstArrowEnd, aFirstExtensionDir,
                        THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
@@ -845,7 +837,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
                          THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
         }
       }
-      }
+
       break;
     }
     // ------------------------------------------------------------------------ //
@@ -855,7 +847,8 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
     case LabelPosition_Left:
     {
       // add label on dimension or extension line to presentation
-      {
+      Prs3d_Root::NewGroup (thePresentation);
+
       // Left extension with the text
       DrawExtension (thePresentation, anExtensionSize,
                      isArrowsExternal
@@ -866,38 +859,34 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
                      aLabelWidth,
                      theMode,
                      aLabelPosition);
-      }
 
       // add dimension line primitives
       if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
       {
         // add central dimension line
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);
 
         // add graphical primitives
         Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (2);
         aPrimSegments->AddVertex (aCenterLineBegin);
         aPrimSegments->AddVertex (aCenterLineEnd);
 
-          aGroup->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-          aGroup->AddPrimitiveArray (aPrimSegments);
+        Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+        Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);
 
         // add selection primitives
         SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
         aSensitiveCurve.Append (aCenterLineBegin);
         aSensitiveCurve.Append (aCenterLineEnd);
-        }
 
         // add arrows to presentation
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);
+
         DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
         if (!theIsOneSide)
         {
           DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
         }
-        }
 
         if (!isArrowsExternal || theIsOneSide)
         {
@@ -905,12 +894,12 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         }
 
         // add extension lines for external arrows
-        {
+        Prs3d_Root::NewGroup (thePresentation);
+
         DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
                        aSecondArrowEnd, aSecondExtensionDir,
                        THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
       }
-      }
 
       break;
     }
@@ -921,6 +910,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
     case LabelPosition_Right:
     {
       // add label on dimension or extension line to presentation
+      Prs3d_Root::NewGroup (thePresentation);
 
       // Right extension with text
       DrawExtension (thePresentation, anExtensionSize,
@@ -935,31 +925,28 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
       if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
       {
         // add central dimension line
-        {
-          Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);
 
         // add graphical primitives
         Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (2);
         aPrimSegments->AddVertex (aCenterLineBegin);
         aPrimSegments->AddVertex (aCenterLineEnd);
-          aGroup->SetGroupPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-          aGroup->AddPrimitiveArray (aPrimSegments);
+        Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+        Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);
 
         // add selection primitives
         SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
         aSensitiveCurve.Append (aCenterLineBegin);
         aSensitiveCurve.Append (aCenterLineEnd);
-        }
 
         // add arrows to presentation
-        {
-          thePresentation->NewGroup();
+        Prs3d_Root::NewGroup (thePresentation);
+
         DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
         if (!theIsOneSide)
         {
           DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
         }
-        }
 
         if (!isArrowsExternal || theIsOneSide)
         {
@@ -967,12 +954,12 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         }
 
         // add extension lines for external arrows
-        {
+        Prs3d_Root::NewGroup (thePresentation);
+
         DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
                        aFirstArrowEnd, aFirstExtensionDir,
                        THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
       }
-      }
 
       break;
     }
@@ -981,7 +968,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
   // add flyout lines to presentation
   if (theMode == ComputeMode_All)
   {
-    Handle(Graphic3d_Group) aGroup = thePresentation->NewGroup();
+    Prs3d_Root::NewGroup (thePresentation);
 
     Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments(4);
     aPrimSegments->AddVertex (theFirstPoint);
@@ -990,8 +977,8 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
     aPrimSegments->AddVertex (theSecondPoint);
     aPrimSegments->AddVertex (aLineEndPoint);
 
-    aGroup->SetGroupPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
-    aGroup->AddPrimitiveArray (aPrimSegments);
+    Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect());
+    Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments);
   }
 
   mySelectionGeom.IsComputed = Standard_True;

src/AIS/AIS_EqualDistanceRelation.hxx

@@ -17,12 +17,32 @@
 #ifndef _AIS_EqualDistanceRelation_HeaderFile
 #define _AIS_EqualDistanceRelation_HeaderFile
 
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <TopoDS_Shape.hxx>
+#include <gp_Pnt.hxx>
 #include <AIS_Relation.hxx>
-#include <AIS_TypeOfDist.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
 #include <DsgPrs_ArrowSide.hxx>
-
+#include <AIS_TypeOfDist.hxx>
+class TopoDS_Shape;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
+class TopoDS_Edge;
+class Bnd_Box;
+class gp_Pnt;
+class TopoDS_Vertex;
 
+
+class AIS_EqualDistanceRelation;
 DEFINE_STANDARD_HANDLE(AIS_EqualDistanceRelation, AIS_Relation)
 
 //! A framework to display equivalent distances between
@@ -32,9 +52,10 @@ DEFINE_STANDARD_HANDLE(AIS_EqualDistanceRelation, AIS_Relation)
 //! These distances are used to compare shapes by this vector alone.
 class AIS_EqualDistanceRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
+
 public:
 
+  
   //! Constructs a framework to display equivalent
   //! distances between the shapes aShape1, aShape2,
   //! aShape3, aShape4 and the plane aPlane.
@@ -84,8 +105,19 @@ public:
   //! a line or a circle.
   Standard_EXPORT static void ComputeOneEdgeOneVertexLength (const Handle(Prs3d_Presentation)& aPresentation, const Handle(Prs3d_Drawer)& aDrawer, const Standard_Real ArrowSize, const TopoDS_Shape& FirstShape, const TopoDS_Shape& SecondShape, const Handle(Geom_Plane)& Plane, const Standard_Boolean AutomaticPos, const Standard_Boolean IsSetBndBox, const Bnd_Box& BndBox, gp_Pnt& Position, gp_Pnt& FirstAttach, gp_Pnt& SecondAttach, gp_Pnt& FirstExtreme, gp_Pnt& SecondExtreme, DsgPrs_ArrowSide& SymbolPrs);
 
+
+
+
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,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;
@@ -103,8 +135,14 @@ private:
   gp_Pnt myPoint3;
   gp_Pnt myPoint4;
 
+
 };
 
+
 #include <AIS_EqualDistanceRelation.lxx>
 
+
+
+
+
 #endif // _AIS_EqualDistanceRelation_HeaderFile

src/AIS/AIS_EqualRadiusRelation.hxx

@@ -17,17 +17,31 @@
 #ifndef _AIS_EqualRadiusRelation_HeaderFile
 #define _AIS_EqualRadiusRelation_HeaderFile
 
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <gp_Pnt.hxx>
 #include <AIS_Relation.hxx>
-
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Edge;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
 
+
+class AIS_EqualRadiusRelation;
 DEFINE_STANDARD_HANDLE(AIS_EqualRadiusRelation, AIS_Relation)
 
+
 class AIS_EqualRadiusRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_EqualRadiusRelation, AIS_Relation)
+
 public:
 
+  
   //! Creates equal relation of two arc's radiuses.
   //! If one of edges is not in the given plane,
   //! the presentation method projects it onto the plane.
@@ -42,8 +56,19 @@ 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_EqualRadiusRelation,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;
@@ -57,6 +82,13 @@ private:
   gp_Pnt myFirstPoint;
   gp_Pnt mySecondPoint;
 
+
 };
 
+
+
+
+
+
+
 #endif // _AIS_EqualRadiusRelation_HeaderFile

src/AIS/AIS_FixRelation.hxx

@@ -17,11 +17,32 @@
 #ifndef _AIS_FixRelation_HeaderFile
 #define _AIS_FixRelation_HeaderFile
 
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
 #include <TopoDS_Wire.hxx>
+#include <gp_Pnt.hxx>
 #include <AIS_Relation.hxx>
-
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+class TopoDS_Shape;
 class Geom_Plane;
+class TopoDS_Wire;
+class gp_Pnt;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
+class TopoDS_Vertex;
+class Geom_Curve;
+class TopoDS_Edge;
+class gp_Lin;
+class gp_Circ;
 
+
+class AIS_FixRelation;
 DEFINE_STANDARD_HANDLE(AIS_FixRelation, AIS_Relation)
 
 //! Constructs and manages a constraint by a fixed
@@ -34,9 +55,10 @@ DEFINE_STANDARD_HANDLE(AIS_FixRelation, AIS_Relation)
 //! object.
 class AIS_FixRelation : public AIS_Relation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_FixRelation, AIS_Relation)
+
 public:
 
+  
   //! initializes the vertex aShape, the
   //! plane aPlane and the wire aWire, which connects
   //! the two vertices in a fixed relation.
@@ -76,6 +98,16 @@ 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_FixRelation,AIS_Relation)
+
+protected:
+
+
+
+
 private:
 
   
@@ -109,6 +141,11 @@ private:
 
 };
 
+
 #include <AIS_FixRelation.lxx>
 
+
+
+
+
 #endif // _AIS_FixRelation_HeaderFile

src/AIS/AIS_IdenticRelation.hxx

@@ -17,14 +17,21 @@
 #ifndef _AIS_IdenticRelation_HeaderFile
 #define _AIS_IdenticRelation_HeaderFile
 
-#include <AIS_Relation.hxx>
-#include <gp_Pnt.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <TColStd_ListOfTransient.hxx>
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
 
+#include <Standard_Boolean.hxx>
+#include <gp_Pnt.hxx>
+#include <AIS_Relation.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Standard_Integer.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Standard_Real.hxx>
 class TopoDS_Shape;
 class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
 class Geom_Line;
 class gp_Pnt;
 class Geom_Circle;
@@ -33,6 +40,8 @@ class TopoDS_Wire;
 class TopoDS_Vertex;
 class gp_Dir;
 
+
+class AIS_IdenticRelation;
 DEFINE_STANDARD_HANDLE(AIS_IdenticRelation, AIS_Relation)
 
 //! Constructs a constraint by a relation of identity

src/AIS/AIS_InteractiveContext.cxx

@@ -37,6 +37,7 @@
 #include <Prs3d_PlaneAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
+#include <PrsMgr_ModedPresentation.hxx>
 #include <PrsMgr_PresentableObject.hxx>
 #include <Quantity_Color.hxx>
 #include <SelectMgr_EntityOwner.hxx>
@@ -106,6 +107,7 @@ AIS_InteractiveContext::AIS_InteractiveContext(const Handle(V3d_Viewer)& MainVie
 myMainPM(new PrsMgr_PresentationManager3d(MainViewer->StructureManager())),
 myMainVwr(MainViewer),
 myMainSel(new StdSelect_ViewerSelector3d()),
+myWasLastMain(Standard_False),
 myToHilightSelected(Standard_True),
 mySelection(new AIS_Selection()),
 myFilters(new SelectMgr_OrFilter()),
@@ -187,29 +189,6 @@ AIS_InteractiveContext::~AIS_InteractiveContext()
   }
 }
 
-//=======================================================================
-//function : LastActiveView
-//purpose  :
-//=======================================================================
-Handle(V3d_View) AIS_InteractiveContext::LastActiveView() const
-{
-  if (myLastActiveView == NULL
-   || myMainVwr.IsNull())
-  {
-    return Handle(V3d_View)();
-  }
-
-  // as a precaution - check that myLastActiveView pointer is a valid active View
-  for (V3d_ListOfViewIterator aViewIter = myMainVwr->ActiveViewIterator(); aViewIter.More(); aViewIter.Next())
-  {
-    if (aViewIter.Value() == myLastActiveView)
-    {
-      return aViewIter.Value();
-    }
-  }
-  return Handle(V3d_View)();
-}
-
 //=======================================================================
 //function : UpdateCurrentViewer
 //purpose  : 
@@ -447,7 +426,8 @@ void AIS_InteractiveContext::Display (const Handle(AIS_InteractiveObject)& theIO
   setContextToObject (theIObj);
   if (!myObjects.IsBound (theIObj))
   {
-    setObjectStatus (theIObj, AIS_DS_Displayed, theDispMode, theSelectionMode);
+    Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (AIS_DS_Displayed, theDispMode, theSelectionMode);
+    myObjects.Bind   (theIObj, aStatus);
     myMainVwr->StructureManager()->RegisterObject (theIObj);
     myMainPM->Display(theIObj, theDispMode);
     if (theSelectionMode != -1)
@@ -524,7 +504,8 @@ void AIS_InteractiveContext::Load (const Handle(AIS_InteractiveObject)& theIObj,
   {
     Standard_Integer aDispMode, aHiMod, aSelModeDef;
     GetDefModes (theIObj, aDispMode, aHiMod, aSelModeDef);
-    setObjectStatus (theIObj, AIS_DS_Erased, aDispMode, theSelMode != -1 ? theSelMode : aSelModeDef);
+    Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (AIS_DS_Erased, aDispMode, theSelMode != -1 ? theSelMode : aSelModeDef);
+    myObjects.Bind (theIObj, aStatus);
     myMainVwr->StructureManager()->RegisterObject (theIObj);
   }
 
@@ -775,9 +756,7 @@ Standard_Boolean AIS_InteractiveContext::IsHilighted (const Handle(SelectMgr_Ent
     return myObjects (anObj)->IsHilighted();
   }
 
-  const Handle(Prs3d_Drawer)& aStyle = getSelStyle (anObj, theOwner);
-  const Standard_Integer aHiMode = getHilightMode (anObj, aStyle, -1);
-  return theOwner->IsHilighted (myMainPM, aHiMode);
+  return theOwner->IsSelected();
 }
 
 //=======================================================================
@@ -973,8 +952,7 @@ void AIS_InteractiveContext::RecomputePrsOnly (const Handle(AIS_InteractiveObjec
     return;
   }
 
-  theIObj->SetToUpdate();
-  theIObj->UpdatePresentations (theAllModes);
+  theIObj->Update (theAllModes);
   if (!theToUpdateViewer)
   {
     return;
@@ -1028,7 +1006,13 @@ void AIS_InteractiveContext::Update (const Handle(AIS_InteractiveObject)& theIOb
     return;
   }
 
-  theIObj->UpdatePresentations();
+  TColStd_ListOfInteger aPrsModes;
+  theIObj->ToBeUpdated (aPrsModes);
+  for (TColStd_ListIteratorOfListOfInteger aPrsModesIt (aPrsModes); aPrsModesIt.More(); aPrsModesIt.Next())
+  {
+    theIObj->Update (aPrsModesIt.Value(), Standard_False);
+  }
+
   mgrSelector->Update(theIObj);
 
   if (theUpdateViewer)
@@ -1385,6 +1369,63 @@ void AIS_InteractiveContext::SetCurrentFacingModel (const Handle(AIS_Interactive
   }
 }
 
+//=======================================================================
+//function : redisplayPrsRecModes
+//purpose  :
+//=======================================================================
+void AIS_InteractiveContext::redisplayPrsRecModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                                   const Standard_Boolean               theToUpdateViewer)
+{
+  if (theIObj->RecomputeEveryPrs())
+  {
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
+  }
+  else
+  {
+    for (TColStd_ListIteratorOfListOfInteger aModes (theIObj->ListOfRecomputeModes()); aModes.More(); aModes.Next())
+    {
+      theIObj->Update (aModes.Value(), Standard_False);
+    }
+    theIObj->UpdateSelection();
+    theIObj->SetRecomputeOk();
+  }
+
+  if (theToUpdateViewer)
+  {
+    UpdateCurrentViewer();
+  }
+}
+
+//=======================================================================
+//function : redisplayPrsModes
+//purpose  :
+//=======================================================================
+void AIS_InteractiveContext::redisplayPrsModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                                const Standard_Boolean               theToUpdateViewer)
+{
+  if (theIObj->RecomputeEveryPrs())
+  {
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
+  }
+  else
+  {
+    TColStd_ListOfInteger aModes;
+    theIObj->ToBeUpdated (aModes);
+    for (TColStd_ListIteratorOfListOfInteger aModeIter (aModes); aModeIter.More(); aModeIter.Next())
+    {
+      theIObj->Update (aModeIter.Value(), Standard_False);
+    }
+    theIObj->SetRecomputeOk();
+  }
+
+  if (theToUpdateViewer)
+  {
+    UpdateCurrentViewer();
+  }
+}
+
 //=======================================================================
 //function : SetColor
 //purpose  :
@@ -1400,11 +1441,7 @@ void AIS_InteractiveContext::SetColor (const Handle(AIS_InteractiveObject)& theI
 
   setContextToObject (theIObj);
   theIObj->SetColor (theColor);
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1449,11 +1486,7 @@ void AIS_InteractiveContext::SetDeviationCoefficient (const Handle(AIS_Interacti
 
   Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
   aShape->SetOwnDeviationCoefficient (theCoefficient);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1483,11 +1516,7 @@ void AIS_InteractiveContext::SetHLRDeviationCoefficient (const Handle(AIS_Intera
 
   Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
   aShape->SetOwnHLRDeviationCoefficient (theCoefficient);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1516,11 +1545,7 @@ void AIS_InteractiveContext::SetDeviationAngle (const Handle(AIS_InteractiveObje
 
   Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
   aShape->SetOwnDeviationAngle (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1549,10 +1574,15 @@ void AIS_InteractiveContext::SetAngleAndDeviation (const Handle(AIS_InteractiveO
 
   Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
   aShape->SetAngleAndDeviation (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
+
+  if (theIObj->RecomputeEveryPrs())
   {
-    UpdateCurrentViewer();
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
+  }
+  else
+  {
+    Update (theIObj, theToUpdateViewer);
   }
 }
 
@@ -1581,11 +1611,7 @@ void AIS_InteractiveContext::SetHLRAngleAndDeviation (const Handle(AIS_Interacti
   }
   Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
   aShape->SetHLRAngleAndDeviation (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1613,11 +1639,7 @@ void AIS_InteractiveContext::SetHLRDeviationAngle (const Handle(AIS_InteractiveO
   }
   Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (theIObj);
   aShape->SetOwnHLRDeviationAngle (theAngle);
-  aShape->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1633,11 +1655,7 @@ void AIS_InteractiveContext::UnsetColor (const Handle(AIS_InteractiveObject)& th
   }
 
   theIObj->UnsetColor();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1683,27 +1701,23 @@ void AIS_InteractiveContext::SetWidth (const Handle(AIS_InteractiveObject)& theI
 
   setContextToObject (theIObj);
   theIObj->SetWidth (theWidth);
-  theIObj->UpdatePresentations();
-  if (!myLastPicked.IsNull() && myLastPicked->IsSameSelectable (theIObj))
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
+  if (!myLastinMain.IsNull() && myLastinMain->IsSameSelectable (theIObj))
   {
-    if (myLastPicked->IsAutoHilight())
+    if (myLastinMain->IsAutoHilight())
     {
       const Standard_Integer aHiMode = theIObj->HasHilightMode() ? theIObj->HilightMode() : 0;
-      myLastPicked->HilightWithColor (myMainPM,
-                                      myLastPicked->IsSelected() ? getSelStyle (theIObj, myLastPicked) : getHiStyle (theIObj, myLastPicked),
+      myLastinMain->HilightWithColor (myMainPM,
+                                      myLastinMain->IsSelected() ? getSelStyle (theIObj, myLastinMain) : getHiStyle (theIObj, myLastinMain),
                                       aHiMode);
     }
     else
     {
       theIObj->HilightOwnerWithColor (myMainPM,
-                                      myLastPicked->IsSelected() ? getSelStyle (theIObj, myLastPicked) : getHiStyle (theIObj, myLastPicked),
-                                      myLastPicked);
+                                      myLastinMain->IsSelected() ? getSelStyle (theIObj, myLastinMain) : getHiStyle (theIObj, myLastinMain),
+                                      myLastinMain);
     }
   }
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
 }
 
 //=======================================================================
@@ -1719,11 +1733,7 @@ void AIS_InteractiveContext::UnsetWidth (const Handle(AIS_InteractiveObject)& th
   }
 
   theIObj->UnsetWidth();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1741,11 +1751,7 @@ void AIS_InteractiveContext::SetMaterial (const Handle(AIS_InteractiveObject)& t
 
   setContextToObject (theIObj);
   theIObj->SetMaterial (theMaterial);
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1760,11 +1766,7 @@ void AIS_InteractiveContext::UnsetMaterial (const Handle(AIS_InteractiveObject)&
     return;
   }
   theIObj->UnsetMaterial();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1794,11 +1796,7 @@ void AIS_InteractiveContext::SetTransparency (const Handle(AIS_InteractiveObject
   }
 
   theIObj->SetTransparency (theValue);
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1814,11 +1812,7 @@ void AIS_InteractiveContext::UnsetTransparency (const Handle(AIS_InteractiveObje
   }
 
   theIObj->UnsetTransparency();
-  theIObj->UpdatePresentations();
-  if (theToUpdateViewer)
-  {
-    UpdateCurrentViewer();
-  }
+  redisplayPrsRecModes (theIObj, theToUpdateViewer);
 }
 
 //=======================================================================
@@ -1828,7 +1822,6 @@ void AIS_InteractiveContext::UnsetTransparency (const Handle(AIS_InteractiveObje
 void AIS_InteractiveContext::SetSelectedAspect (const Handle(Prs3d_BasicAspect)& theAspect,
                                                 const Standard_Boolean           theToUpdateViewer)
 {
-  Standard_DISABLE_DEPRECATION_WARNINGS
   Standard_Boolean isFound = Standard_False;
   for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
   {
@@ -1836,7 +1829,6 @@ void AIS_InteractiveContext::SetSelectedAspect (const Handle(Prs3d_BasicAspect)&
     Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (aSelIter.Value()->Selectable());
     anObj->SetAspect (theAspect);
   }
-  Standard_ENABLE_DEPRECATION_WARNINGS
 
   if (isFound && theToUpdateViewer)
   {
@@ -1959,18 +1951,42 @@ void AIS_InteractiveContext::GetDefModes (const Handle(AIS_InteractiveObject)& t
 void AIS_InteractiveContext::EraseGlobal (const Handle(AIS_InteractiveObject)& theIObj,
                                           const Standard_Boolean               theToUpdateviewer)
 {
-  Handle(AIS_GlobalStatus) aStatus;
   if (theIObj.IsNull()
-  || !myObjects.Find (theIObj, aStatus)
-  ||  aStatus->GraphicStatus() == AIS_DS_Erased)
+  || !myObjects.IsBound (theIObj))
   {
     return;
   }
 
+  Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj);
+
   const Standard_Integer aDispMode = theIObj->HasHilightMode() ? theIObj->HilightMode() : 0;
-  unhighlightOwners (theIObj);
+  if (aStatus->GraphicStatus() == AIS_DS_Erased)
+  {
+    return;
+  }
+
+  if (aStatus->IsHilighted())
+  {
+    Standard_DISABLE_DEPRECATION_WARNINGS
+    if (IsCurrent (theIObj))
+    {
+      AddOrRemoveCurrentObject (theIObj, Standard_False);
+    }
+    else if (myMainPM->IsHighlighted (theIObj, aStatus->DisplayMode()))
+    {
+      unhighlightGlobal (theIObj);
+    }
+    Standard_ENABLE_DEPRECATION_WARNINGS
+  }
+
   myMainPM->SetVisibility (theIObj, aStatus->DisplayMode(), Standard_False);
 
+  if (aStatus->IsHilighted()
+   && theIObj->HasHilightMode())
+  {
+    unhighlightGlobal (theIObj);
+  }
+
   if (!myLastPicked.IsNull()
     && myLastPicked->IsSameSelectable (theIObj))
   {
@@ -2026,9 +2042,8 @@ void AIS_InteractiveContext::unhighlightOwners (const Handle(AIS_InteractiveObje
 void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& theIObj,
                                           const Standard_Boolean               theToUpdateviewer)
 {
-  Handle(AIS_GlobalStatus) aStatus;
   if (theIObj.IsNull()
-  || !myObjects.Find (theIObj, aStatus))
+  || !myObjects.IsBound (theIObj))
   {
     // for cases when reference shape of connected interactives was not displayed
     // but its selection primitives were calculated
@@ -2037,6 +2052,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
     return;
   }
 
+  Handle(AIS_GlobalStatus) aStatus = myObjects (theIObj);
   unhighlightOwners (theIObj);
 
   myMainPM->Erase (theIObj, -1);
@@ -2077,7 +2093,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
   const Handle(SelectMgr_SelectableObject)& anObj = theIObj; // to avoid ambiguity
   mgrSelector->Remove (anObj);
 
-  setObjectStatus (theIObj, AIS_DS_None, -1, -1);
+  myObjects.UnBind (theIObj);
   myMainVwr->StructureManager()->UnregisterObject (theIObj);
 
   for (V3d_ListOfViewIterator aDefViewIter (myMainVwr->DefinedViewIterator()); aDefViewIter.More(); aDefViewIter.Next())
@@ -2085,11 +2101,13 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
     aDefViewIter.Value()->View()->ChangeHiddenObjects()->Remove (theIObj.get());
   }
 
-  if (!myLastPicked.IsNull())
+  if (!myLastinMain.IsNull())
   {
-    if (myLastPicked->IsSameSelectable (theIObj))
+    if (myLastinMain->IsSameSelectable (theIObj)
+     || myLastPicked->IsSameSelectable(theIObj))
     {
       clearDynamicHighlight();
+      myLastinMain.Nullify();
       myLastPicked.Nullify();
     }
   }
@@ -2143,12 +2161,15 @@ Standard_Boolean AIS_InteractiveContext::ClearDetected (Standard_Boolean theToRe
   myCurDetected = 0;
   myCurHighlighted = 0;
   myDetectedSeq.Clear();
+  myLastPicked  = myLastinMain;
+  myWasLastMain = Standard_True;
   Standard_Boolean toUpdate = Standard_False;
   if (!myLastPicked.IsNull() && myLastPicked->HasSelectable())
   {
     toUpdate = Standard_True;
     clearDynamicHighlight();
   }
+  myLastinMain.Nullify();
   myLastPicked.Nullify();
   myMainSel->ClearPicked();
   if (toUpdate && theToRedrawImmediate)
@@ -2439,13 +2460,6 @@ void AIS_InteractiveContext::Disconnect (const Handle(AIS_InteractiveObject)& th
   {
     Handle(AIS_MultipleConnectedInteractive) theObj (Handle(AIS_MultipleConnectedInteractive)::DownCast (theAssembly));
     theObj->Disconnect (theObjToDisconnect);
-    if (!myObjects.IsBound (theObjToDisconnect))
-    {
-      // connected presentation might contain displayed presentations
-      myMainPM->Erase (theObjToDisconnect, -1);
-      theObjToDisconnect->ErasePresentations (true);
-    }
-
     const Handle(SelectMgr_SelectableObject)& anObj = theObjToDisconnect; // to avoid ambiguity
     mgrSelector->Remove (anObj);
   }
@@ -2470,10 +2484,12 @@ void AIS_InteractiveContext::FitSelected (const Handle(V3d_View)& theView)
 }
 
 //=======================================================================
-//function : BoundingBoxOfSelection
-//purpose  :
+//function : FitSelected
+//purpose  : Fits the view corresponding to the bounds of selected objects
 //=======================================================================
-Bnd_Box AIS_InteractiveContext::BoundingBoxOfSelection() const
+void AIS_InteractiveContext::FitSelected (const Handle(V3d_View)& theView,
+                                          const Standard_Real theMargin,
+                                          const Standard_Boolean theToUpdate)
 {
   Bnd_Box aBndSelected;
   AIS_MapOfObjectOwners anObjectOwnerMap;
@@ -2512,23 +2528,13 @@ Bnd_Box AIS_InteractiveContext::BoundingBoxOfSelection() const
     aBndSelected.Add (aTmpBox);
   }
 
-  return aBndSelected;
-}
+  anObjectOwnerMap.Clear();
+
+  if (aBndSelected.IsVoid())
+    return;
 
-//=======================================================================
-//function : FitSelected
-//purpose  : Fits the view corresponding to the bounds of selected objects
-//=======================================================================
-void AIS_InteractiveContext::FitSelected (const Handle(V3d_View)& theView,
-                                          const Standard_Real theMargin,
-                                          const Standard_Boolean theToUpdate)
-{
-  Bnd_Box aBndSelected = BoundingBoxOfSelection();
-  if (!aBndSelected.IsVoid())
-  {
   theView->FitAll (aBndSelected, theMargin, theToUpdate);
 }
-}
 
 //=======================================================================
 //function : SetTransformPersistence
@@ -2553,38 +2559,3 @@ void AIS_InteractiveContext::SetTransformPersistence (const Handle(AIS_Interacti
     anActiveViewIter.Value()->View()->InvalidateZLayerBoundingBox (aLayerId);
   }
 }
-
-//=======================================================================
-//function : GravityPoint
-//purpose  :
-//=======================================================================
-gp_Pnt AIS_InteractiveContext::GravityPoint (const Handle(V3d_View)& theView) const
-{
-  return theView->GravityPoint();
-}
-//=======================================================================
-//function : setObjectStatus
-//purpose  :
-//=======================================================================
-void AIS_InteractiveContext::setObjectStatus (const Handle(AIS_InteractiveObject)& theIObj,
-                                              const AIS_DisplayStatus theStatus,
-                                              const Standard_Integer theDispMode,
-                                              const Standard_Integer theSelectionMode)
-{
-  if (theStatus != AIS_DS_None)
-  {
-    Handle(AIS_GlobalStatus) aStatus = new AIS_GlobalStatus (AIS_DS_Displayed, theDispMode, theSelectionMode);
-    myObjects.Bind (theIObj, aStatus);
-  }
-  else
-    myObjects.UnBind (theIObj);
-
-  for (PrsMgr_ListOfPresentableObjectsIter aPrsIter (theIObj->Children()); aPrsIter.More(); aPrsIter.Next())
-  {
-    Handle(AIS_InteractiveObject) aChild (Handle(AIS_InteractiveObject)::DownCast (aPrsIter.Value()));
-    if (aChild.IsNull())
-      continue;
-
-    setObjectStatus (aChild, theStatus, theDispMode, theSelectionMode);
-  }
-}

src/AIS/AIS_InteractiveContext.hxx

@@ -198,21 +198,6 @@ public: //! @name highlighting management
   const Handle(Prs3d_Drawer)& HighlightStyle (const Prs3d_TypeOfHighlight theStyleType) const { return myStyles[theStyleType]; }
 
   //! Setup highlight style settings.
-  //! It is preferred modifying existing style returned by method HighlightStyle()
-  //! instead of creating a new drawer.
-  //!
-  //! If a new highlight style is created, its presentation Zlayer should be checked,
-  //! otherwise highlighting might not work as expected.
-  //! Default values are:
-  //!  - Prs3d_TypeOfHighlight_Dynamic:      Graphic3d_ZLayerId_Top,
-  //!    object highlighting is drawn on top of main scene within Immediate Layers,
-  //!    so that V3d_View::RedrawImmediate() will be enough to see update;
-  //!  - Prs3d_TypeOfHighlight_LocalDynamic: Graphic3d_ZLayerId_Topmost,
-  //!    object parts highlighting is drawn on top of main scene within Immediate Layers
-  //!    with depth cleared (even overlapped geometry will be revealed);
-  //!  - Prs3d_TypeOfHighlight_Selected:     Graphic3d_ZLayerId_UNKNOWN,
-  //!    object highlighting is drawn on top of main scene within the same layer
-  //!    as object itself (e.g. Graphic3d_ZLayerId_Default by default) and increased priority.
   void SetHighlightStyle (const Prs3d_TypeOfHighlight theStyleType,
                           const Handle(Prs3d_Drawer)& theStyle) { myStyles[theStyleType] = theStyle; }
 
@@ -227,14 +212,6 @@ public: //! @name highlighting management
   }
 
   //! Setup the style of dynamic highlighting.
-  //! It is preferred modifying existing style returned by method HighlightStyle()
-  //! instead of creating a new drawer.
-  //!
-  //! If a new highlight style is created, its presentation Zlayer should be checked,
-  //! otherwise highlighting might not work as expected.
-  //! Default value is Graphic3d_ZLayerId_Top,
-  //! object highlighting is drawn on top of main scene within Immediate Layers,
-  //! so that V3d_View::RedrawImmediate() will be enough to see update;
   void SetHighlightStyle (const Handle(Prs3d_Drawer)& theStyle) { myStyles[Prs3d_TypeOfHighlight_Dynamic] = theStyle; }
 
   //! Returns current selection style settings.
@@ -370,9 +347,6 @@ public: //! @name mouse picking logic (detection and dynamic highlighting of ent
                                                 const Standard_Integer theMode,
                                                 const Standard_Integer theNewSensitivity);
 
-  //! Returns last active View (argument of MoveTo()/Select() methods).
-  Standard_EXPORT Handle(V3d_View) LastActiveView() const;
-
   //! Relays mouse position in pixels theXPix and theYPix to the interactive context selectors.
   //! This is done by the view theView passing this position to the main viewer and updating it.
   //! If theToRedrawOnUpdate is set to false, callee should call RedrawImmediate() to highlight detected object.
@@ -457,7 +431,6 @@ public: //! @name iteration through detected entities
 public: //! @name Selection management
 
   //! Sets the graphic basic aspect to the current presentation of ALL selected objects.
-  Standard_DEPRECATED ("Deprecated method - presentation attributes should be assigned directly to object")
   Standard_EXPORT void SetSelectedAspect (const Handle(Prs3d_BasicAspect)& theAspect,
                                           const Standard_Boolean           theToUpdateViewer);
 
@@ -508,9 +481,6 @@ public: //! @name Selection management
                                                 const Handle(V3d_View)& theView,
                                                 const Standard_Boolean  theToUpdateViewer);
 
-  //! Returns bounding box of selected objects.
-  Standard_EXPORT Bnd_Box BoundingBoxOfSelection() const;
-
   //! Fits the view correspondingly to the bounds of selected objects.
   //! Infinite objects are ignored if infinite state of AIS_InteractiveObject is set to true.
   Standard_EXPORT void FitSelected (const Handle(V3d_View)& theView,
@@ -563,14 +533,6 @@ public: //! @name Selection management
   Standard_EXPORT void AddOrRemoveSelected (const Handle(AIS_InteractiveObject)& theObject,
                                             const Standard_Boolean               theToUpdateViewer);
 
-  //! Updates Selected state of specified owner without calling HilightSelected().
-  //! Has no effect if Selected state is not changed, and redirects to AddOrRemoveSelected() otherwise.
-  //! @param theOwner owner object to set selected state
-  //! @param theIsSelected new selected state
-  //! @return TRUE if Selected state has been changed
-  Standard_EXPORT Standard_Boolean SetSelectedState (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                     const Standard_Boolean               theIsSelected);
-
   //! Highlights selected objects.
   Standard_EXPORT void HilightSelected (const Standard_Boolean theToUpdateViewer);
 
@@ -830,9 +792,6 @@ public: //! @name common properties
   //! returns the number of removed  structures from the viewers.
   Standard_EXPORT Standard_Integer PurgeDisplay();
 
-  //! Return rotation gravity point.
-  Standard_EXPORT virtual gp_Pnt GravityPoint (const Handle(V3d_View)& theView) const;
-
 public: //! @name debug visualization
 
   //! Visualization of sensitives - for debugging purposes!
@@ -1100,7 +1059,6 @@ public: //! @name iso-line display attributes
   //! Returns true if drawing isolines on triangulation algorithm is enabled.
   Standard_EXPORT Standard_Boolean IsoOnTriangulation() const;
 
-//! @name obsolete methods
 public:
 
   //! Updates the view of the current object in open context.
@@ -1227,6 +1185,14 @@ protected: //! @name internal methods
   
   Standard_EXPORT Standard_Integer PurgeViewer (const Handle(V3d_Viewer)& Vwr);
   
+  //! UNKNOWN
+  Standard_EXPORT void redisplayPrsModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                          const Standard_Boolean               theToUpdateViewer);
+  
+  //! UNKNOWN
+  Standard_EXPORT void redisplayPrsRecModes (const Handle(AIS_InteractiveObject)& theIObj,
+                                             const Standard_Boolean               theToUpdateViewer);
+
   //! Helper function to unhighlight all entity owners currently highlighted with seleciton color.
   Standard_EXPORT void unhighlightOwners (const Handle(AIS_InteractiveObject)& theObject);
 
@@ -1296,10 +1262,6 @@ protected: //! @name internal methods
     return myStyles[!theOwner.IsNull() && theOwner->ComesFromDecomposition() ? Prs3d_TypeOfHighlight_LocalDynamic : Prs3d_TypeOfHighlight_Dynamic];
   }
 
-  //! Return TRUE if highlight style of owner requires full viewer redraw.
-  Standard_EXPORT Standard_Boolean isSlowHiStyle (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                  const Handle(V3d_Viewer)& theViewer) const;
-
   //! Helper function that returns correct selection style for the object:
   //! if custom style is defined via object's highlight drawer, it will be used. Otherwise,
   //! selection style of interactive context will be returned.
@@ -1357,27 +1319,19 @@ protected: //! @name internal methods
   //! Removes dynamic highlight draw
   void clearDynamicHighlight() const
   {
-    if (myLastPicked.IsNull())
+    if (myLastinMain.IsNull())
       return;
 
-    if (myLastPicked->IsAutoHilight())
+    if (myLastinMain->IsAutoHilight())
     {
       myMainPM->ClearImmediateDraw();
     }
     else
     {
-      myLastPicked->Selectable()->ClearDynamicHighlight (myMainPM);
+      myLastinMain->Selectable()->ClearDynamicHighlight (myMainPM);
     }
   }
 
-  //! Bind/Unbind status to object and its children
-  //! @param theObj [in] the object to change status
-  //! @param theStatus status, if NULL, unbind object
-  Standard_EXPORT void setObjectStatus (const Handle(AIS_InteractiveObject)& theIObj,
-                                        const AIS_DisplayStatus theStatus,
-                                        const Standard_Integer theDispyMode,
-                                        const Standard_Integer theSelectionMode);
-
 protected: //! @name internal fields
 
   AIS_DataMapOfIOStatus myObjects;
@@ -1385,8 +1339,9 @@ protected: //! @name internal fields
   Handle(PrsMgr_PresentationManager3d) myMainPM;
   Handle(V3d_Viewer) myMainVwr;
   Handle(StdSelect_ViewerSelector3d) myMainSel;
-  V3d_View* myLastActiveView;
   Handle(SelectMgr_EntityOwner) myLastPicked;
+  Handle(SelectMgr_EntityOwner) myLastinMain;
+  Standard_Boolean myWasLastMain;
   Standard_Boolean myToHilightSelected;
   Handle(AIS_Selection) mySelection;
   Handle(SelectMgr_OrFilter) myFilters;

src/AIS/AIS_InteractiveContext_1.cxx

@@ -30,7 +30,7 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Quantity_Color.hxx>
-#include <Select3D_SensitiveEntity.hxx>
+#include <SelectBasics_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Filter.hxx>
 #include <SelectMgr_OrFilter.hxx>
@@ -184,6 +184,7 @@ void AIS_InteractiveContext::unhighlightSelected (const Standard_Boolean theIsTo
     {
       anObjToClear.Add (anInteractive);
     }
+    anOwner->SetSelected (Standard_False);
     if (anOwner == anInteractive->GlobalSelOwner())
     {
       myObjects.ChangeFind (anInteractive)->SetHilightStatus (Standard_False);
@@ -292,22 +293,6 @@ void AIS_InteractiveContext::highlightWithSubintensity (const Handle(SelectMgr_E
   theOwner->HilightWithColor (myMainPM, myStyles[Prs3d_TypeOfHighlight_SubIntensity], theMode);
 }
 
-//=======================================================================
-//function : isSlowHiStyle
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_InteractiveContext::isSlowHiStyle (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                        const Handle(V3d_Viewer)& theViewer) const
-{
-  if (const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable()))
-  {
-    const Handle(Prs3d_Drawer)& aHiStyle = getHiStyle (anObj, myLastPicked);
-    return aHiStyle->ZLayer() == Graphic3d_ZLayerId_UNKNOWN
-       || !theViewer->ZLayerSettings (aHiStyle->ZLayer()).IsImmediate();
-  }
-  return Standard_False;
-}
-
 //=======================================================================
 //function : MoveTo
 //purpose  :
@@ -325,9 +310,10 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
   myCurDetected = 0;
   myCurHighlighted = 0;
   myDetectedSeq.Clear();
-  myLastActiveView = theView.get();
 
   // preliminaires
+  myLastPicked  = myLastinMain;
+  myWasLastMain = Standard_True;
   AIS_StatusOfDetection aStatus        = AIS_SOD_Nothing;
   Standard_Boolean      toUpdateViewer = Standard_False;
 
@@ -386,17 +372,13 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
     // method call. As result it is necessary to rehighligt it with mySelectionColor.
     if (!myLastPicked.IsNull() && myLastPicked->HasSelectable())
     {
-      if (isSlowHiStyle (myLastPicked, theView->Viewer()))
-      {
-        theView->Viewer()->Invalidate();
-      }
-
       clearDynamicHighlight();
       toUpdateViewer = Standard_True;
     }
 
     // initialize myLastPicked field with currently detected object
     myLastPicked = aNewPickedOwner;
+    myLastinMain = myLastPicked;
 
     // highlight detected object if it is not selected or myToHilightSelected flag is true
     if (myLastPicked->HasSelectable())
@@ -405,11 +387,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
        && (!myLastPicked->IsSelected()
          || myToHilightSelected))
       {
-        if (isSlowHiStyle (myLastPicked, theView->Viewer()))
-        {
-          theView->Viewer()->Invalidate();
-        }
-
         highlightWithColor (myLastPicked, theView->Viewer());
         toUpdateViewer = Standard_True;
       }
@@ -428,37 +405,19 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer  th
     && !myLastPicked.IsNull()
      && myLastPicked->HasSelectable())
     {
-      if (isSlowHiStyle (myLastPicked, theView->Viewer()))
-      {
-        theView->Viewer()->Invalidate();
-      }
-
       clearDynamicHighlight();
       toUpdateViewer = Standard_True;
     }
 
+    myLastinMain.Nullify();
     myLastPicked.Nullify();
   }
 
   if (toUpdateViewer
    && theToRedrawOnUpdate)
-  {
-    if (theView->ComputedMode())
   {
     theView->Viewer()->Update();
   }
-    else
-    {
-      if (theView->IsInvalidated())
-      {
-        theView->Viewer()->Redraw();
-      }
-      else
-      {
-        theView->Viewer()->RedrawImmediate();
-      }
-    }
-  }
 
   return aStatus;
 }
@@ -496,7 +455,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Integer  theXPMi
   // all objects detected by the selector are taken, previous current objects are emptied,
   // new objects are put...
   ClearSelected (Standard_False);
-  myLastActiveView = theView.get();
+  myWasLastMain = Standard_True;
   myMainSel->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
   for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
   {
@@ -505,6 +464,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Integer  theXPMi
       continue;
 
     mySelection->Select (aCurOwner);
+    aCurOwner->SetSelected (Standard_True);
   }
 
   if (myAutoHilight)
@@ -536,7 +496,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& the
   // all objects detected by the selector are taken, previous current objects are emptied,
   // new objects are put...
   ClearSelected (Standard_False);
-  myLastActiveView = theView.get();
+  myWasLastMain = Standard_True;
   myMainSel->Pick (thePolyline, theView);
   for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
   {
@@ -545,6 +505,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& the
       continue;
 
     mySelection->Select (anOwner);
+    anOwner->SetSelected (Standard_True);
   }
 
   if (myAutoHilight)
@@ -566,28 +527,17 @@ AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& the
 //=======================================================================
 AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Boolean toUpdateViewer)
 {
-  if (!myLastPicked.IsNull())
+  if (myWasLastMain && !myLastinMain.IsNull())
   {
-    Graphic3d_Vec2i aMousePos (-1, -1);
-    if (myMainSel->GetManager().GetActiveSelectionType() == SelectBasics_SelectingVolumeManager::Point)
-    {
-      aMousePos.SetValues ((Standard_Integer )myMainSel->GetManager().GetMousePosition().X(),
-                           (Standard_Integer )myMainSel->GetManager().GetMousePosition().Y());
-    }
-    if (myLastPicked->HandleMouseClick (aMousePos, Aspect_VKeyMouse_LeftButton, Aspect_VKeyFlags_NONE, false))
-    {
-      return AIS_SOP_NothingSelected;
-    }
-
     if (myAutoHilight)
     {
       clearDynamicHighlight();
     }
-    if (!myLastPicked->IsSelected()
-      || myLastPicked->IsForcedHilight()
+    if (!myLastinMain->IsSelected()
+      || myLastinMain->IsForcedHilight()
       || NbSelected() > 1)
     {
-      SetSelected (myLastPicked, Standard_False);
+      SetSelected (myLastinMain, Standard_False);
       if(toUpdateViewer)
       {
         UpdateCurrentViewer();
@@ -616,9 +566,9 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Boolean toU
   {
     clearDynamicHighlight();
   }
-  if (!myLastPicked.IsNull())
+  if (myWasLastMain && !myLastinMain.IsNull())
   {
-    AddOrRemoveSelected (myLastPicked, toUpdateViewer);
+    AddOrRemoveSelected (myLastinMain, toUpdateViewer);
   }
 
   Standard_Integer aSelNum = NbSelected();
@@ -644,11 +594,11 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Integer the
     throw Standard_ProgramError ("AIS_InteractiveContext::ShiftSelect() - invalid argument");
   }
 
-  myLastActiveView = theView.get();
   if (myAutoHilight)
   {
     UnhilightSelected (Standard_False);
   }
+  myWasLastMain = Standard_True;
   myMainSel->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
   for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
   {
@@ -656,7 +606,8 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Integer the
     if (anOwner.IsNull() || !anOwner->HasSelectable() || !myFilters->IsOk (anOwner))
       continue;
 
-    mySelection->Select (anOwner);
+    AIS_SelectStatus aSelStatus = mySelection->Select (anOwner);
+    anOwner->SetSelected (aSelStatus == AIS_SS_Added);
   }
 
   if (myAutoHilight)
@@ -685,11 +636,11 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const TColgp_Array1OfPnt2d
     throw Standard_ProgramError ("AIS_InteractiveContext::ShiftSelect() - invalid argument");
   }
 
-  myLastActiveView = theView.get();
   if (myAutoHilight)
   {
     UnhilightSelected (Standard_False);
   }
+  myWasLastMain = Standard_True;
   myMainSel->Pick (thePolyline, theView);
   for (Standard_Integer aPickIter = 1; aPickIter <= myMainSel->NbPicked(); ++aPickIter)
   {
@@ -697,7 +648,8 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const TColgp_Array1OfPnt2d
     if (anOwner.IsNull() || !anOwner->HasSelectable() || !myFilters->IsOk (anOwner))
       continue;
 
-    mySelection->Select (anOwner);
+    AIS_SelectStatus aSelStatus = mySelection->Select (anOwner);
+    anOwner->SetSelected (aSelStatus == AIS_SS_Added);
   }
 
   if (myAutoHilight)
@@ -732,6 +684,7 @@ void AIS_InteractiveContext::HilightSelected (const Standard_Boolean theToUpdate
       aState->SetHilightStatus (Standard_True);
       aState->SetHilightStyle (anObjSelStyle);
     }
+    anOwner->SetSelected (Standard_True);
     if (!anOwner->IsAutoHilight())
     {
       NCollection_Handle<SelectMgr_SequenceOfOwner> aSeq;
@@ -781,6 +734,7 @@ void AIS_InteractiveContext::UnhilightSelected (const Standard_Boolean theToUpda
       myObjects.ChangeFind (anObj)->SetHilightStatus (Standard_False);
     }
 
+    anOwner->SetSelected (Standard_False);
     anOwner->Unhilight (myMainPM);
   }
 
@@ -802,6 +756,13 @@ void AIS_InteractiveContext::ClearSelected (const Standard_Boolean theToUpdateVi
   {
     unhighlightSelected();
   }
+  else
+  {
+    for (AIS_NListOfEntityOwner::Iterator aSelIter (mySelection->Objects()); aSelIter.More(); aSelIter.Next())
+    {
+      aSelIter.Value()->SetSelected (Standard_False);
+    }
+  }
 
   mySelection->Clear();
   if (myAutoHilight)
@@ -827,7 +788,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
 
   if (!myObjects.IsBound (theObject))
   {
-    return;
+    Display (theObject, Standard_False);
   }
 
   Handle(SelectMgr_EntityOwner) anOwner = theObject->GlobalSelOwner();
@@ -863,6 +824,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
     {
       Unhilight (aSelectable, Standard_False);
     }
+    aSelOwner->SetSelected (Standard_False);
     if (aSelOwner == aSelectable->GlobalSelOwner())
     {
       myObjects.ChangeFind (aSelectable)->SetHilightStatus (Standard_False);
@@ -887,6 +849,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
       HilightWithColor (theObject, anObjSelStyle, Standard_False);
     }
   }
+  anOwner->SetSelected (Standard_True);
 
   if (theToUpdateViewer)
     UpdateCurrentViewer();
@@ -919,7 +882,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
   }
 
   if (!myObjects.IsBound (anObject))
-    return;
+    Display (anObject, Standard_False);
 
   if (myAutoHilight)
   {
@@ -933,10 +896,12 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
     if (!HighlightStyle (theOwner, aCustomStyle) ||
       (!aCustomStyle.IsNull() && aCustomStyle != anObjSelStyle))
     {
+      theOwner->SetSelected (Standard_True);
       highlightSelected (theOwner);
     }
   }
 
+  theOwner->SetSelected (Standard_True);
   if (myAutoHilight && theOwner == anObject->GlobalSelOwner())
   {
     Handle(AIS_GlobalStatus)& aState = myObjects.ChangeFind (anObject);
@@ -985,7 +950,8 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
   if (!myFilters->IsOk(theOwner) && !theOwner->IsSelected())
     return;
 
-  mySelection->Select (theOwner);
+  AIS_SelectStatus aSelStat = mySelection->Select (theOwner);
+  theOwner->SetSelected (aSelStat == AIS_SS_Added);
 
   if (myAutoHilight)
   {
@@ -1020,43 +986,6 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
     UpdateCurrentViewer();
 }
 
-// =======================================================================
-// function : SetSelectedState
-// purpose  :
-// =======================================================================
-Standard_Boolean AIS_InteractiveContext::SetSelectedState (const Handle(SelectMgr_EntityOwner)& theEntity,
-                                                           const Standard_Boolean theIsSelected)
-{
-  if (theEntity.IsNull())
-  {
-    throw Standard_ProgramError ("Internal error: AIS_InteractiveContext::SetSelectedState() called with NO object");
-  }
-
-  if (!theEntity->HasSelectable()
-    || mySelection->IsSelected (theEntity) == theIsSelected)
-  {
-    return false;
-  }
-
-  if (theEntity->IsAutoHilight())
-  {
-    AddOrRemoveSelected (theEntity, false);
-    return true;
-  }
-
-  if (theIsSelected)
-  {
-    const AIS_SelectStatus aSelStatus = mySelection->AddSelect (theEntity);
-    theEntity->SetSelected (true);
-    return aSelStatus == AIS_SS_Added;
-  }
-  else
-  {
-    const AIS_SelectStatus aSelStatus = mySelection->Select (theEntity);
-    theEntity->SetSelected (false);
-    return aSelStatus == AIS_SS_Removed;
-  }
-}
 
 //=======================================================================
 //function : IsSelected
@@ -1170,9 +1099,9 @@ void AIS_InteractiveContext::EntityOwners(Handle(SelectMgr_IndexedMapOfOwner)& t
 
     for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (aSel->Entities()); aSelEntIter.More(); aSelEntIter.Next())
     {
-      if (Handle(Select3D_SensitiveEntity) aEntity = aSelEntIter.Value()->BaseSensitive())
+      if (Handle(SelectBasics_SensitiveEntity) aEntity = aSelEntIter.Value()->BaseSensitive())
       {
-        if (const Handle(SelectMgr_EntityOwner)& aOwner = aEntity->OwnerId())
+        if (Handle(SelectMgr_EntityOwner) aOwner = Handle(SelectMgr_EntityOwner)::DownCast(aEntity->OwnerId()))
         {
           theOwners->Add (aOwner);
         }
@@ -1227,6 +1156,7 @@ Standard_Integer AIS_InteractiveContext::HilightNextDetected (const Handle(V3d_V
 
   highlightWithColor (anOwner, theView->Viewer());
   myLastPicked = anOwner;
+  myLastinMain = myLastPicked;
 
   if (theToRedrawImmediate)
   {
@@ -1262,6 +1192,7 @@ Standard_Integer AIS_InteractiveContext::HilightPreviousDetected (const Handle(V
 
   highlightWithColor (anOwner, theView->Viewer());
   myLastPicked = anOwner;
+  myLastinMain = myLastPicked;
 
   if (theToRedrawImmediate)
   {

src/AIS/AIS_InteractiveContext_2.cxx

@@ -419,7 +419,7 @@ Standard_Boolean AIS_InteractiveContext::ImmediateAdd (const Handle(AIS_Interact
     return Standard_False;
   }
 
-  myMainPM->AddToImmediateList (myMainPM->Presentation (theObj, theMode));
+  myMainPM->AddToImmediateList (myMainPM->Presentation (theObj, theMode)->Presentation());
   return Standard_True;
 }
 

src/AIS/AIS_InteractiveObject.cxx

@@ -16,20 +16,32 @@
 
 #include <AIS_InteractiveObject.hxx>
 
+#include <AIS_GraphicTool.hxx>
 #include <AIS_InteractiveContext.hxx>
+#include <Aspect_PolygonOffsetMode.hxx>
+#include <Bnd_Box.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_AspectText3d.hxx>
+#include <Graphic3d_BndBox4f.hxx>
 #include <Graphic3d_CStructure.hxx>
 #include <Graphic3d_Group.hxx>
+#include <Graphic3d_MaterialAspect.hxx>
 #include <Graphic3d_Structure.hxx>
+#include <Prs3d_BasicAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
+#include <Prs3d_Root.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_TextAspect.hxx>
-#include <PrsMgr_PresentationManager.hxx>
+#include <PrsMgr_ModedPresentation.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <Quantity_Color.hxx>
+#include <Standard_Transient.hxx>
+#include <Standard_Type.hxx>
+#include <TColStd_ListIteratorOfListOfInteger.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
 
@@ -39,9 +51,15 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
 //=======================================================================
 AIS_InteractiveObject::AIS_InteractiveObject (const PrsMgr_TypeOfPresentation3d aTypeOfPresentation3d)
 : SelectMgr_SelectableObject (aTypeOfPresentation3d),
-  myCTXPtr (NULL)
+  myCTXPtr (NULL),
+  myOwnWidth (0.0),
+  myCurrentFacingModel (Aspect_TOFM_BOTH_SIDE),
+  myInfiniteState (Standard_False),
+  hasOwnColor (Standard_False),
+  hasOwnMaterial (Standard_False),
+  myRecomputeEveryPrs (Standard_True)
 {
-  //
+  SetCurrentFacingModel();
 }
 
 //=======================================================================
@@ -56,6 +74,30 @@ void AIS_InteractiveObject::Redisplay (const Standard_Boolean AllModes)
   myCTXPtr->Redisplay (this, Standard_False, AllModes);
 }
 
+//=======================================================================
+//function : Type
+//purpose  : 
+//=======================================================================
+
+AIS_KindOfInteractive AIS_InteractiveObject::Type() const 
+{return AIS_KOI_None;}
+
+//=======================================================================
+//function : Signature
+//purpose  : 
+//=======================================================================
+
+Standard_Integer AIS_InteractiveObject::Signature() const 
+{return -1;}
+
+//=======================================================================
+//function : RecomputeEveryPrs
+//purpose  : 
+//=======================================================================
+
+Standard_Boolean  AIS_InteractiveObject::RecomputeEveryPrs() const 
+{return myRecomputeEveryPrs;}
+
 //=======================================================================
 //function : 
 //purpose  : 
@@ -83,6 +125,274 @@ void AIS_InteractiveObject::SetContext (const Handle(AIS_InteractiveContext)& th
   }
 }
 
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+Standard_Boolean AIS_InteractiveObject::HasOwner() const 
+{
+  return (!myOwner.IsNull());
+}
+
+
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::ClearOwner()
+{
+  myOwner.Nullify();
+}
+
+//=======================================================================
+//function : SetDisplayMode
+//purpose  :
+//=======================================================================
+void AIS_InteractiveObject::SetDisplayMode (const Standard_Integer theMode)
+{
+  if (AcceptDisplayMode (theMode))
+  {
+    myDrawer->SetDisplayMode (theMode);
+  }
+}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::SetCurrentFacingModel(const Aspect_TypeOfFacingModel aModel) {
+  myCurrentFacingModel = aModel;
+}
+
+//=======================================================================
+//function : CurrentFacingModel
+//purpose  : 
+//=======================================================================
+
+Aspect_TypeOfFacingModel AIS_InteractiveObject::CurrentFacingModel() const {
+  return myCurrentFacingModel;
+}
+
+//=======================================================================
+//function : SetColor
+//purpose  : 
+//=======================================================================
+
+void AIS_InteractiveObject::SetColor(const Quantity_Color& theColor)
+{
+  myDrawer->SetColor (theColor);
+  hasOwnColor = Standard_True;
+}
+
+//=======================================================================
+//function : UnsetColor
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::UnsetColor()
+{
+  hasOwnColor = Standard_False;
+}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::SetWidth(const Standard_Real aValue)
+{
+  myOwnWidth = aValue;
+}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::UnsetWidth()
+{
+  myOwnWidth = 0.;
+}
+
+//=======================================================================
+//function : Material
+//purpose  :
+//=======================================================================
+Graphic3d_NameOfMaterial AIS_InteractiveObject::Material() const
+{
+  return myDrawer->ShadingAspect()->Material().Name();
+}
+
+//=======================================================================
+//function : SetMaterial
+//purpose  :
+//=======================================================================
+void AIS_InteractiveObject::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
+{
+  if (!myDrawer->HasOwnShadingAspect())
+  {
+    myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
+    if (myDrawer->HasLink())
+    {
+      *myDrawer->ShadingAspect()->Aspect() = *myDrawer->Link()->ShadingAspect()->Aspect();
+    }
+  }
+
+  myDrawer->ShadingAspect()->SetMaterial (theMaterial);
+  hasOwnMaterial = Standard_True;
+}
+
+//=======================================================================
+//function : UnsetMaterial
+//purpose  :
+//=======================================================================
+void AIS_InteractiveObject::UnsetMaterial()
+{
+  if (!HasMaterial())
+  {
+    return;
+  }
+
+  if (HasColor() || IsTransparent())
+  {
+    if(myDrawer->HasLink())
+    {
+      myDrawer->ShadingAspect()->SetMaterial (AIS_GraphicTool::GetMaterial (myDrawer->Link()));
+    }
+
+    if (HasColor())
+    {
+      SetColor (myDrawer->Color());
+    }
+
+    if (IsTransparent())
+    {
+      SetTransparency (myDrawer->Transparency());
+    }
+  }
+  else
+  {
+    Handle(Prs3d_ShadingAspect) anAspect;
+    myDrawer->SetShadingAspect (anAspect);
+  }
+
+  hasOwnMaterial = Standard_False;
+}
+
+//=======================================================================
+//function : SetTransparency
+//purpose  :
+//=======================================================================
+void AIS_InteractiveObject::SetTransparency (const Standard_Real theValue)
+{
+  if (!myDrawer->HasOwnShadingAspect())
+  {
+    myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
+    if(myDrawer->HasLink())
+      myDrawer->ShadingAspect()->SetMaterial(AIS_GraphicTool::GetMaterial(myDrawer->Link()));
+  }
+
+  myDrawer->ShadingAspect()->Aspect()->ChangeFrontMaterial().SetTransparency (Standard_ShortReal(theValue));
+  myDrawer->ShadingAspect()->Aspect()->ChangeBackMaterial() .SetTransparency (Standard_ShortReal(theValue));
+  myDrawer->SetTransparency (Standard_ShortReal(theValue));
+}
+
+//=======================================================================
+//function : UnsetTransparency
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::UnsetTransparency()
+{
+  if(HasColor() || HasMaterial() )
+  {
+    myDrawer->ShadingAspect()->Aspect()->ChangeFrontMaterial().SetTransparency (0.0f);
+    myDrawer->ShadingAspect()->Aspect()->ChangeBackMaterial() .SetTransparency (0.0f);
+  }
+  else{
+    Handle (Prs3d_ShadingAspect) SA;
+    myDrawer->SetShadingAspect(SA);
+  }
+  myDrawer->SetTransparency (0.0f);
+}
+//=======================================================================
+//function : Transparency
+//purpose  : 
+//=======================================================================
+Standard_Real AIS_InteractiveObject::Transparency() const 
+{
+  return (myDrawer->Transparency() <= 0.005f ? 0.0 : myDrawer->Transparency());
+// Graphic3d_MaterialAspect Mat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
+// return Mat.Transparency();
+}
+
+//=======================================================================
+//function : UnsetAttributes
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::UnsetAttributes()
+{
+  SelectMgr_SelectableObject::UnsetAttributes();
+
+  hasOwnColor    = Standard_False;
+  hasOwnMaterial = Standard_False;
+  myOwnWidth     = 0.0;
+  myDrawer->SetTransparency (0.0f);
+}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::MustRecomputePrs(const Standard_Integer ) const 
+{}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+const TColStd_ListOfInteger& AIS_InteractiveObject::ListOfRecomputeModes() const 
+{return myToRecomputeModes;}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::SetRecomputeOk()
+{myToRecomputeModes.Clear();}
+
+
+//=======================================================================
+//function : AcceptDisplayMode
+//purpose  : 
+//=======================================================================
+
+Standard_Boolean  AIS_InteractiveObject::AcceptDisplayMode(const Standard_Integer ) const
+{return Standard_True;}
+
+//=======================================================================
+//function : DefaultDisplayMode
+//purpose  : 
+//=======================================================================
+
+Standard_Integer AIS_InteractiveObject::DefaultDisplayMode() const
+{return 0;}
+
+
+//=======================================================================
+//function : SetInfiniteState
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::SetInfiniteState(const Standard_Boolean aFlag)
+{
+  myInfiniteState = aFlag;
+  Handle(Prs3d_Presentation) P;
+
+  for(Standard_Integer i =1; i<=myPresentations.Length();i++)
+  {
+    P = myPresentations(i).Presentation()->Presentation();
+    if(!P.IsNull())
+      P->SetInfiniteState(myInfiniteState);
+  }
+}
+
 //=======================================================================
 //function : HasPresentation
 //purpose  :
@@ -105,41 +415,210 @@ Handle(Prs3d_Presentation) AIS_InteractiveObject::Presentation() const
   }
 
   Handle(PrsMgr_Presentation) aPrs = myCTXPtr->MainPrsMgr()->Presentation (this, myDrawer->DisplayMode(), false);
-  return aPrs;
+  return !aPrs.IsNull()
+       ? aPrs->Presentation()
+       : Handle(Prs3d_Presentation)();
 }
 
 //=======================================================================
 //function : SetAspect 
 //purpose  : 
 //=======================================================================
-void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& theAspect)
+void AIS_InteractiveObject::SetAspect(const Handle(Prs3d_BasicAspect)& anAspect)
 {
 
-  if (!HasPresentation())
+  if( HasPresentation() ) {
+    Handle(Prs3d_Presentation) prs = Presentation();
+    { Handle(Prs3d_ShadingAspect) aspect =
+			Handle(Prs3d_ShadingAspect)::DownCast(anAspect);
+      if( !aspect.IsNull() ) {
+        Prs3d_Root::CurrentGroup(prs)->SetGroupPrimitivesAspect(aspect->Aspect());
+        return;
+      }
+    }
+    { Handle(Prs3d_LineAspect) aspect =
+			Handle(Prs3d_LineAspect)::DownCast(anAspect);
+      if( !aspect.IsNull() ) {
+        Prs3d_Root::CurrentGroup(prs)->SetGroupPrimitivesAspect(aspect->Aspect());
+        return;
+      }
+    }
+    { Handle(Prs3d_PointAspect) aspect =
+			Handle(Prs3d_PointAspect)::DownCast(anAspect);
+      if( !aspect.IsNull() ) {
+        Prs3d_Root::CurrentGroup(prs)->SetGroupPrimitivesAspect(aspect->Aspect());
+        return;
+      }
+    }
+    { Handle(Prs3d_TextAspect) aspect =
+			Handle(Prs3d_TextAspect)::DownCast(anAspect);
+      if( !aspect.IsNull() ) {
+        Prs3d_Root::CurrentGroup(prs)->SetGroupPrimitivesAspect(aspect->Aspect());
+        return;
+      }
+    }
+  }
+}
+
+//=======================================================================
+//function : SetPolygonOffsets 
+//purpose  : 
+//======================================================================= 
+void AIS_InteractiveObject::SetPolygonOffsets(const Standard_Integer    aMode,
+                                              const Standard_ShortReal  aFactor,
+                                              const Standard_ShortReal  aUnits) 
 {
+  if ( !HasPolygonOffsets() )
+    myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
+
+  myDrawer->ShadingAspect()->Aspect()->SetPolygonOffsets( aMode, aFactor, aUnits );
+
+  // Modify existing presentations 
+  for (Standard_Integer aPrsIter = 1, n = myPresentations.Length(); aPrsIter <= n; ++aPrsIter)
+  {
+    const Handle(PrsMgr_Presentation)& aPrs3d = myPresentations (aPrsIter).Presentation();
+    if ( !aPrs3d.IsNull() ) {
+      const Handle(Graphic3d_Structure)& aStruct = aPrs3d->Presentation();
+      if( !aStruct.IsNull() ) {
+        // Workaround for issue 23115: Need to update also groups, because their
+        // face aspect ALWAYS overrides the structure's.
+        const Graphic3d_SequenceOfGroup& aGroups = aStruct->Groups();
+        for (Graphic3d_SequenceOfGroup::Iterator aGroupIter (aGroups); aGroupIter.More(); aGroupIter.Next())
+        {
+          Handle(Graphic3d_Group)& aGrp = aGroupIter.ChangeValue();
+          if (aGrp.IsNull()
+          || !aGrp->IsGroupPrimitivesAspectSet (Graphic3d_ASPECT_FILL_AREA))
+          {
+            continue;
+          }
+
+          Handle(Graphic3d_AspectFillArea3d) aFaceAsp = aGrp->FillAreaAspect();
+          aFaceAsp->SetPolygonOffsets(aMode, aFactor, aUnits);
+          aGrp->SetGroupPrimitivesAspect(aFaceAsp);
+        }
+      }
+    }
+  }
+}
+
+//=======================================================================
+//function : HasPolygonOffsets 
+//purpose  : 
+//=======================================================================
+Standard_Boolean AIS_InteractiveObject::HasPolygonOffsets() const
+{
+  return !( myDrawer->ShadingAspect().IsNull() || 
+          ( myDrawer->HasLink() &&
+          myDrawer->ShadingAspect() == myDrawer->Link()->ShadingAspect() ) );
+}
+
+//=======================================================================
+//function : PolygonOffsets 
+//purpose  : 
+//=======================================================================
+void AIS_InteractiveObject::PolygonOffsets(Standard_Integer&    aMode,
+                                           Standard_ShortReal&  aFactor,
+                                           Standard_ShortReal&  aUnits) const 
+{
+  if( HasPolygonOffsets() )
+    myDrawer->ShadingAspect()->Aspect()->PolygonOffsets( aMode, aFactor, aUnits );
+}
+
+//=======================================================================
+//function : BoundingBox
+//purpose  : Returns bounding box of object correspondingly to its
+//           current display mode
+//=======================================================================
+void AIS_InteractiveObject::BoundingBox (Bnd_Box& theBndBox)
+{
+  if (myDrawer->DisplayMode() == -1)
+  {
+    if (!myPresentations.IsEmpty())
+    {
+      const Handle(PrsMgr_Presentation)& aPrs3d = myPresentations.First().Presentation();
+      const Handle(Graphic3d_Structure)& aStruct = aPrs3d->Presentation();
+      const Graphic3d_BndBox3d& aBndBox = aStruct->CStructure()->BoundingBox();
+
+      if (!aBndBox.IsValid())
+      {
+        theBndBox.SetVoid();
         return;
       }
 
-  Handle(Prs3d_Presentation) aPrs = Presentation();
-  if (aPrs->Groups().IsEmpty())
-  {
+      theBndBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(),
+                        aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z());
       return;
     }
-  const Handle(Graphic3d_Group)& aGroup = aPrs->Groups().Last();
-  if (Handle(Prs3d_ShadingAspect) aShadingAspect = Handle(Prs3d_ShadingAspect)::DownCast(theAspect))
+    else
     {
-    aGroup->SetGroupPrimitivesAspect (aShadingAspect->Aspect());
-  }
-  else if (Handle(Prs3d_LineAspect) aLineAspect = Handle(Prs3d_LineAspect)::DownCast(theAspect))
+      for (PrsMgr_ListOfPresentableObjectsIter aPrsIter (Children()); aPrsIter.More(); aPrsIter.Next())
       {
-    aGroup->SetGroupPrimitivesAspect (aLineAspect->Aspect());
-  }
-  else if (Handle(Prs3d_PointAspect) aPointAspect = Handle(Prs3d_PointAspect)::DownCast(theAspect))
+        Handle(AIS_InteractiveObject) aChild (Handle(AIS_InteractiveObject)::DownCast (aPrsIter.Value()));
+        if (aChild.IsNull())
         {
-    aGroup->SetGroupPrimitivesAspect (aPointAspect->Aspect());
+          continue;
         }
-  else if (Handle(Prs3d_TextAspect) aTextAspect = Handle(Prs3d_TextAspect)::DownCast(theAspect))
+        Bnd_Box aBox;
+        aChild->BoundingBox (aBox);
+        theBndBox.Add (aBox);
+      }
+      return;
+    }
+  }
+  else
   {
-    aGroup->SetGroupPrimitivesAspect (aTextAspect->Aspect());
+    for (Standard_Integer aPrsIter = 1; aPrsIter <= myPresentations.Length(); ++aPrsIter)
+    {
+      if (myPresentations (aPrsIter).Mode() == myDrawer->DisplayMode())
+      {
+        const Handle(PrsMgr_Presentation)& aPrs3d = myPresentations (aPrsIter).Presentation();
+        const Handle(Graphic3d_Structure)& aStruct = aPrs3d->Presentation();
+        const Graphic3d_BndBox3d& aBndBox = aStruct->CStructure()->BoundingBox();
+
+        if (!aBndBox.IsValid())
+        {
+          theBndBox.SetVoid();
+          return;
+        }
+
+        theBndBox.Update (aBndBox.CornerMin().x(), aBndBox.CornerMin().y(), aBndBox.CornerMin().z(),
+                          aBndBox.CornerMax().x(), aBndBox.CornerMax().y(), aBndBox.CornerMax().z());
+        return;
+      }
+    }
+  }
+}
+
+//=======================================================================
+//function : SetIsoOnTriangulation
+//purpose  : Enables or disables isoline on triangulation building
+//=======================================================================
+void AIS_InteractiveObject::SetIsoOnTriangulation (const Standard_Boolean theIsEnabled)
+{
+  myDrawer->SetIsoOnTriangulation (theIsEnabled);
+}
+
+//=======================================================================
+//function : SynchronizeAspects
+//purpose  :
+//=======================================================================
+void AIS_InteractiveObject::SynchronizeAspects()
+{
+  for (PrsMgr_Presentations::Iterator aPrsIter (myPresentations); aPrsIter.More(); aPrsIter.Next())
+  {
+    const Handle(PrsMgr_Presentation)& aPrs3d = aPrsIter.ChangeValue().Presentation();
+    if (aPrs3d.IsNull()
+     || aPrs3d->Presentation().IsNull())
+    {
+      continue;
+    }
+
+    for (Graphic3d_SequenceOfGroup::Iterator aGroupIter (aPrs3d->Presentation()->Groups()); aGroupIter.More(); aGroupIter.Next())
+    {
+      if (!aGroupIter.Value().IsNull())
+      {
+        aGroupIter.ChangeValue()->SynchronizeAspects();
+      }
+    }
   }
 }

src/AIS/AIS_InteractiveObject.hxx

@@ -17,39 +17,73 @@
 #ifndef _AIS_InteractiveObject_HeaderFile
 #define _AIS_InteractiveObject_HeaderFile
 
+#include <Aspect_TypeOfFacingModel.hxx>
 #include <AIS_KindOfInteractive.hxx>
+#include <Graphic3d_NameOfMaterial.hxx>
+#include <PrsMgr_TypeOfPresentation3d.hxx>
 #include <SelectMgr_SelectableObject.hxx>
+#include <TColStd_ListOfInteger.hxx>
+#include <TColStd_ListOfTransient.hxx>
+#include <Quantity_Color.hxx>
 
 class AIS_InteractiveContext;
 class Graphic3d_MaterialAspect;
+class Prs3d_Presentation;
 class Prs3d_BasicAspect;
 class Bnd_Box;
 
 //! Defines a class of objects with display and selection services.
-//! Entities which are visualized and selected are Interactive Objects.
-//! Specific attributes of entities such as arrow aspect for dimensions must be loaded in a Prs3d_Drawer.
-//!
-//! You can make use of classes of standard Interactive Objects for which all necessary methods have already been programmed,
-//! or you can implement your own classes of Interactive Objects.
-//! Key interface methods to be implemented by every Interactive Object:
-//! * Presentable Object (PrsMgr_PresentableObject)
-//!   Consider defining an enumeration of supported Display Mode indexes for particular Interactive Object or class of Interactive Objects.
-//!   - AcceptDisplayMode() accepting display modes implemented by this object;
-//!   - Compute() computing presentation for the given display mode index;
-//! * Selectable Object (SelectMgr_SelectableObject)
-//!   Consider defining an enumeration of supported Selection Mode indexes for particular Interactive Object or class of Interactive Objects.
-//!   - ComputeSelection() computing selectable entities for the given selection mode index.
+//! Entities which are visualized and selected are
+//! Interactive Objects. You can make use of classes of
+//! standard Interactive Objects for which all necessary
+//! methods have already been programmed, or you can
+//! implement your own classes of Interactive Objects.
+//! Specific attributes of entities such as arrow aspect for
+//! dimensions must be loaded in a Drawer. This Drawer
+//! is then applied to the Interactive Object in view.
+//! There are four types of Interactive Object in AIS: the
+//! construction element or Datum, the Relation, which
+//! includes both dimensions and constraints, the Object,
+//! and finally, when the object is of an unknown type, the None type.
+//! Inside these categories, a signature, or index,
+//! provides the possibility of additional characterization.
+//! By default, the Interactive Object has a None type
+//! and a signature of 0. If you want to give a particular
+//! type and signature to your interactive object, you must
+//! redefine the methods, Signature and Type.
+//! Warning
+//! In the case of attribute methods, methods for
+//! standard attributes are virtual. They must be
+//! redefined   by the inheriting classes. Setcolor for a
+//! point and Setcolor for a plane, for example, do not
+//! affect the same attributes in the Drawer.
 class AIS_InteractiveObject : public SelectMgr_SelectableObject
 {
   friend class AIS_InteractiveContext;
   DEFINE_STANDARD_RTTIEXT(AIS_InteractiveObject, SelectMgr_SelectableObject)
 public:
 
-  //! Returns the kind of Interactive Object; AIS_KOI_None by default.
-  virtual AIS_KindOfInteractive Type() const { return AIS_KOI_None; }
+  //! Returns the kind of Interactive Object:
+  //! -   None
+  //! -   Datum
+  //! -   Relation
+  //! -   Object
+  //! By default, the   interactive object has a None type.
+  //! Because specific shapes entail different behavior
+  //! according to their sub-shapes, you may need to
+  //! create a Local Context. This will allow you to
+  //! specify the additional characteristics which you
+  //! need to handle these shapes.
+  Standard_EXPORT virtual AIS_KindOfInteractive Type() const;
   
-  //! Specifies additional characteristics of Interactive Object of Type(); -1 by default.
-  //! Among the datums, this signature is attributed to the shape.
+  //! Specifies additional characteristics of Interactive
+  //! Objects. A signature is, in fact, an index with integer
+  //! values assigned different properties.
+  //! This method is frequently used in conjuction with
+  //! Type to give a particular type and signature to an
+  //! Interactive Object. By default, the Interactive Object
+  //! has a None type and a signature of 0. Among the
+  //! datums, this signature is attributed to the shape
   //! The remaining datums have the following default signatures:
   //! -   Point                   signature 1
   //! -   Axis                     signature 2
@@ -58,7 +92,64 @@ public:
   //! -   Line                     signature 5
   //! -   Circle                  signature 6
   //! -   Plane                   signature 7.
-  virtual Standard_Integer Signature() const { return -1; }
+  Standard_EXPORT virtual Standard_Integer Signature() const;
+  
+  //! Informs the graphic context that the interactive Object
+  //! may be decomposed into sub-shapes for dynamic selection.
+  //! The most used Interactive Object is AIS_Shape.
+  //! Activation methods for standard selection modes are
+  //! proposed in the Interactive Context. These include
+  //! selection by vertex or by edges. For datums with the
+  //! same behavior as AIS_Shape, such as vetices and
+  //! edges, we must redefine the virtual method so that
+  //! AcceptShapeDecomposition returns false.
+  //! Rule for selection :
+  //! Mode 0 :  Selection of  the interactive Object itself
+  //! Mode 1 :  Selection of vertices
+  //! Mode 2 :  Selection Of Edges
+  //! Mode 3 :  Selection Of Wires
+  //! Mode 4 :  Selection Of Faces ...
+  virtual Standard_Boolean AcceptShapeDecomposition() const { return Standard_False; }
+
+  //! change the current facing model apply on polygons for
+  //! SetColor(), SetTransparency(), SetMaterial() methods
+  //! default facing model is Aspect_TOFM_TWO_SIDE. This mean that attributes is
+  //! applying both on the front and back face.
+  Standard_EXPORT void SetCurrentFacingModel (const Aspect_TypeOfFacingModel aModel = Aspect_TOFM_BOTH_SIDE);
+  
+  //! Returns the current facing model which is in effect.
+  Standard_EXPORT Aspect_TypeOfFacingModel CurrentFacingModel() const;
+
+  //! Only the interactive object knowns which Drawer attribute is affected by the color, if any
+  //! (ex: for a wire,it's the wireaspect field of the drawer, but for a vertex, only the point aspect field is affected by the color).
+  //! WARNING : Do not forget to set the corresponding fields here (hasOwnColor and myDrawer->SetColor())
+  Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor);
+
+  //! Removes color settings. Only the Interactive Object
+  //! knows which Drawer attribute is   affected by the color
+  //! setting. For a wire, for example, wire aspect is the
+  //! attribute affected. For a vertex, however, only point
+  //! aspect is affected by the color setting.
+  Standard_EXPORT virtual void UnsetColor();
+  
+  //! Allows you to provide the setting aValue for width.
+  //! Only the Interactive Object knows which Drawer
+  //! attribute is affected by the width setting.
+  Standard_EXPORT virtual void SetWidth (const Standard_Real aValue);
+  
+  Standard_EXPORT virtual void UnsetWidth();
+  
+  //! Returns true if the class of objects accepts the display mode aMode.
+  //! The interactive context can have a default mode of
+  //! representation for the set of Interactive Objects. This
+  //! mode may not be accepted by a given class of
+  //! objects. Consequently, this virtual method allowing us
+  //! to get information about the class in question must be implemented.
+  Standard_EXPORT virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer aMode) const;
+  
+  //! Returns the default display mode. This method is to
+  //! be implemented when the main mode is not mode 0.
+  Standard_EXPORT virtual Standard_Integer DefaultDisplayMode() const;
   
   //! Updates the active presentation; if <AllModes> = Standard_True
   //! all the presentations inside are recomputed.
@@ -68,19 +159,32 @@ public:
   //! so this class field must be up to date for proper result.
   Standard_EXPORT void Redisplay (const Standard_Boolean AllModes = Standard_False);
   
+  //! Sets the infinite state flag aFlage.
+  //! if   <aFlag>   = True  ,  the   interactiveObject  is
+  //! considered as infinite, i.e. its graphic presentations
+  //! are not taken in account for View FitAll...
+  Standard_EXPORT void SetInfiniteState (const Standard_Boolean aFlag = Standard_True);
+
+  //! Returns true if the interactive object is infinite. In this
+  //! case, its graphic presentations are not taken into
+  //! account in the fit-all view.
+  Standard_Boolean IsInfinite() const { return myInfiniteState; }
+
   //! Indicates whether the Interactive Object has a pointer to an interactive context.
   Standard_Boolean HasInteractiveContext() const { return myCTXPtr != NULL; }
 
   //! Returns the context pointer to the interactive context.
-  AIS_InteractiveContext* InteractiveContext() const { return myCTXPtr; }
+  Standard_EXPORT Handle(AIS_InteractiveContext) GetContext() const;
   
   //! Sets the interactive context aCtx and provides a link
   //! to the default drawing tool or "Drawer" if there is none.
   Standard_EXPORT virtual void SetContext (const Handle(AIS_InteractiveContext)& aCtx);
   
   //! Returns true if the object has an owner attributed to it.
-  //! The owner can be a shape for a set of sub-shapes or a sub-shape for sub-shapes which it is composed of, and takes the form of a transient.
-  Standard_Boolean HasOwner() const { return !myOwner.IsNull(); }
+  //! The owner can be a shape for a set of sub-shapes or
+  //! a sub-shape for sub-shapes which it is composed of,
+  //! and takes the form of a transient.
+  Standard_EXPORT Standard_Boolean HasOwner() const;
   
   //! Returns the owner of the Interactive Object.
   //! The owner can be a shape for a set of sub-shapes or
@@ -99,35 +203,219 @@ public:
   //! is composed of. The owner takes the form of a transient.
   void SetOwner (const Handle(Standard_Transient)& theApplicativeEntity) { myOwner = theApplicativeEntity; }
 
-  //! Each Interactive Object has methods which allow us to attribute an Owner to it in the form of a Transient.
+  //! Each Interactive Object has methods which allow us
+  //! to attribute an Owner to it in the form of a Transient.
   //! This method removes the owner from the graphic entity.
-  void ClearOwner() { myOwner.Nullify(); }
+  Standard_EXPORT void ClearOwner();
 
-public:
+  //! Returns true if the Interactive Object has a display
+  //! mode setting. Otherwise, it is displayed in Neutral Point.
+  Standard_Boolean HasDisplayMode() const { return myDrawer->DisplayMode() != -1; }
 
-  //! Returns the context pointer to the interactive context.
-  Standard_EXPORT Handle(AIS_InteractiveContext) GetContext() const;
+  //! Sets the display mode aMode for the interactive object.
+  //! An object can have its own temporary display mode,
+  //! which is different from that proposed by the interactive context.
+  //! The range of possibilities currently proposed is the following:
+  //! -   AIS_WireFrame
+  //! -   AIS_Shaded
+  //! This range can, however, be extended through the creation of new display modes.
+  Standard_EXPORT void SetDisplayMode (const Standard_Integer aMode);
 
-  //! Returns TRUE when this object has a presentation in the current DisplayMode()
+  //! Removes display mode settings from the interactive object.
+  void UnsetDisplayMode() { myDrawer->SetDisplayMode (-1); }
+
+  //! Returns the display mode setting of the Interactive Object.
+  //! The range of possibilities is the following:
+  //! -   AIS_WireFrame
+  //! -   AIS_Shaded
+  //! This range can, however, be extended through the
+  //! creation of new display modes.
+  Standard_Integer DisplayMode() const { return myDrawer->DisplayMode(); }
+
+  //! Returns true if the Interactive Object is in highlight mode.
+  Standard_Boolean HasHilightMode() const { return !myHilightDrawer.IsNull() && myHilightDrawer->DisplayMode() != -1; }
+
+  //! Returns highlight display mode.
+  //! This is obsolete method for backward compatibility - use ::HilightAttributes() and ::DynamicHilightAttributes() instead.
+  Standard_Integer HilightMode() const { return !myHilightDrawer.IsNull() ? myHilightDrawer->DisplayMode() : -1; }
+
+  //! Sets highlight display mode.
+  //! This is obsolete method for backward compatibility - use ::HilightAttributes() and ::DynamicHilightAttributes() instead.
+  void SetHilightMode (const Standard_Integer theMode)
+  {
+    if (myHilightDrawer.IsNull())
+    {
+      myHilightDrawer = new Prs3d_Drawer();
+      myHilightDrawer->Link (myDrawer);
+      myHilightDrawer->SetAutoTriangulation (Standard_False);
+      myHilightDrawer->SetColor (Quantity_NOC_GRAY80);
+      myHilightDrawer->SetZLayer(Graphic3d_ZLayerId_UNKNOWN);
+    }
+    if (myDynHilightDrawer.IsNull())
+    {
+      myDynHilightDrawer = new Prs3d_Drawer();
+      myDynHilightDrawer->Link (myDrawer);
+      myDynHilightDrawer->SetColor (Quantity_NOC_CYAN1);
+      myDynHilightDrawer->SetAutoTriangulation (Standard_False);
+      myDynHilightDrawer->SetZLayer(Graphic3d_ZLayerId_Top);
+    }
+    myHilightDrawer   ->SetDisplayMode (theMode);
+    myDynHilightDrawer->SetDisplayMode (theMode);
+  }
+
+  //! Unsets highlight display mode.
+  void UnsetHilightMode()
+  {
+    if (!myHilightDrawer.IsNull())
+    {
+      myHilightDrawer->SetDisplayMode (-1);
+    }
+    if (!myDynHilightDrawer.IsNull())
+    {
+      myDynHilightDrawer->SetDisplayMode (-1);
+    }
+  }
+
+  //! Returns true if the Interactive Object has color.
+  Standard_Boolean HasColor() const { return hasOwnColor; }
+
+  //! Returns the color setting of the Interactive Object.
+  virtual void Color (Quantity_Color& theColor) const { theColor = myDrawer->Color(); }
+
+  //! Returns true if the Interactive Object has width.
+  Standard_Boolean HasWidth() const { return myOwnWidth != 0.0; }
+
+  //! Returns the width setting of the Interactive Object.
+  Standard_Real Width() const { return myOwnWidth; }
+
+  //! Returns true if the Interactive Object has a setting for material.
+  Standard_Boolean HasMaterial() const { return hasOwnMaterial; }
+
+  //! Returns the current material setting.
+  //! This will be on of the following materials:
+  //! -   Brass
+  //! -   Bronze
+  //! -   Gold
+  //! -   Pewter
+  //! -   Silver
+  //! -   Stone.
+  Standard_EXPORT virtual Graphic3d_NameOfMaterial Material() const;
+
+  //! Sets the material aMat defining this display attribute
+  //! for the interactive object.
+  //! Material aspect determines shading aspect, color and
+  //! transparency of visible entities.
+  Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& aName);
+  
+  //! Removes the setting for material.
+  Standard_EXPORT virtual void UnsetMaterial();
+  
+  //! Attributes a setting aValue for transparency.
+  //! The transparency value should be between 0.0 and 1.0.
+  //! At 0.0 an object will be totally opaque, and at 1.0, fully transparent.
+  //! Warning At a value of 1.0, there may be nothing visible.
+  Standard_EXPORT virtual void SetTransparency (const Standard_Real aValue = 0.6);
+  
+  //! Returns true if there is a transparency setting.
+  Standard_Boolean IsTransparent() const { return myDrawer->Transparency() > 0.005f; }
+
+  //! Returns the transparency setting.
+  //! This will be between 0.0 and 1.0.
+  //! At 0.0 an object will be totally opaque, and at 1.0, fully transparent.
+  Standard_EXPORT virtual Standard_Real Transparency() const;
+  
+  //! Removes the transparency setting. The object is opaque by default.
+  Standard_EXPORT virtual void UnsetTransparency();
+  
+  //! Clears settings provided by the drawing tool aDrawer.
+  Standard_EXPORT virtual void UnsetAttributes() Standard_OVERRIDE;
+
+  //! Returns TRUE when this object has a presentation
+  //! in the current DisplayMode()
   Standard_EXPORT Standard_Boolean HasPresentation() const;
   
-  //! Returns the current presentation of this object according to the current DisplayMode()
+  //! Returns the current presentation of this object
+  //! according to the current DisplayMode()
   Standard_EXPORT Handle(Prs3d_Presentation) Presentation() const;
 
   //! Sets the graphic basic aspect to the current presentation.
-  Standard_DEPRECATED("Deprecated method, results might be undefined")
   Standard_EXPORT void SetAspect (const Handle(Prs3d_BasicAspect)& anAspect);
   
+  //! Sets up polygon offsets for this object.
+  //! It modifies all existing presentations of <anObj> (if any),
+  //! so it is reasonable to call this method after <anObj> has been displayed.
+  //! Otherwise, Compute() method should pass Graphic3d_AspectFillArea3d
+  //! aspect from <myDrawer> to Graphic3d_Group to make polygon offsets work.
+  //!
+  //! <aMode> parameter can contain various combinations of
+  //! Aspect_PolygonOffsetMode enumeration elements (Aspect_POM_None means
+  //! that polygon offsets are not changed).
+  //! If <aMode> is different from Aspect_POM_Off and Aspect_POM_None, then <aFactor> and <aUnits>
+  //! arguments are used by graphic renderer to calculate a depth offset value:
+  //!
+  //! offset = <aFactor> * m + <aUnits> * r, where
+  //! m - maximum depth slope for the polygon currently being displayed,
+  //! r - minimum window coordinates depth resolution (implementation-specific).
+  //!
+  //! Deafult settings for OCC 3D viewer: mode = Aspect_POM_Fill, factor = 1., units = 0.
+  //!
+  //! Negative offset values move polygons closer to the viewport,
+  //! while positive values shift polygons away.
+  //! Consult OpenGL reference for details (glPolygonOffset function description).
+  //!
+  //! NOTE: This method has a side effect - it creates own shading aspect
+  //! if not yet created, so it is better to set up object material,
+  //! color, etc. first.
+  Standard_EXPORT virtual void SetPolygonOffsets (const Standard_Integer aMode, const Standard_ShortReal aFactor = 1.0, const Standard_ShortReal aUnits = 0.0);
+  
+  //! Returns Standard_True if <myDrawer> has non-null shading aspect
+  Standard_EXPORT virtual Standard_Boolean HasPolygonOffsets() const;
+  
+  //! Retrieves current polygon offsets settings from <myDrawer>.
+  Standard_EXPORT virtual void PolygonOffsets (Standard_Integer& aMode, Standard_ShortReal& aFactor, Standard_ShortReal& aUnits) const;
+  
+  //! Returns bounding box of object correspondingly to its current display mode.
+  Standard_EXPORT virtual void BoundingBox (Bnd_Box& theBndBox) Standard_OVERRIDE;
+
+  //! Enables or disables on-triangulation build of isolines according to the flag given.
+  Standard_EXPORT void SetIsoOnTriangulation (const Standard_Boolean theIsEnabled);
+
+  //! Synchronize presentation aspects after their modification.
+  //!
+  //! This method should be called after modifying primitive aspect properties (material, texture, shader)
+  //! so that modifications will take effect on already computed presentation groups (thus avoiding re-displaying the object).
+  Standard_EXPORT void SynchronizeAspects();
+
+private:
+
+  Standard_EXPORT virtual Standard_Boolean RecomputeEveryPrs() const;
+
+  Standard_EXPORT void MustRecomputePrs (const Standard_Integer aMode) const;
+
+  Standard_EXPORT const TColStd_ListOfInteger& ListOfRecomputeModes() const;
+
+  Standard_EXPORT void SetRecomputeOk();
+
 protected:
 
   //! The TypeOfPresention3d means that the interactive object
   //! may have a presentation dependant of the view of Display.
   Standard_EXPORT AIS_InteractiveObject(const PrsMgr_TypeOfPresentation3d aTypeOfPresentation3d = PrsMgr_TOP_AllView);
 
+private:
+
+  AIS_InteractiveContext* myCTXPtr;
+  Handle(Standard_Transient) myOwner;
+
 protected:
 
-  AIS_InteractiveContext*    myCTXPtr; //!< pointer to Interactive Context, where object is currently displayed; @sa SetContext()
-  Handle(Standard_Transient) myOwner;  //!< application-specific owner object
+  TColStd_ListOfInteger myToRecomputeModes;
+  Standard_Real myOwnWidth;
+  Aspect_TypeOfFacingModel myCurrentFacingModel;
+  Standard_Boolean myInfiniteState;
+  Standard_Boolean hasOwnColor;
+  Standard_Boolean hasOwnMaterial;
+  Standard_Boolean myRecomputeEveryPrs;
 
 };
 

src/AIS/AIS_LengthDimension.hxx

@@ -18,13 +18,37 @@
 #include <AIS_Dimension.hxx>
 #include <AIS_KindOfDimension.hxx>
 #include <Geom_Plane.hxx>
+#include <Geom_Transformation.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_Drawer.hxx>
+#include <Prs3d_Presentation.hxx>
 #include <Prs3d_Projector.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Standard.hxx>
+#include <Standard_Macro.hxx>
+#include <Standard_Type.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
+#include <TCollection_ExtendedString.hxx>
+
+class TopoDS_Face;
+class TCollection_ExtendedString;
+class gp_Pnt;
+class TopoDS_Edge;
+class TopoDS_Shape;
+class Geom_Plane;
+class Prs3d_Presentation;
+class Prs3d_Projector;
+class Geom_Transformation;
+class SelectMgr_Selection;
+class Bnd_Box;
+class gp_Dir;
+class TopoDS_Vertex;
+class Standard_Transient;
+class AIS_LengthDimension;
 
 DEFINE_STANDARD_HANDLE (AIS_LengthDimension, AIS_Dimension)
 

src/AIS/AIS_Line.cxx

@@ -41,6 +41,52 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
 
+//==================================================================
+// function: FindLimits
+// purpose:
+//==================================================================
+//unused
+/*#ifdef OCCT_DEBUG
+static void FindLimits(const Adaptor3d_Curve& aCurve,
+		       const Standard_Real  aLimit,
+		       gp_Pnt& P1,
+		       gp_Pnt& P2)
+{
+  Standard_Real First = aCurve.FirstParameter();
+  Standard_Real Last  = aCurve.LastParameter();
+  Standard_Boolean firstInf = Precision::IsNegativeInfinite(First);
+  Standard_Boolean lastInf  = Precision::IsPositiveInfinite(Last);
+  if (firstInf || lastInf) {
+    Standard_Real delta = 1;
+    if (firstInf && lastInf) {
+      do {
+	delta *= 2;
+	First = - delta;
+	Last  =   delta;
+	aCurve.D0(First,P1);
+	aCurve.D0(Last,P2);
+      } while (P1.Distance(P2) < aLimit);
+    }
+    else if (firstInf) {
+      aCurve.D0(Last,P2);
+      do {
+	delta *= 2;
+	First = Last - delta;
+	aCurve.D0(First,P1);
+      } while (P1.Distance(P2) < aLimit);
+    }
+    else if (lastInf) {
+      aCurve.D0(First,P1);
+      do {
+	delta *= 2;
+	Last = First + delta;
+	aCurve.D0(Last,P2);
+      } while (P1.Distance(P2) < aLimit);
+    }
+  }    
+}
+#endif
+*/
 //=======================================================================
 //function : AIS_Line
 //purpose  : 
@@ -80,6 +126,7 @@ void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 
 void AIS_Line::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
 {
+// throw Standard_NotImplemented("AIS_Line::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ;
 }
 
@@ -105,29 +152,6 @@ void AIS_Line::ComputeSelection(const Handle(SelectMgr_Selection)& theSelection,
   }
 }
 
-//=======================================================================
-//function : replaceWithNewLineAspect
-//purpose  :
-//=======================================================================
-void AIS_Line::replaceWithNewLineAspect (const Handle(Prs3d_LineAspect)& theAspect)
-{
-  if (!myDrawer->HasLink())
-  {
-    myDrawer->SetLineAspect (theAspect);
-    return;
-  }
-
-  const Handle(Graphic3d_Aspects)& anAspectOld = myDrawer->LineAspect()->Aspect();
-  const Handle(Graphic3d_Aspects)& 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  :
@@ -142,14 +166,9 @@ void AIS_Line::SetColor(const Quantity_Color &aCol)
                                  AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) : 1.;
 
   if (!myDrawer->HasOwnLineAspect ())
-  {
-    replaceWithNewLineAspect (new Prs3d_LineAspect (aCol, Aspect_TOL_SOLID, WW));
-  }
+    myDrawer->SetLineAspect (new Prs3d_LineAspect(aCol,Aspect_TOL_SOLID,WW));
   else
-  {
     myDrawer->LineAspect()->SetColor(aCol);
-    SynchronizeAspects();
-  }
 }
 
 
@@ -161,18 +180,15 @@ void AIS_Line::UnsetColor()
 {
   hasOwnColor = Standard_False;
 
-  if (!HasWidth())
-  {
-    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
-  }
-  else
-  {
+  Handle(Prs3d_LineAspect) NullAsp;
+
+  if (!HasWidth()) myDrawer->SetLineAspect(NullAsp);
+  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();
  }
 }
 
@@ -182,20 +198,15 @@ void AIS_Line::UnsetColor()
 //=======================================================================
 void AIS_Line::SetWidth(const Standard_Real aValue)
 {
-  myOwnWidth = (Standard_ShortReal )aValue;
+  myOwnWidth=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);
-    replaceWithNewLineAspect (new Prs3d_LineAspect (CC, Aspect_TOL_SOLID, aValue));
-  }
-  else
-  {
+    myDrawer->SetLineAspect (new Prs3d_LineAspect (CC, Aspect_TOL_SOLID, aValue));
+  } else
     myDrawer->LineAspect()->SetWidth(aValue);
-    SynchronizeAspects();
-  }
 }
 
 
@@ -205,16 +216,14 @@ void AIS_Line::SetWidth(const Standard_Real aValue)
 //=======================================================================
 void AIS_Line::UnsetWidth()
 {
-  if (!HasColor())
-  {
-    replaceWithNewLineAspect (Handle(Prs3d_LineAspect)());
-  }
-  else
-  {
-   Standard_ShortReal WW = myDrawer->HasLink() ? (Standard_ShortReal )AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) : 1.0f;
+  Handle(Prs3d_LineAspect) NullAsp;
+
+  if (!HasColor()) myDrawer->SetLineAspect(NullAsp);
+  else{
+   Standard_Real WW = myDrawer->HasLink() ?
+     AIS_GraphicTool::GetLineWidth (myDrawer->Link(), AIS_TOA_Line) : 1.;
    myDrawer->LineAspect()->SetWidth(WW);
    myOwnWidth = WW;
-   SynchronizeAspects();
   }
 }
 

src/AIS/AIS_Line.hxx

@@ -107,9 +107,6 @@ private:
   
   Standard_EXPORT void ComputeSegmentLineSelection (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_Line) myComponent;

src/AIS/AIS_Manipulator.cxx

@@ -26,7 +26,6 @@
 #include <Prs3d_Root.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_ToolDisk.hxx>
-#include <Prs3d_ToolSector.hxx>
 #include <Prs3d_ToolSphere.hxx>
 #include <Select3D_SensitiveCircle.hxx>
 #include <Select3D_SensitivePoint.hxx>
@@ -85,7 +84,7 @@ namespace
   {
   public:
     //! Main constructor.
-    ManipSensCircle (const Handle(SelectMgr_EntityOwner)& theOwnerId,
+    ManipSensCircle (const Handle(SelectBasics_EntityOwner)& theOwnerId,
                      const Handle(Geom_Circle)& theCircle,
                      const Standard_Integer theNbPnts)
     : Select3D_SensitiveCircle (theOwnerId, theCircle, Standard_False, theNbPnts),
@@ -104,7 +103,7 @@ namespace
   class ManipSensTriangulation : public Select3D_SensitiveTriangulation, public ManipSensRotation
   {
   public:
-    ManipSensTriangulation (const Handle(SelectMgr_EntityOwner)& theOwnerId,
+    ManipSensTriangulation (const Handle(SelectBasics_EntityOwner)& theOwnerId,
                             const Handle(Poly_Triangulation)& theTrg,
                             const gp_Dir& thePlaneNormal)
     : Select3D_SensitiveTriangulation (theOwnerId, theTrg, TopLoc_Location(), Standard_True),
@@ -152,19 +151,6 @@ void AIS_Manipulator::init()
   myHighlightAspect->Aspect()->SetInteriorStyle (Aspect_IS_SOLID);
   myHighlightAspect->SetMaterial (aHilightMaterial);
 
-  Graphic3d_MaterialAspect aDraggerMaterial;
-  aDraggerMaterial.SetReflectionModeOff(Graphic3d_TOR_DIFFUSE);
-  aDraggerMaterial.SetReflectionModeOff(Graphic3d_TOR_SPECULAR);
-  aDraggerMaterial.SetReflectionModeOff(Graphic3d_TOR_EMISSION);
-  aDraggerMaterial.SetMaterialType(Graphic3d_MATERIAL_ASPECT);
-  aDraggerMaterial.SetAmbient(1.0);
-
-  myDraggerHighlight = new Prs3d_ShadingAspect();
-  myDraggerHighlight->Aspect()->SetInteriorStyle(Aspect_IS_SOLID);
-  myDraggerHighlight->SetMaterial(aDraggerMaterial);
-
-  myDraggerHighlight->SetTransparency(0.5);
-
   SetSize (100);
   SetZLayer (Graphic3d_ZLayerId_Topmost);
 }
@@ -187,7 +173,6 @@ Handle(Prs3d_Presentation) AIS_Manipulator::getHighlightPresentation (const Hand
     case AIS_MM_Translation: return myAxes[anOwner->Index()].TranslatorHighlightPrs();
     case AIS_MM_Rotation   : return myAxes[anOwner->Index()].RotatorHighlightPrs();
     case AIS_MM_Scaling    : return myAxes[anOwner->Index()].ScalerHighlightPrs();
-    case AIS_MM_TranslationPlane: return myAxes[anOwner->Index()].DraggerHighlightPrs();
     case AIS_MM_None       : break;
   }
 
@@ -212,7 +197,6 @@ Handle(Graphic3d_Group) AIS_Manipulator::getGroup (const Standard_Integer theInd
     case AIS_MM_Translation: return myAxes[theIndex].TranslatorGroup();
     case AIS_MM_Rotation   : return myAxes[theIndex].RotatorGroup();
     case AIS_MM_Scaling    : return myAxes[theIndex].ScalerGroup();
-    case AIS_MM_TranslationPlane: return myAxes[theIndex].DraggerGroup();
     case AIS_MM_None       : break;
   }
 
@@ -282,10 +266,6 @@ void AIS_Manipulator::SetPart (const Standard_Integer theAxisIndex, const AIS_Ma
       myAxes[theAxisIndex].SetScaling (theIsEnabled);
       break;
 
-    case AIS_MM_TranslationPlane:
-      myAxes[theAxisIndex].SetDragging(theIsEnabled);
-      break;
-
     case AIS_MM_None:
       break;
   }
@@ -420,7 +400,6 @@ void AIS_Manipulator::Attach (const Handle(AIS_ManipulatorObjectSequence)& theOb
     EnableMode (AIS_MM_Rotation);
     EnableMode (AIS_MM_Translation);
     EnableMode (AIS_MM_Scaling);
-    EnableMode (AIS_MM_TranslationPlane);
   }
 }
 
@@ -514,7 +493,6 @@ Standard_Boolean AIS_Manipulator::ObjectTransformation (const Standard_Integer t
       const gp_Lin aLine (myStartPosition.Location(), myAxes[myCurrentIndex].Position().Direction());
       Extrema_ExtElC anExtrema (anInputLine, aLine, Precision::Angular());
       if (!anExtrema.IsDone()
-        || anExtrema.IsParallel()
         || anExtrema.NbExt() != 1)
       {
         // translation cannot be done co-directed with camera
@@ -560,9 +538,7 @@ Standard_Boolean AIS_Manipulator::ObjectTransformation (const Standard_Integer t
       const gp_Pnt aPosLoc   = myStartPosition.Location();
       const gp_Ax1 aCurrAxis = getAx1FromAx2Dir (myStartPosition, myCurrentIndex);
       IntAna_IntConicQuad aIntersector (anInputLine, gp_Pln (aPosLoc, aCurrAxis.Direction()), Precision::Angular(), Precision::Intersection());
-      if (!aIntersector.IsDone()
-        || aIntersector.IsParallel()
-        || aIntersector.NbPoints() < 1)
+      if (!aIntersector.IsDone() || aIntersector.NbPoints() < 1)
       {
         return Standard_False;
       }
@@ -607,34 +583,6 @@ Standard_Boolean AIS_Manipulator::ObjectTransformation (const Standard_Integer t
       myPrevState = anAngle;
       return Standard_True;
     }
-    case AIS_MM_TranslationPlane:
-    {
-      const gp_Pnt aPosLoc = myStartPosition.Location();
-      const gp_Ax1 aCurrAxis = getAx1FromAx2Dir(myStartPosition, myCurrentIndex);
-      IntAna_IntConicQuad aIntersector(anInputLine, gp_Pln(aPosLoc, aCurrAxis.Direction()), Precision::Angular(), Precision::Intersection());
-      if (!aIntersector.IsDone() || aIntersector.NbPoints() < 1)
-      {
-        return Standard_False;
-      }
-
-      const gp_Pnt aNewPosition = aIntersector.Point(1);
-      if (!myHasStartedTransformation)
-      {
-        myStartPick = aNewPosition;
-        myHasStartedTransformation = Standard_True;
-        return Standard_True;
-      }
-
-      if (aNewPosition.Distance(myStartPick) < Precision::Confusion())
-      {
-        return Standard_False;
-      }
-
-      gp_Trsf aNewTrsf;
-      aNewTrsf.SetTranslation(gp_Vec(myStartPick, aNewPosition));
-      theTrsf *= aNewTrsf;
-      return Standard_True;
-    }
     case AIS_MM_None:
     {
       return Standard_False;
@@ -702,26 +650,12 @@ void AIS_Manipulator::Transform (const gp_Trsf& theTrsf)
     NCollection_Sequence<gp_Trsf>::Iterator aTrsfIter (myStartTrsfs);
     for (; anObjIter.More(); anObjIter.Next(), aTrsfIter.Next())
     {
-      const Handle(AIS_InteractiveObject)& anObj = anObjIter.ChangeValue();
-      const gp_Trsf& anOldTrsf = aTrsfIter.Value();
-      const Handle(Geom_Transformation)& aParentTrsf = anObj->CombinedParentTransformation();
-      if (!aParentTrsf.IsNull()
-        && aParentTrsf->Form() != gp_Identity)
-      {
-        // recompute local transformation relative to parent transformation
-        const gp_Trsf aNewLocalTrsf = aParentTrsf->Trsf().Inverted() * theTrsf * aParentTrsf->Trsf() * anOldTrsf;
-        anObj->SetLocalTransformation (aNewLocalTrsf);
-      }
-      else
-      {
-        anObj->SetLocalTransformation (theTrsf * anOldTrsf);
-      }
+      anObjIter.ChangeValue()->SetLocalTransformation (theTrsf * aTrsfIter.Value());
     }
   }
 
   if ((myCurrentMode == AIS_MM_Translation && myBehaviorOnTransform.FollowTranslation)
-   || (myCurrentMode == AIS_MM_Rotation         && myBehaviorOnTransform.FollowRotation)
-   || (myCurrentMode == AIS_MM_TranslationPlane && myBehaviorOnTransform.FollowDragging))
+   || (myCurrentMode == AIS_MM_Rotation    && myBehaviorOnTransform.FollowRotation))
   {
     gp_Pnt aPos  = myStartPosition.Location().Transformed (theTrsf);
     gp_Dir aVDir = myStartPosition.Direction().Transformed (theTrsf);
@@ -849,13 +783,8 @@ void AIS_Manipulator::DeactivateCurrentMode()
     Handle(Prs3d_ShadingAspect) anAspect = new Prs3d_ShadingAspect();
     anAspect->Aspect()->SetInteriorStyle (Aspect_IS_SOLID);
     anAspect->SetMaterial (myDrawer->ShadingAspect()->Material());
-    if (myCurrentMode == AIS_MM_TranslationPlane)
-      anAspect->SetTransparency(1.0);
-    else
-    {
     anAspect->SetTransparency (myDrawer->ShadingAspect()->Transparency());
     anAspect->SetColor (myAxes[myCurrentIndex].Color());
-    }
 
     aGroup->SetGroupPrimitivesAspect (anAspect->Aspect());
   }
@@ -950,14 +879,14 @@ void AIS_Manipulator::Compute (const Handle(PrsMgr_PresentationManager3d)& thePr
 
   // Display center
   myCenter.Init (myAxes[0].AxisRadius() * 2.0f, gp::Origin());
-  aGroup = thePrs->NewGroup ();
+  aGroup = Prs3d_Root::NewGroup (thePrs);
   aGroup->SetPrimitivesAspect (myDrawer->ShadingAspect()->Aspect());
   aGroup->AddPrimitiveArray (myCenter.Array());
 
   for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
   {
     // Display axes
-    aGroup = thePrs->NewGroup ();
+    aGroup = Prs3d_Root::NewGroup (thePrs);
 
     Handle(Prs3d_ShadingAspect) anAspectAx = new Prs3d_ShadingAspect (new Graphic3d_AspectFillArea3d(*anAspect->Aspect()));
     anAspectAx->SetColor (myAxes[anIt].Color());
@@ -1000,12 +929,6 @@ void AIS_Manipulator::HilightSelected (const Handle(PrsMgr_PresentationManager3d
     return;
   }
 
-  if (anOwner->Mode() == AIS_MM_TranslationPlane)
-  {
-    myDraggerHighlight->SetColor(myAxes[anOwner->Index()].Color());
-    aGroup->SetGroupPrimitivesAspect(myDraggerHighlight->Aspect());
-  }
-  else
   aGroup->SetGroupPrimitivesAspect (myHighlightAspect->Aspect());
 
   myCurrentIndex = anOwner->Index();
@@ -1035,26 +958,13 @@ void AIS_Manipulator::HilightOwnerWithColor (const Handle(PrsMgr_PresentationMan
   {
     return;
   }
-
-  aPresentation->CStructure()->ViewAffinity = thePM->StructureManager()->ObjectAffinity (Handle(Standard_Transient) (this));
-
-  if (anOwner->Mode() == AIS_MM_TranslationPlane)
-  {
-    Handle(Prs3d_Drawer) aStyle = new Prs3d_Drawer();
-    aStyle->SetColor (myAxes[anOwner->Index()].Color());
-    aStyle->SetTransparency (0.5);
-    aPresentation->Highlight (aStyle);
-  }
-  else
-  {
   aPresentation->Highlight (theStyle);
-  }
-
   for (Graphic3d_SequenceOfGroup::Iterator aGroupIter (aPresentation->Groups());
        aGroupIter.More(); aGroupIter.Next())
   {
     Handle(Graphic3d_Group)& aGrp = aGroupIter.ChangeValue();
-    if (!aGrp.IsNull())
+    if (!aGrp.IsNull()
+     && aGrp->IsGroupPrimitivesAspectSet (Graphic3d_ASPECT_FILL_AREA))
     {
       aGrp->SetGroupPrimitivesAspect (myHighlightAspect->Aspect());
     }
@@ -1163,38 +1073,6 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
       theSelection->Add (aTri);
     }
   }
-
-  if (aMode == AIS_MM_TranslationPlane || aMode == AIS_MM_None)
-  {
-    for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
-    {
-      if (!myAxes[anIt].HasDragging())
-      {
-        continue;
-      }
-      if (aMode != AIS_MM_None)
-      {
-        anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_TranslationPlane, 9);
-      }
-
-      // define sensitivity by two crossed lines
-      gp_Pnt aP1, aP2;
-      aP1 = myAxes[((anIt + 1) % 3)].TranslatorTipPosition();
-      aP2 = myAxes[((anIt + 2) % 3)].TranslatorTipPosition();
-      gp_XYZ aMidP = (aP1.XYZ() + aP2.XYZ()) / 2.0;
-
-      Handle(Select3D_SensitiveSegment) aLine1 = new Select3D_SensitiveSegment(anOwner, aP1, aP2);
-      aLine1->SetSensitivityFactor(10);
-      theSelection->Add(aLine1);
-      Handle(Select3D_SensitiveSegment) aLine2 = new Select3D_SensitiveSegment(anOwner, gp::Origin(), aMidP);
-      aLine2->SetSensitivityFactor(10);
-      theSelection->Add(aLine2);
-
-      // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].DraggerSector().Triangulation(), TopLoc_Location(), Standard_True);
-      theSelection->Add(aTri);
-    }
-  }
 }
 
 //=======================================================================
@@ -1310,24 +1188,6 @@ void AIS_Manipulator::Cube::addTriangle (const Standard_Integer theIndex,
   myArray->AddVertex (theP3, theNormal);
 }
 
-//=======================================================================
-//class    : Sector
-//function : Init
-//purpose  : 
-//=======================================================================
-void AIS_Manipulator::Sector::Init (const Standard_ShortReal theRadius,
-                                    const gp_Ax1&            thePosition,
-                                    const gp_Dir&            theXDirection,
-                                    const Standard_Integer   theSlicesNb,
-                                    const Standard_Integer   theStacksNb)
-{
-  Prs3d_ToolSector aTool(theRadius, theSlicesNb, theStacksNb);
-  gp_Ax3 aSystem(thePosition.Location(), thePosition.Direction(), theXDirection);
-  gp_Trsf aTrsf;
-  aTrsf.SetTransformation(aSystem, gp_Ax3());
-  aTool.FillArray(myArray, myTriangulation, aTrsf);
-}
-
 //=======================================================================
 //class    : Axis
 //function : Constructor
@@ -1348,7 +1208,6 @@ AIS_Manipulator::Axis::Axis (const gp_Ax1& theAxis,
   myInnerRadius (myLength + myBoxSize),
   myDiskThickness (myBoxSize * 0.5f),
   myIndent (0.2f),
-  myHasDragging(Standard_True),
   myFacettesNumber (20),
   myCircleRadius (myLength + myBoxSize + myBoxSize * 0.5f * 0.5f)
 {
@@ -1377,7 +1236,7 @@ void AIS_Manipulator::Axis::Compute (const Handle(PrsMgr_PresentationManager)& t
                                                myAxisRadius * 1.5,
                                                anArrowLength,
                                                myFacettesNumber);
-    myTranslatorGroup = thePrs->NewGroup ();
+    myTranslatorGroup = Prs3d_Root::NewGroup (thePrs);
     myTranslatorGroup->SetGroupPrimitivesAspect (theAspect->Aspect());
     myTranslatorGroup->AddPrimitiveArray (myTriangleArray);
 
@@ -1401,7 +1260,7 @@ void AIS_Manipulator::Axis::Compute (const Handle(PrsMgr_PresentationManager)& t
     myCubePos = myReferenceAxis.Direction().XYZ() * (myLength + myIndent);
     myCube.Init (gp_Ax1 (myCubePos, myReferenceAxis.Direction()), myBoxSize);
 
-    myScalerGroup = thePrs->NewGroup ();
+    myScalerGroup = Prs3d_Root::NewGroup (thePrs);
     myScalerGroup->SetGroupPrimitivesAspect (theAspect->Aspect());
     myScalerGroup->AddPrimitiveArray (myCube.Array());
 
@@ -1424,7 +1283,7 @@ void AIS_Manipulator::Axis::Compute (const Handle(PrsMgr_PresentationManager)& t
   {
     myCircleRadius = myInnerRadius + myIndent * 2 + myDiskThickness * 0.5f;
     myCircle.Init (myInnerRadius + myIndent * 2, myInnerRadius + myDiskThickness + myIndent * 2, gp_Ax1(gp::Origin(), myReferenceAxis.Direction()), myFacettesNumber * 2);
-    myRotatorGroup = thePrs->NewGroup ();
+    myRotatorGroup = Prs3d_Root::NewGroup (thePrs);
     myRotatorGroup->SetGroupPrimitivesAspect (theAspect->Aspect());
     myRotatorGroup->AddPrimitiveArray (myCircle.Array());
 
@@ -1442,36 +1301,4 @@ void AIS_Manipulator::Axis::Compute (const Handle(PrsMgr_PresentationManager)& t
       aGroup->AddPrimitiveArray (myCircle.Array());
     }
   }
-
-  if (myHasDragging)
-  {
-    gp_Dir aXDirection;
-    if (myReferenceAxis.Direction().X() > 0)
-      aXDirection = gp::DY();
-    else if (myReferenceAxis.Direction().Y() > 0)
-      aXDirection = gp::DZ();
-    else
-      aXDirection = gp::DX();
-
-    mySector.Init(myInnerRadius + myIndent * 2, gp_Ax1(gp::Origin(), myReferenceAxis.Direction()), aXDirection, myFacettesNumber * 2);
-    myDraggerGroup = thePrs->NewGroup();
-
-    Handle(Graphic3d_AspectFillArea3d) aFillArea = new Graphic3d_AspectFillArea3d();
-    myDraggerGroup->SetGroupPrimitivesAspect(aFillArea);
-    myDraggerGroup->AddPrimitiveArray(mySector.Array());
-
-    if (myHighlightDragger.IsNull())
-    {
-      myHighlightDragger = new Prs3d_Presentation(thePrsMgr->StructureManager());
-    }
-    else
-    {
-      myHighlightDragger->Clear();
-    }
-    {
-      Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(myHighlightDragger);
-      aGroup->SetGroupPrimitivesAspect(aFillArea);
-      aGroup->AddPrimitiveArray(mySector.Array());
-    }
-  }
 }

src/AIS/AIS_Manipulator.hxx

@@ -280,14 +280,12 @@ public:
   //! - FollowRotation - whether the manipulator will be rotated together with an object.
   struct BehaviorOnTransform {
 
-    BehaviorOnTransform() : FollowTranslation (Standard_True), FollowRotation (Standard_True), FollowDragging (Standard_True) {}
+    BehaviorOnTransform() : FollowTranslation (Standard_True), FollowRotation (Standard_True) {}
     BehaviorOnTransform& SetFollowTranslation (const Standard_Boolean theApply) { FollowTranslation = theApply; return *this; }
     BehaviorOnTransform& SetFollowRotation    (const Standard_Boolean theApply) { FollowRotation    = theApply; return *this; }
-    BehaviorOnTransform& SetFollowDragging    (const Standard_Boolean theApply) { FollowDragging    = theApply; return *this; }
 
     Standard_Boolean FollowTranslation;
     Standard_Boolean FollowRotation;
-    Standard_Boolean FollowDragging;
   };
 
   //! Sets behavior settings for transformation action carried on the manipulator,
@@ -448,29 +446,6 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
     Handle(Graphic3d_ArrayOfTriangles) myArray;
   };
 
-  class Sector : public Quadric
-  {
-  public:
-
-    Sector()
-      : Quadric(),
-      myRadius(0.0f)
-    { }
-
-    ~Sector() { }
-
-    void Init(const Standard_ShortReal theRadius,
-              const gp_Ax1&            thePosition,
-              const gp_Dir&            theXDirection,
-              const Standard_Integer   theSlicesNb = 5,
-              const Standard_Integer   theStacksNb = 5);
-
-  protected:
-
-    gp_Ax1             myPosition;
-    Standard_ShortReal myRadius;
-  };
-
   //! The class describes on axis sub-object.
   //! It includes sub-objects itself:
   //! -rotator
@@ -510,11 +485,6 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
       {
         myHighlightRotator->SetTransformPersistence (theTrsfPers);
       }
-
-      if (!myHighlightDragger.IsNull())
-      {
-        myHighlightDragger->SetTransformPersistence(theTrsfPers);
-      }
     }
 
     void Transform (const Handle(Geom_Transformation)& theTransformation)
@@ -533,11 +503,6 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
       {
         myHighlightRotator->SetTransformation (theTransformation);
       }
-
-      if (!myHighlightDragger.IsNull())
-      {
-        myHighlightDragger->SetTransformation(theTransformation);
-      }
     }
 
     Standard_Boolean HasTranslation() const { return myHasTranslation; }
@@ -546,16 +511,12 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
 
     Standard_Boolean HasScaling() const { return myHasScaling; }
 
-    Standard_Boolean HasDragging() const { return myHasDragging; }
-
     void SetTranslation (const Standard_Boolean theIsEnabled) { myHasTranslation = theIsEnabled; }
 
     void SetRotation (const Standard_Boolean theIsEnabled) { myHasRotation = theIsEnabled; }
 
     void SetScaling (const Standard_Boolean theIsEnabled) { myHasScaling = theIsEnabled; }
 
-    void SetDragging(const Standard_Boolean theIsEnabled) { myHasDragging = theIsEnabled; }
-
     Quantity_Color Color() const { return myColor; }
 
     Standard_ShortReal AxisLength() const { return myLength; }
@@ -570,16 +531,12 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
 
     const Handle(Prs3d_Presentation)& ScalerHighlightPrs() const { return myHighlightScaler; }
 
-    const Handle(Prs3d_Presentation)& DraggerHighlightPrs() const { return myHighlightDragger; }
-
     const Handle(Graphic3d_Group)& TranslatorGroup() const { return myTranslatorGroup; }
 
     const Handle(Graphic3d_Group)& RotatorGroup() const { return myRotatorGroup; }
 
     const Handle(Graphic3d_Group)& ScalerGroup() const { return myScalerGroup; }
 
-    const Handle(Graphic3d_Group)& DraggerGroup() const { return myDraggerGroup; }
-
     const Handle(Graphic3d_ArrayOfTriangles)& TriangleArray() const { return myTriangleArray; }
 
     void SetIndent (const Standard_ShortReal theValue) { myIndent = theValue; }
@@ -613,7 +570,6 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
   public:
 
     const gp_Pnt& TranslatorTipPosition() const { return myArrowTipPos; }
-    const Sector& DraggerSector() const { return mySector; }
     const Disk& RotatorDisk() const { return myCircle; }
     float RotatorDiskRadius() const { return myCircleRadius; }
     const Cube& ScalerCube() const { return myCube; }
@@ -637,14 +593,11 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
     Standard_ShortReal myDiskThickness;
     Standard_ShortReal myIndent; //!< Gap between visual part of the manipulator.
 
-    Standard_Boolean myHasDragging;
-
   protected:
 
     Standard_Integer myFacettesNumber;
 
     gp_Pnt   myArrowTipPos;
-    Sector   mySector;
     Disk     myCircle;
     float    myCircleRadius;
     Cube     myCube;
@@ -653,12 +606,10 @@ protected: //! @name Auxiliary classes to fill presentation with proper primitiv
     Handle(Graphic3d_Group) myTranslatorGroup;
     Handle(Graphic3d_Group) myScalerGroup;
     Handle(Graphic3d_Group) myRotatorGroup;
-    Handle(Graphic3d_Group) myDraggerGroup;
 
     Handle(Prs3d_Presentation) myHighlightTranslator;
     Handle(Prs3d_Presentation) myHighlightScaler;
     Handle(Prs3d_Presentation) myHighlightRotator;
-    Handle(Prs3d_Presentation) myHighlightDragger;
 
     Handle(Graphic3d_ArrayOfTriangles) myTriangleArray;
 
@@ -687,9 +638,6 @@ protected: //! @name Fields for interactive transformation. Fields only for inte
 
   //! Aspect used to color current detected part and current selected part.
   Handle(Prs3d_ShadingAspect) myHighlightAspect;
-
-  //! Aspect used to color sector part when it's selected.
-  Handle(Prs3d_ShadingAspect) myDraggerHighlight;
 public:
 
   DEFINE_STANDARD_RTTIEXT(AIS_Manipulator, AIS_InteractiveObject)