diff --git a/.travis.yml b/.travis.yml
index 426da0090..37a2162b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,8 @@
-sudo: false
+os: linux
+dist: bionic
language: cpp
-cache:
- apt: true
-
git:
depth: false
@@ -27,75 +25,75 @@ git:
# after that, copy/paste the secure on the following line
env:
global:
- - secure: "Mu6SQsBmz2inttfIj3pXk4lx6ZXNs7MAq1agDgnGJknQTTi4ta0H+usxKhhGvxkh4eGgX01HuXAbPejU0W9xatHvYDQ3piKvqv672TrhYShHA4bWJke3q88BezSYaDQ+UBTmP5DD/ZFbprH+6bP9WqpRaYGC6UHbFkjRKEd2bk4="
-
-addons:
- apt:
- packages:
- - mesa-common-dev
- - libgl1-mesa-dev
- - libglu1-mesa-dev
+ - secure: "Bqor4TrYqeJUkjiIHjCq/e3xt/jAoU3Q5kwG/ej+QxaiT6hmkirX3Io3rHxNTbS+mYMAMTbtkkpGqYIYIYtNVx8jGYLdwOzNcuW/wzZf9VuAW/rnjx2lzuYRhHk3GOylSPUU06JHvXDmZvdMxetNBeWaE5hGuJsC9liA+stDepA="
-matrix:
+jobs:
include:
+# Linux
- env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
- os: linux
- dist: bionic
- - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64"
- os: osx
- osx_image: xcode9.4
- - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
- os: linux
- dist: bionic
- env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64"
- os: osx
- osx_image: xcode9.4
- - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
- os: linux
- dist: bionic
- env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64"
+# OSX
+ - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET=10.9
+ os: osx
+ osx_image: xcode9.4
+ - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET=10.9
+ os: osx
+ osx_image: xcode9.4
+ - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64" MACOSX_DEPLOYMENT_TARGET=10.9
os: osx
- osx_image: xcode9.4
+ osx_image: xcode9.4
+# Windows
+# - env: PYTHON="3.5" CONDA_PY=35 ARCH="x86_64" CC="cl.exe" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
+# os: windows
+# - env: PYTHON="3.6" CONDA_PY=36 ARCH="x86_64" CC="cl.exe" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
+# os: windows
+# - env: PYTHON="3.7" CONDA_PY=37 ARCH="x86_64" CC="cl.exe" CXX="cl.exe" MSVC_TOOLSET_VERSION=15
+# os: windows
+
# Use miniconda to install binary versions of numpy etc. from continuum
# analytic's repository. Follows an approach described by Dan Blanchard:
# https://gist.github.com/dan-blanchard/7045057
before_install:
- - if [ ${PYTHON:0:1} == "2" ]; then
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
- wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
- else
- wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh;
- fi;
- else
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+ - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
+ MINICONDA_PATH=$HOME/miniconda;
+ MINICONDA_SUB_PATH=$MINICONDA_PATH/bin;
+ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+ MINICONDA_PATH=/c/tools/miniconda3;
+ MINICONDA_SUB_PATH=$MINICONDA_PATH/Scripts;
+ fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- else
+ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
- fi;
+ wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.9.sdk.tar.xz -O MacOSX10.9.sdk.tar.xz;
+ tar xf MacOSX10.9.sdk.tar.xz;
+ sudo mv MacOSX10.9.sdk /opt/;
+ ls /opt;
+ fi
+
+install:
+ - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
+ chmod +x miniconda.sh;
+ yes | ./miniconda.sh -b -p $MINICONDA_PATH;
+ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+ echo "installing miniconda for windows";
+ choco install openssl.light;
+ choco install miniconda3;
fi;
- - chmod +x miniconda.sh
- # When we are installing the 32 Bit conda on a 64 Bit system, the miniconda
- # installer will ask for a "yes" despite the -b flag, so we pipe in a yes
- - yes | ./miniconda.sh -b -p $HOME/miniconda
- #- bash miniconda.sh -b -p -f $HOME/miniconda
- - export PATH="$HOME/miniconda/bin:$HOME/miniconda/lib:$PATH"
+ - export PATH="$MINICONDA_PATH:$MINICONDA_SUB_PATH:$PATH";
- export PYTHONUNBUFFERED=1
- hash -r
- - conda config --set always_yes yes --set changeps1 no
+ - conda config --set always_yes yes --set changeps1 no --set ssl_verify false
- conda update -q conda
# install everything required to build the receipe
- # conda-build 3.2.0 on osx to prevent using check_overlinking
- # method which is quite loooong to process
- #- conda install conda-build==3.2.0
- - conda install conda-build anaconda-client
+ - conda install conda-build
+ - conda install anaconda-client
# Useful for debugging any issues with conda
- conda info -a
- # download/install OCE from DLR-SC channel
- - conda config --add channels dlr-sc
- - conda config --add channels conda-forge
- - conda config --add channels tpaviot
- - conda config --add channels oce
- - conda config --add channels pythonocc
+ # dlr-sc channel is required for opencascade-7.4.0 package
+ - conda config --add channels https://conda.anaconda.org/dlr-sc
+ - conda config --add channels https://conda.anaconda.org/conda-forge
script:
- conda build ci/conda --dirty --no-remove-work-dir
@@ -110,7 +108,7 @@ after_success:
anaconda -t $BINSTAR_TOKEN upload *.bz2 -l main --force;
else
anaconda -t $BINSTAR_TOKEN upload *.bz2 -l cd-$TRAVIS_BRANCH --force;
- fi;
+ fi
branches:
diff --git a/AUTHORS b/AUTHORS
index fa0c7efa0..5de0a3573 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,3 +15,5 @@ Trevor Laughlin
jelle feringa
nxsofsys
Thomas Severin
+
+Please report any missing name
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d7d220a0..92fbd4f68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,16 +15,21 @@
##You should have received a copy of the GNU General Public License
##along with pythonOCC. If not, see .
+cmake_minimum_required(VERSION 3.12)
project(PYTHONOCC)
# set pythonOCC version
-set(PYTHONOCC_VERSION_MAJOR 0)
-set(PYTHONOCC_VERSION_MINOR 18)
-set(PYTHONOCC_VERSION_PATCH 2)
+set(PYTHONOCC_VERSION_MAJOR 7)
+set(PYTHONOCC_VERSION_MINOR 4)
+set(PYTHONOCC_VERSION_PATCH 0)
# Empty for official releases, set to -dev, -rc1, etc for development releases
-set(PYTHONOCC_VERSION_DEVEL)
+set(PYTHONOCC_VERSION_DEVEL -beta)
-cmake_minimum_required(VERSION 2.6)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+# for cmake 3.13 and newer, still use old swig style targets
+cmake_policy(SET CMP0078 OLD)
+cmake_policy(SET CMP0086 OLD)
## cmake policies
if (NOT CMAKE_VERSION VERSION_LESS "3.13")
@@ -38,11 +43,14 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.13")
cmake_policy(SET CMP0086 OLD)
endif()
+# Force C++ 11
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if( NOT DEFINED PYTHONOCC_BUILD_TYPE )
- set( PYTHONOCC_BUILD_TYPE "Release" CACHE STRING "Build type" ) # By default set release build
-endif( NOT DEFINED PYTHONOCC_BUILD_TYPE )
-set( CMAKE_BUILD_TYPE ${PYTHONOCC_BUILD_TYPE} CACHE INTERNAL "Build type, immutable" FORCE )
+if(NOT DEFINED PYTHONOCC_BUILD_TYPE)
+ set(PYTHONOCC_BUILD_TYPE "Release" CACHE STRING "Build type") # By default set release build
+endif(NOT DEFINED PYTHONOCC_BUILD_TYPE)
+set(CMAKE_BUILD_TYPE ${PYTHONOCC_BUILD_TYPE} CACHE INTERNAL "Build type, immutable" FORCE)
message(STATUS " ${CMAKE_CXX_FLAGS}")
set(BUILD_SHARED_LIBS ON)
@@ -59,68 +67,66 @@ endif(APPLE)
#############################
# Option_With_Default macro #
#############################
-macro( option_with_default OPTION_NAME OPTION_STRING OPTION_DEFAULT )
-if( NOT DEFINED ${OPTION_NAME} )
- set( ${OPTION_NAME} ${OPTION_DEFAULT} )
-endif( NOT DEFINED ${OPTION_NAME} )
- OPTION( ${OPTION_NAME} "${OPTION_STRING}" ${${OPTION_NAME}} )
-endmacro( option_with_default OPTION_NAME OPTION_STRING OPTION_DEFAULT )
-
-##########
-# Python #
-##########
-find_package(PythonInterp)
-find_package(PythonLibs)
-include_directories(${PYTHON_INCLUDE_PATH})
-
-##############################################################
-# 32/64 bit detection
-###############################################################
-if(${CMAKE_SIZEOF_VOID_P} MATCHES "8")
- # If in 64bit mode, we have to define the _OCC64 variable
- add_definitions(-D_OCC64)
- set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -D_OCC64)
- set(BIT 64)
-else(${CMAKE_SIZEOF_VOID_P} MATCHES "8")
- set(BIT 32)
-endif(${CMAKE_SIZEOF_VOID_P} MATCHES "8")
-message(STATUS "Build ${BIT}bit")
+macro(option_with_default OPTION_NAME OPTION_STRING OPTION_DEFAULT)
+ option(${OPTION_NAME} ${OPTION_STRING} ${OPTION_DEFAULT})
+endmacro(option_with_default OPTION_NAME OPTION_STRING OPTION_DEFAULT)
-# Mingw64 needs MS_WIN64 to be defined (otherwise link failures)
-if(MINGW)
- message(STATUS "MinGW:")
- if(BIT MATCHES "64")
- add_definitions(-DMS_WIN64)
- endif(BIT MATCHES "64")
-endif(MINGW)
+#####################################################################
+# OpenGL. If available, enable compilation for Visualization module #
+#####################################################################
+find_package(OpenGL)
+include_directories(OPENGL_INCLUDE_DIR)
-# MACOSX_DEPLOYEMENT_TARGET
-# explicit link to libc++ for recent osx versions
-if(APPLE)
- message(STATUS "Explicitely link to libc++ on modern osx versions")
- add_definitions(-stdlib=libc++)
-endif(APPLE)
+#################
+# Build options #
+#################
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OCE_Modules.cmake)
+# add an option to choose toolkits to compile
+if(OPENGL_FOUND)
+ option_with_default(PYTHONOCC_WRAP_VISU "Compile Visualisation" ON)
+else(OPENGL_FOUND)
+ message(WARNING "OpenGL library not found, Visualization compilation is turned OFF")
+ set(PYTHONOCC_WRAP_VISU "Compile Visualisation" OFF)
+endif(OPENGL_FOUND)
+option_with_default(PYTHONOCC_WRAP_DATAEXCHANGE "Compile DataExchange wrapper" ON)
+option_with_default(PYTHONOCC_WRAP_OCAF "Compile OCE Application Framework wrapper" ON)
+option_with_default(PYTHONOCC_WRAP_SMESH "Compile SMESH wrapper" OFF)
+option_with_default(SWIG_HIDE_WARNINGS "Check this option if you want a less verbose swig output." ON)
+option_with_default(OCE_HIDE_DEPRECATED "Check this option if you want a less verbose swig output." ON)
+
+############
+# Python 3 #
+############
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+message(STATUS "Python3 interpreter:" ${Python3_EXECUTABLE})
+message(STATUS "Python include directory: ${Python3_INCLUDE_DIR}")
+message(STATUS "Python library release: ${Python3_LIBRARY_RELEASE}")
########
# SWIG #
########
-find_package(SWIG 3.0.9)
+find_package(SWIG 3.0.11 REQUIRED)
include(${SWIG_USE_FILE})
set(SWIG_FILES_PATH src/SWIG_files/wrapper)
-
-############
-# FreeType #
-############
-find_package(Freetype REQUIRED)
-include_directories(${FREETYPE_INCLUDE_DIRS})
+if(SWIG_HIDE_WARNINGS)
+ message(STATUS "Disabled SWIG warnings")
+ set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -O -w302,401,402,412,314,509,512,504,325,503,520,350,351,383,389,394,395,404 -py3)
+else()
+ set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -py3)
+endif()
################################
# OCE include and lib location #
################################
+if(OCE_HIDE_DEPRECATED)
+ message(STATUS "Disabled deprecation warnings for oce")
+ add_definitions(-DOCCT_NO_DEPRECATED)
+endif(OCE_HIDE_DEPRECATED)
+
if(DEFINED OCE_INCLUDE_PATH)
if(NOT DEFINED OCE_LIB_PATH)
message(FATAL_ERROR "OCE_LIB_PATH must be defined")
- endif (NOT DEFINED OCE_LIB_PATH)
+ endif(NOT DEFINED OCE_LIB_PATH)
set(OCE_INCLUDE_PATH ${OCE_INCLUDE_PATH} CACHE PATH "OCE include path")
set(OCE_LIB_PATH ${OCE_LIB_PATH} CACHE PATH "OCE lib path")
include_directories(${OCE_INCLUDE_PATH})
@@ -128,18 +134,18 @@ if(DEFINED OCE_INCLUDE_PATH)
# if OCE_INCLUDE_PATH is not passed at command line,
# find OCE automatically
else(OCE_INCLUDE_PATH)
- find_package(OCE 0.18 REQUIRED)
- # OCE 0.18 relies on OCC 6.9.1
- set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DOCC_VERSION_HEX=0x060901)
- if(OCE_FOUND)
- message(STATUS "OpenCASCADE Community Edition (OCE) found.")
+ find_package(OpenCASCADE 7.4.0 REQUIRED)
+
+ include_directories(${OpenCASCADE_INCLUDE_DIR})
+ if(OpenCASCADE_FOUND)
+ message(STATUS "OpenCASCADE found.")
include_directories(${OCE_INCLUDE_DIRS})
- else() # set default paths
+ else(OpenCASCADE_FOUND) # set default paths
set(OCE_INCLUDE_PATH /usr/local/include/oce CACHE PATH "OCE include path")
set(OCE_LIB_PATH /usr/local/lib CACHE PATH "OCE lib path")
include_directories(${OCE_INCLUDE_PATH})
link_directories(${OCE_LIB_PATH})
- endif(OCE_FOUND)
+ endif(OpenCASCADE_FOUND)
endif(DEFINED OCE_INCLUDE_PATH)
################################
@@ -160,21 +166,46 @@ endif(PYTHONOCC_WRAP_SMESH)
# Installation directory #
# by default, installed to site-packages/OCC #
##############################################
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; import os;print(get_python_lib())" OUTPUT_VARIABLE python_lib OUTPUT_STRIP_TRAILING_WHITESPACE )
-set(PYTHONOCC_INSTALL_DIRECTORY ${python_lib}/OCC CACHE PATH "pythonOCC install directory" )
+execute_process(COMMAND ${Python3_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; import os;print(get_python_lib())" OUTPUT_VARIABLE python_lib OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(PYTHONOCC_INSTALL_DIRECTORY ${python_lib}/OCC CACHE PATH "pythonOCC install directory")
+message(STATUS "pythonOCC modules will be installed to: ${PYTHONOCC_INSTALL_DIRECTORY}")
-# List of OCE shared libraries to link with
-# TODO: this should be build from the module list
+#############################################
+# List of OCE shared libraries to link with #
+#############################################
set(OCE_MODEL_LIBRARIES TKernel TKMath TKG2d TKG3d TKGeomBase TKBRep TKGeomAlgo
- TKTopAlgo TKPrim TKBO TKHLR TKMesh TKShHealing TKXMesh TKBool TKFillet TKFeat TKOffset)
-set(OCE_VISUALIZATION_LIBRARIES TKService TKV3d TKMeshVS TKOpenGl TKVoxel TKNIS TKV3d)
-set(OCE_DATAEXCHANGE_LIBRARIES TKSTL TKXSBase TKSTEPBase TKIGES TKSTEPAttr TKSTEP209
- TKSTEP TKVRML TKXSBase)
-set(OCE_OCAF_LIBRARIES TKCAF TKCDF TKLCAF TKXCAF TKXDESTEP TKXDEIGES)
+ TKTopAlgo TKPrim TKBO TKShHealing TKBool TKHLR TKFillet
+ TKOffset TKFeat TKMesh TKXMesh)
+set(OCE_VISUALIZATION_LIBRARIES TKService TKV3d TKOpenGl TKMeshVS)
+set(OCE_DATAEXCHANGE_LIBRARIES TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES
+ TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF)
+set(OCE_OCAF_LIBRARIES TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL
+ TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF)
+
+################
+# Headers path #
+################
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/SWIG_files/headers)
######################################################
# Configure Build settings according to the platform #
######################################################
+
+# Mingw64 needs MS_WIN64 to be defined (otherwise link failures)
+if(MINGW)
+ message(STATUS "MinGW:")
+ if(${CMAKE_SIZEOF_VOID_P} MATCHES "8") # 64 bit check
+ add_definitions(-DMS_WIN64)
+ endif(${CMAKE_SIZEOF_VOID_P} MATCHES "8")
+endif(MINGW)
+
+# MACOSX_DEPLOYEMENT_TARGET
+# explicit link to libc++ for recent osx versions
+if(APPLE)
+ message(STATUS "Explicitely link to libc++ on modern osx versions")
+ add_definitions(-stdlib=libc++)
+endif(APPLE)
+
if(UNIX)
if(APPLE)
######### MacOSX ###########
@@ -183,40 +214,18 @@ if(UNIX)
######### Unix/Linux ###########
set(PLATFORM Unix)
endif(APPLE)
- set(CMAKE_SWIG_FLAGS -O -w302,401,314,509,512
- -DCSFDB -DHAVE_CONFIG_H -DOCC_CONVERT_SIGNALS)
- add_definitions(-DHAVE_CONFIG_H -DCSFDB -DOCC_CONVERT_SIGNALS)
+ set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DCSFDB -DHAVE_CONFIG_H)
+ add_definitions(-DHAVE_CONFIG_H -DCSFDB)
else(UNIX)
if(WIN32)
######### Windows ###########
add_definitions(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DHAVE_CONFIG_H)
- # specific windows defines for python version >=2.6.0
- execute_process(COMMAND python -c "import sys;print ((2,6)>=sys.version_info[:2])" OUTPUT_VARIABLE PYTHON_26_OR_HIGHER OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(${PYTHON_26_OR_HIGHER} MATCHES "True")
- add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
- endif(${PYTHON_26_OR_HIGHER} MATCHES "True")
- set(CMAKE_SWIG_FLAGS -O -w302,401,314,509,512 -DCSFDB -DWIN32 -D_WINDOWS)
+ set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DCSFDB -DWIN32 -D_WINDOWS)
set(PLATFORM win)
else(WIN32)
message(STATUS "Unknown platform")
endif(WIN32)
endif(UNIX)
-message(STATUS "Platform:" ${PLATFORM})
-
-if (APPLE)
- # find out python linking commands
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_config_vars('CFLAGS')[0])" OUTPUT_VARIABLE PYTHON_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE )
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_config_vars('BLDSHARED')[0].split(' ', 1)[1])" OUTPUT_VARIABLE PYTHON_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE )
-endif(APPLE)
-
-##################################
-# Tells Swig to use py3k option #
-##################################
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print(sys.version_info.major)" OUTPUT_VARIABLE python_version_major OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-if(${python_version_major} MATCHES "3")
- set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -py3)
-endif(${python_version_major} MATCHES "3")
################################################
# Define output path for generated libraries: #
@@ -242,33 +251,18 @@ else(WIN32)
set(LIBRARY_OUTPUT_PATH ${PLATFORM}/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}-${BIT})
endif(WIN32)
set(CMAKE_SWIG_OUTDIR ${LIBRARY_OUTPUT_PATH})
-message(STATUS "output_path: ${LIBRARY_OUTPUT_PATH}")
-
-############################
-# OpenCASCADE Modules list #
-############################
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/OCE_Modules.cmake)
-# add an option to choose toolkits to compile
-option_with_default(PYTHONOCC_WRAP_VISU "Compile Visualisation" TRUE)
-option_with_default(PYTHONOCC_WRAP_DATAEXCHANGE "Compile DataExchange wrapper" TRUE)
-option_with_default(PYTHONOCC_WRAP_OCAF "Compile OCE Application Framework wrapper" TRUE)
-option_with_default(PYTHONOCC_WRAP_SMESH "Compile SMESH wrapper" FALSE)
######################
# SMESH Modules list #
######################
if(PYTHONOCC_WRAP_SMESH)
- option_with_default(PYTHONOCC_WRAP_SMESH_NETGENPLUGIN "Compile NETGENPlugin wrapper" FALSE)
+ option_with_default(PYTHONOCC_WRAP_SMESH_NETGENPLUGIN "Compile NETGENPlugin wrapper" OFF)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SMESH_Modules.cmake)
# need vtk headers to compile
#find_package(VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkIOLegacy vtkFiltersVerdict)
#include_directories(${VTK_INCLUDE_DIRS})
endif(PYTHONOCC_WRAP_SMESH)
-###################
-# Wrapper Modules #
-###################
-
##################
# MODEL Toolkits #
##################
@@ -276,19 +270,8 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${SWIG_FILES_PATH})
foreach(OCE_MODULE ${OCE_TOOLKIT_MODEL})
set(FILE ${SWIG_FILES_PATH}/${OCE_MODULE}.i)
set_source_files_properties(${FILE} PROPERTIES CPLUSPLUS ON)
- if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(${OCE_MODULE} python ${FILE})
- else (CMAKE_VERSION VERSION_LESS 3.8)
swig_add_library (${OCE_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
- endif (CMAKE_VERSION VERSION_LESS 3.8)
-
- swig_link_libraries(${OCE_MODULE} ${OCE_MODEL_LIBRARIES})
- if (APPLE)
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- else(APPLE)
- swig_link_libraries(${OCE_MODULE} ${PYTHON_LIBRARIES})
- endif(APPLE)
+ swig_link_libraries(${OCE_MODULE} ${OCE_MODEL_LIBRARIES} Python3::Module)
endforeach(OCE_MODULE)
#################
@@ -297,107 +280,35 @@ endforeach(OCE_MODULE)
if(PYTHONOCC_WRAP_VISU)
find_package(OpenGL REQUIRED)
include_directories(OPENGL_INCLUDE_DIR)
- foreach(OCE_MODULE ${OCE_TOOLKIT_VISUALIZATION})
- set(FILE ${SWIG_FILES_PATH}/${OCE_MODULE}.i)
- set_source_files_properties(${FILE} PROPERTIES CPLUSPLUS ON)
- if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(${OCE_MODULE} python ${FILE})
- else (CMAKE_VERSION VERSION_LESS 3.8)
+ foreach(OCE_MODULE ${OCE_TOOLKIT_VISUALIZATION})
+ set(FILE ${SWIG_FILES_PATH}/${OCE_MODULE}.i)
+ set_source_files_properties(${FILE} PROPERTIES CPLUSPLUS ON)
swig_add_library (${OCE_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
- endif()
-
- swig_link_libraries(${OCE_MODULE} ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES})
- if (APPLE)
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- else(APPLE)
- swig_link_libraries(${OCE_MODULE} ${PYTHON_LIBRARIES})
- endif(APPLE)
- endforeach(OCE_MODULE)
+ swig_link_libraries(${OCE_MODULE} ${OCE_VISUALIZATION_LIBRARIES} Python3::Module)
+ endforeach(OCE_MODULE)
+
# Build third part modules
# TODO : the following line is strange but necessary
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory src/Visualization)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Visualization.i PROPERTIES CPLUSPLUS ON)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization)
set(VISUALIZATION_SOURCE_FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Visualization.i
- ${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Display3d.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Tesselator.cpp
- )
-
- if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(Visualization python ${VISUALIZATION_SOURCE_FILES})
- else (CMAKE_VERSION VERSION_LESS 3.8)
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Visualization.i
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Display3d.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Tesselator.cpp)
+
swig_add_library(Visualization LANGUAGE python SOURCES ${VISUALIZATION_SOURCE_FILES} TYPE MODULE)
- endif()
+ swig_link_libraries(Visualization ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES} Python3::Module)
if(APPLE)
# on OSX, always add /System/Library/Frameworks/Cocoa.framework, even
# if GLX is enabled
- swig_link_libraries(Visualization ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES} /System/Library/Frameworks/Cocoa.framework)
- set_target_properties(${SWIG_MODULE_Visualization_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_Visualization_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- else(APPLE)
- swig_link_libraries(Visualization ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES} ${PYTHON_LIBRARIES})
+ swig_link_libraries(Visualization /System/Library/Frameworks/Cocoa.framework)
endif(APPLE)
endif(PYTHONOCC_WRAP_VISU)
-##########
-# Addons #
-##########
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory src/Addons)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/Addons/Addons.i PROPERTIES CPLUSPLUS ON)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/Addons)
-set(ADDONS_SOURCE_FILES
-${CMAKE_CURRENT_SOURCE_DIR}/src/Addons/Addons.i
-${CMAKE_CURRENT_SOURCE_DIR}/src/Addons/Font3d.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/src/Addons/TextItem.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/src/Addons/LineItem.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/src/Addons/TextureItem.cpp
-)
-
-if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(Addons python ${ADDONS_SOURCE_FILES})
-else (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_library(Addons LANGUAGE python SOURCES ${ADDONS_SOURCE_FILES} TYPE MODULE)
-endif()
-
-swig_link_libraries(Addons ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES})
-if (APPLE)
- set_target_properties(${SWIG_MODULE_Addons_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_Addons_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- swig_link_libraries(Addons ${OPENGL_LIBRARIES})
-else(APPLE)
- swig_link_libraries(Addons ${PYTHON_LIBRARIES})
-endif(APPLE)
-
-############
-# Splitter #
-############
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory src/Splitter)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/Splitter/GEOMAlgo.i PROPERTIES CPLUSPLUS ON)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/Splitter)
-set(SPLITTER_SOURCE_FILES
-${CMAKE_CURRENT_SOURCE_DIR}/src/Splitter/GEOMAlgo.i
-${CMAKE_CURRENT_SOURCE_DIR}/src/Splitter/GEOMAlgo_Splitter.cxx
-)
-
-if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(GEOMAlgo python ${SPLITTER_SOURCE_FILES})
-else (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_library(GEOMAlgo LANGUAGE python SOURCES ${SPLITTER_SOURCE_FILES} TYPE MODULE)
-endif()
-
-swig_link_libraries(GEOMAlgo ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES})
-if (APPLE)
- set_target_properties(${SWIG_MODULE_GEOMAlgo_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_GEOMAlgo_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
-else(APPLE)
- swig_link_libraries(GEOMAlgo ${PYTHON_LIBRARIES})
-endif(APPLE)
-
################
# DataExchange #
################
@@ -405,22 +316,8 @@ if(PYTHONOCC_WRAP_DATAEXCHANGE)
foreach(OCE_MODULE ${OCE_TOOLKIT_DATAEXCHANGE})
set(FILE ${SWIG_FILES_PATH}/${OCE_MODULE}.i)
set_source_files_properties(${FILE} PROPERTIES CPLUSPLUS ON)
-
- if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(${OCE_MODULE} python ${FILE})
- else (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_library(${OCE_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
- endif()
-
- swig_link_libraries(${OCE_MODULE} ${OCE_MODEL_LIBRARIES} ${OCE_DATAEXCHANGE_LIBRARIES})
-
- if (APPLE)
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- else(APPLE)
- swig_link_libraries(${OCE_MODULE} ${PYTHON_LIBRARIES})
- endif(APPLE)
-
+ swig_add_library(${OCE_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
+ swig_link_libraries(${OCE_MODULE} ${OCE_DATAEXCHANGE_LIBRARIES} Python3::Module)
endforeach(OCE_MODULE)
endif(PYTHONOCC_WRAP_DATAEXCHANGE)
@@ -431,22 +328,8 @@ if(PYTHONOCC_WRAP_OCAF)
foreach(OCE_MODULE ${OCE_TOOLKIT_OCAF})
set(FILE ${SWIG_FILES_PATH}/${OCE_MODULE}.i)
set_source_files_properties(${FILE} PROPERTIES CPLUSPLUS ON)
-
- if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(${OCE_MODULE} python ${FILE})
- else (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_library(${OCE_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
- endif()
-
- swig_link_libraries(${OCE_MODULE} ${OCE_MODEL_LIBRARIES} ${OCE_OCAF_LIBRARIES})
-
- if (APPLE)
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_${OCE_MODULE}_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- else(APPLE)
- swig_link_libraries(${OCE_MODULE} ${PYTHON_LIBRARIES})
- endif(APPLE)
-
+ swig_add_library(${OCE_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
+ swig_link_libraries(${OCE_MODULE} ${OCE_OCAF_LIBRARIES} Python3::Module)
endforeach(OCE_MODULE)
endif(PYTHONOCC_WRAP_OCAF)
@@ -457,22 +340,8 @@ if(PYTHONOCC_WRAP_SMESH)
foreach(SMESH_MODULE ${SMESH_TOOLKIT})
set(FILE ${SWIG_FILES_PATH}/${SMESH_MODULE}.i)
set_source_files_properties(${FILE} PROPERTIES CPLUSPLUS ON)
-
- if (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_module(${SMESH_MODULE} python ${FILE})
- else (CMAKE_VERSION VERSION_LESS 3.8)
- swig_add_library(${SMESH_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
- endif()
-
- swig_link_libraries(${SMESH_MODULE} ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES} ${OCE_OCAF_LIBRARIES} ${SMESH_LIBRARIES})
-
- if (APPLE)
- set_target_properties(${SWIG_MODULE_${SMESH_MODULE}_REAL_NAME} PROPERTIES COMPILE_FLAGS ${PYTHON_CFLAGS})
- set_target_properties(${SWIG_MODULE_${SMESH_MODULE}_REAL_NAME} PROPERTIES LINK_FLAGS ${PYTHON_LDFLAGS})
- else(APPLE)
- swig_link_libraries(${SMESH_MODULE} ${PYTHON_LIBRARIES})
- endif(APPLE)
-
+ swig_add_library(${SMESH_MODULE} LANGUAGE python SOURCES ${FILE} TYPE MODULE)
+ swig_link_libraries(${SMESH_MODULE} ${OCE_MODEL_LIBRARIES} ${OCE_VISUALIZATION_LIBRARIES} ${OCE_OCAF_LIBRARIES} ${SMESH_LIBRARIES} Python3::Module)
endforeach(SMESH_MODULE)
endif(PYTHONOCC_WRAP_SMESH)
@@ -488,67 +357,57 @@ set(BUILD_DIR ${CMAKE_BINARY_DIR}/${LIBRARY_OUTPUT_PATH})
# install pythonOCC modules
foreach(OCE_MODULE ${OCE_TOOLKIT_MODEL})
- install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
- install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
+ install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
+ install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
endforeach(OCE_MODULE)
if(PYTHONOCC_WRAP_VISU)
foreach(OCE_MODULE ${OCE_TOOLKIT_VISUALIZATION})
- install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
- install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
+ install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
+ install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
endforeach(OCE_MODULE)
endif(PYTHONOCC_WRAP_VISU)
if(PYTHONOCC_WRAP_DATAEXCHANGE)
foreach(OCE_MODULE ${OCE_TOOLKIT_DATAEXCHANGE})
- install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
- install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
+ install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
+ install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
endforeach(OCE_MODULE)
endif(PYTHONOCC_WRAP_DATAEXCHANGE)
if(PYTHONOCC_WRAP_OCAF)
foreach(OCE_MODULE ${OCE_TOOLKIT_OCAF})
- install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
- install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
+ install(FILES ${BUILD_DIR}/${OCE_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
+ install(TARGETS _${OCE_MODULE} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
endforeach(OCE_MODULE)
endif(PYTHONOCC_WRAP_OCAF)
# install third part modules
if(PYTHONOCC_WRAP_VISU)
-install(FILES ${BUILD_DIR}/Visualization.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
-install(TARGETS _Visualization DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
+install(FILES ${BUILD_DIR}/Visualization.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
+install(TARGETS _Visualization DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
endif(PYTHONOCC_WRAP_VISU)
# instal SMESH
if(PYTHONOCC_WRAP_SMESH)
foreach(SMESH_MODULE ${SMESH_TOOLKIT})
- install(FILES ${BUILD_DIR}/${SMESH_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
- install(FILES ${BUILD_DIR}/_${SMESH_MODULE}.${EXTENSION} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
+ install(FILES ${BUILD_DIR}/${SMESH_MODULE}.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
+ install(FILES ${BUILD_DIR}/_${SMESH_MODULE}.${EXTENSION} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
endforeach(SMESH_MODULE)
endif(PYTHONOCC_WRAP_SMESH)
-# install addons
-install(FILES ${BUILD_DIR}/Addons.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
-install(TARGETS _Addons DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/Display DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
+# install Display
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/Display DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY})
# install LICENSE file
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY})
# install AUTHORS file
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY})
# install __init__.py file
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/__init__.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/__init__.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/__init__.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core)
-# install Splitter to Core
-install(FILES ${BUILD_DIR}/GEOMAlgo.py DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
-install(TARGETS _GEOMAlgo DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY}/Core )
-
# install Extend
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/Extend DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/Extend DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY})
# install Wrapper utils
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/Wrapper DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY})
-
-# install deprecated modules
-file(GLOB DEPRECATED_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/src/SWIG_files/deprecated_modules/*.py)
-install(FILES ${DEPRECATED_MODULES} DESTINATION ${PYTHONOCC_INSTALL_DIRECTORY} )
diff --git a/INSTALL.md b/INSTALL.md
index 7782ffb10..c47ff6728 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -19,21 +19,12 @@ Requirements
pythonOCC needs the following libraries or programs to be installed before you
can compile/use it :
-- the python programming language (http://www.python.org). Python 2.7 and 3.x
- are officially supported,
+- the python programming language (http://www.python.org). Python 3.x is required. Python 2
+is officially dropped since the release 7.4.0.
-- OpenCascade Community Edition 0.18.x (https://github.com/tpaviot/oce),
+- OpenCascade 7.4.0 (https://dev.opencascade.org),
-- FreeType 2.6.3 (https://www.freetype.org/),
-
-- SWIG 3.0.9 or higher (http://www.swig.org),
-
-- CMake 2.8 or higher (http://www.cmake.org).
-
-**Important**: the OCE version has to match the pythonocc-core version,
-which is currently **0.18.x**
-
-- Optional : smesh-6.7.6 (https://github.com/tpaviot/smesh)
+- SWIG 3.0.11 or higher (http://www.swig.org),
Create a local copy of the repository
-------------------------------------
@@ -50,7 +41,6 @@ pythonocc-core compilation
The configuration steps uses cmake:
cmake ..
-
By default, cmake looks for oce include headers in /usr/local/include/oce and
libraries in /usr/local/include/lib. If these paths don't match your
installation, you have to set OCE_INCLUDE_PATH and OCE_LIB_PATH:
@@ -84,5 +74,6 @@ In order to check that everything is ok, run the pythonocc unittest suite:
cd ../test
python run_tests.py
-You can also run the examples avalaible in the pythonocc-core/examples
-directory.
+demos
+-----
+Download/test demos available at https://github.com/tpaviot/pythonocc-demos
diff --git a/NEWS b/NEWS
index ca91948ab..f8d29afbe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+==========================
+Version 7.4.0beta - December 2019
+
+This release require opencascade 7.4.0
+
+* Port to opencascade 7.4.0
+
+* Dropped SMESH support.
+
+==========================
+Version 0.18.2 - December 2019
+
+This release requires oce-0.18 or higher
+
+* wrapper : fixes
+
+* jupyter renderer
+
+THIS RELEASE IS THE LAST ONE DEPENDING ON OCE 0.18x
+
==========================
Version 0.18.1 - December 2017
diff --git a/README.md b/README.md
index 06d448cc6..ef5f7a9e1 100644
--- a/README.md
+++ b/README.md
@@ -12,52 +12,51 @@ pythonocc-core
About
-----
-pythonocc is a python library whose purpose is to provide 3D modeling
+pythonocc is a python package whose purpose is to provide 3D modeling
features. It is intended to developers who aim at developing
CAD/PDM/PLM applications.
-Latest release : [pythonocc-core 0.18.2 (december 2019)](https://github.com/tpaviot/pythonocc-core/releases/tag/0.18.2)
+Latest release : [pythonocc-core 7.4.0 (december 2019)](https://github.com/tpaviot/pythonocc-core/releases/tag/7.4.0)
-Download/install binaries
--------------------------
-pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/pythonocc-core) (they depend on third part libraries made available from the dlr-sc and conda-forge conda channels) for python 2.7, 3.5 and 3.6. This will get you up and running in minutes whether you run win32/win64/linux64/osx64. Here is an example for python 3.5:
+Build from source
+-----------------
-```bash
-# install pythonocc in the active environment with python 3.5
-conda install -c conda-forge -c dlr-sc -c pythonocc -c oce pythonocc-core==0.18.2 python=3.7
-```
+Read the [INSTALL.md](https://github.com/tpaviot/pythonocc-core/blob/master/INSTALL.md) instructions where you find compilation instructions for all platforms.
-Just replace "3.5" with "2.7" or "3.6" in the previous command to fit with your prefered python version.
+Download/install binaries for Linux/OSX/Windows
+-----------------------------------------------
-Download pre-releases/development binaries
-------------------------------------------
+pythonocc provides precompiled [conda packages](https://anaconda.org/pythonocc/pythonocc-core) (they depend on third part libraries made available from the dlr-sc and conda-forge conda channels) for python 3.5, 3.6 and 3.7. This will get you up and running in minutes whether you run win32/win64/linux64/osx64. Here is an example for python 3.7:
-Each time a change is committed to the github repository, related binaries are uploaded to the tpaviot anaconda channel, labelled with the git development branch name.
+```bash
+# first create an environment
+conda create --name=whatever-name python=3.7
+source activate whatever-name
+conda install -c dlr-sc/label/dev pythonocc-core==7.4.0beta
+```
-Go and check [https://anaconda.org/tpaviot/pythonocc-core](https://anaconda.org/tpaviot/pythonocc-core).
+Just replace "3.7" with the python version you target.
-Build from source
------------------
+Other pythonocc related resources
+---------------------------------
-Read the [INSTALL.md](https://github.com/tpaviot/pythonocc-core/blob/master/INSTALL.md) instructions where you find compilation instructions for all platforms.
+* Demos : python examples, as well as jupyter notebooks https://github.com/tpaviot/pythonocc-demos
-Online resources
-----------------
+* Docker, binderhub : docker and online jupyter notebooks https://github.com/tpaviot/pythonocc-binderhub
+
+Online resources for development
+--------------------------------
We use the following online resources:
* Homepage: http://www.pythonocc.org
-* Sources: https://github.com/tpaviot/pythonocc-core
-
* Anaconda cloud repository for official releases: https://anaconda.org/pythonocc
* Anaconda cloud repository for nightly builds: https://anaconda.org/tpaviot/pythonocc-core
* API documentation: https://cdn.rawgit.com/tpaviot/pythonocc-core/e05ec51b/doc/apidoc/0.18.1/
-* Issue/bug tracker: https://github.com/tpaviot/pythonocc-core/issues
-
* Mailing list: http://groups.google.com/group/pythonocc
* Twitter : https://twitter.com/pythonocc
@@ -70,18 +69,13 @@ We use the following online resources:
* Codacy quality checker: https://app.codacy.com/app/tpaviot/pythonocc-core
-oce and pythonocc
------------------
+pythonocc, oce and opencascade dependencies
+-------------------------------------------
+
+From release 7.4.0, pythonocc-core depends on the official OpenCascade-7.4.0 library (https://dev.opencascade.org)
-The basis of pythonocc is a python wrapper for the
-[oce C++ library / CAD kernel](https://github.com/tpaviot/oce), aka pythonocc-core.
-pythonocc-core version number matches the oce library releases its wrapping.
-
-For example; the current pythonocc-core release, 0.18, requires any of the [OCE
- 0.18.x](https://github.com/tpaviot/oce/releases) releases. Here, the __Major__
- version name of either OCE or pythonocc-core release is __0__, the __Minor__
- version is __18__ and the __Patch__ version is (optionally) __x__. pythonocc-core can be built with any OCE version that has a corresponding __Major__ and __Minor__ version
- number. For example, pythonocc-core 0.18.2 can be built with OCE-0.18.1.
+Former releases rely on oce (OpenCascade Community Edition), available at
+[oce C++ library / CAD kernel](https://github.com/tpaviot/oce).
License
-------
diff --git a/appveyor.yml b/appveyor.yml
index 839013960..59fe2f12f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,9 @@
-version: pythonocc-core-0.18.2.{build}
+version: pythonocc-core-7.4.0beta-dev.{build}
+
+os:
+ - Visual Studio 2015
+ - macOS
+ - Ubuntu
environment:
binstar_token:
@@ -8,16 +13,7 @@ environment:
# and copy paste to
# https://ci.appveyor.com/tools/encrypt
# then copy/paste the result below
- secure: +BLEI1wg9klPN7BVAY1thK7n1x1/L10dWtgKzOmGCI4mg4V77hes9yj3kjZ168xf
-
- global:
- # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
- # /E:ON and /V:ON options are not enabled in the batch script intepreter
- # See: http://stackoverflow.com/a/13751649/163740
- CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\appveyor\\obvci_appveyor_python_build_env.cmd"
-
- # Workaround for https://github.com/conda/conda-build/issues/636
- PYTHONIOENCODING: "UTF-8"
+ secure: 6Wllm3O0zxgpBaBDNMTQAVdcBb9tMylzp72/JlpDQjljxvmF/g8FPSDZaGVs9zR8
matrix:
- PYTHON: "C:\\Python36_32"
@@ -26,73 +22,58 @@ environment:
CONDA_PY: "36"
CONDA_NPY: "18"
CONDA_INSTALL_LOCN: "C:\\Miniconda36"
- - PYTHON: "C:\\Python36_64"
- PYTHON_VERSION: "3.6"
+ - PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
CONDA_PY: "36"
CONDA_NPY: "18"
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
- - PYTHON: "C:\\Python37_32"
- PYTHON_VERSION: "3.7"
+ - PYTHON_VERSION: "3.7"
PYTHON_ARCH: "32"
CONDA_PY: "37"
CONDA_NPY: "18"
CONDA_INSTALL_LOCN: "C:\\Miniconda37"
- - PYTHON: "C:\\Python37_64"
- PYTHON_VERSION: "3.7"
+ - PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"
CONDA_PY: "37"
CONDA_NPY: "18"
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
-# We always use a 64-bit machine, but can build x86 distributions
-# with the TARGET_ARCH variable (which is used by CMD_IN_ENV).
-platform:
- - x64
install:
- # Set the CONDA_NPY, although it has no impact on the actual build. We need this because of a test within conda-build.
- - cmd: set CONDA_NPY=19
- # Remove cygwin (and therefore the git that comes with it).
- - cmd: rmdir C:\cygwin /s /q
- # Use the pre-installed Miniconda for the desired arch
- #
- # However, it is really old. So, we need to update some
- # things before we proceed. That seems to require it being
- # on the path. So, we temporarily put conda on the path
- # so that we can update it. Then we remove it so that
- # we can do a proper activation.
- - cmd: set "OLDPATH=%PATH%"
- - cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
- - cmd: conda config --set always_yes yes --set changeps1 no
- - cmd: conda update conda
- - cmd: set "PATH=%OLDPATH%"
+ - ps: |
+ if ($isLinux) {
+ wget "http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh" -O miniconda.sh
+ } elseif ($isMacOS) {
+ brew install wget
+ wget "https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh" -O miniconda.sh
+ wget "https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.9.sdk.tar.xz" -O MacOSX10.9.sdk.tar.xz
+ tar xf MacOSX10.9.sdk.tar.xz
+ sudo mv MacOSX10.9.sdk /opt/
+ ls /opt
+ }
+ - sh: bash miniconda.sh -b
+ - sh: export PATH=$HOME/miniconda3/bin:$PATH
+ # On Windows, activate the environment
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- - cmd: conda config --set show_channel_urls true
- - cmd: conda update conda
- - cmd: conda install conda-build anaconda-client
- - cmd: conda config --add channels https://conda.anaconda.org/dlr-sc
- - cmd: conda config --add channels https://conda.anaconda.org/oce
- - cmd: conda config --add channels https://conda.anaconda.org/pythonocc
- - cmd: conda config --add channels https://conda.anaconda.org/tpaviot
+ # Following lines are os independant
+ - conda config --set always_yes yes --set changeps1 no
+ - conda config --set show_channel_urls true
+ - conda install conda-build anaconda-client
+ - conda config --add channels dlr-sc
- cmd: set PYTHONBUFFERED=1
+ - sh: export PYTHONBUFFERED=1
build: off
test_script:
- # Build and test the package. This appears(?) to sporadically fail due to a
- # bug in conda-build on 32 bit python.
- # https://github.com/conda/conda-build/issues/152
- #
- # Note also that our setup.py script, which is called by conda-build, writes
- # a __conda_version__.txt file, so the version number on the binary package
- # is set dynamically. This unfortunately mean that conda build --output
- # doesn't really work.
- #
- - "%CMD_IN_ENV% conda build .\\ci\\conda --quiet --no-remove-work-dir --dirty"
+ - cmd: conda build .\\ci\\conda --quiet --no-remove-work-dir --dirty
+ - sh: conda build ./ci/conda --quiet --no-remove-work-dir --dirty
# move conda package to /dist
- - cmd: 'mkdir dist'
- - cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-%PYTHON_ARCH%\pythonocc*.bz2 dist || cmd /c "exit /b 0"'
- # upload package to anaconda$
+ - mkdir dist # portable command windows/linux
+ # upload for osx
+ - sh: cp $HOME/miniconda3/conda-bld/osx-64/*.bz2 dist
+ - sh: anaconda -t $BINSTAR_TOKEN upload dist/*.bz2 -l cd-$APPVEYOR_REPO_BRANCH --force
+ # upload for Windows
+ - cmd: copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-%PYTHON_ARCH%\pythonocc*.bz2 dist || cmd /c "exit /b 0"
- ps: cmd /C anaconda --token $env:BINSTAR_TOKEN upload dist\*.bz2 -l cd-$env:APPVEYOR_REPO_BRANCH --force "2>&1"
artifacts:
diff --git a/ci/conda/bld.bat b/ci/conda/bld.bat
index 2ddaabfe1..53026fe24 100644
--- a/ci/conda/bld.bat
+++ b/ci/conda/bld.bat
@@ -1,20 +1,15 @@
mkdir build
cd build
-REM Remove dot from PY_VER for use in library name
-set MY_PY_VER=%PY_VER:.=%
-
REM Configure step
cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
-DPYTHONOCC_BUILD_TYPE=Release ^
-DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
-DCMAKE_SYSTEM_PREFIX_PATH="%LIBRARY_PREFIX%" ^
- -DPYTHON_EXECUTABLE:FILEPATH="%PYTHON%" ^
- -DPYTHON_INCLUDE_DIR:PATH="%PREFIX%"/include ^
- -DPYTHON_LIBRARY:FILEPATH="%PREFIX%"/libs/python%MY_PY_VER%.lib ^
- -DPYTHONOCC_WRAP_SMESH=ON ^
- -DSMESH_INCLUDE_PATH:PATH="%LIBRARY_PREFIX%"/include/smesh ^
- -DPYTHONOCC_WRAP_SMESH_NETGENPLUGIN=OFF ^
+ -DPython3_FIND_STRATEGY=LOCATION ^
+ -DPython3_FIND_REGISTRY=NEVER ^
+ -DPYTHONOCC_WRAP_SMESH=OFF ^
+ -DSWIG_HIDE_WARNINGS=ON ^
..
if errorlevel 1 exit 1
@@ -29,4 +24,4 @@ if errorlevel 1 exit 1
REM copy the source
REM cd ..
REM xcopy src "%LIBRARY_PREFIX%\src\pythonocc-core\src" /s /e /i
-REM if errorlevel 1 exit 1
\ No newline at end of file
+REM if errorlevel 1 exit 1
diff --git a/ci/conda/build.sh b/ci/conda/build.sh
index 376e2edd1..10d0839aa 100644
--- a/ci/conda/build.sh
+++ b/ci/conda/build.sh
@@ -1,38 +1,30 @@
# make an in source build do to some problems with install
-if [ "$PY3K" == "1" ]; then
- MY_PY_VER="${PY_VER}m"
-else
- MY_PY_VER="${PY_VER}"
-fi
-
-if [ $(uname) == Darwin ]; then
- PY_LIB="libpython${MY_PY_VER}.dylib"
-else
- PY_LIB="libpython${MY_PY_VER}.so"
+declare -a CMAKE_PLATFORM_FLAGS
+if [[ ${HOST} =~ .*linux.* ]]; then
+ CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE="${RECIPE_DIR}/cross-linux.cmake")
fi
# Configure step
cmake -G Ninja -DCMAKE_INSTALL_PREFIX=$PREFIX \
-DPYTHONOCC_BUILD_TYPE=Release \
+ ${CMAKE_PLATFORM_FLAGS[@]} \
-DCMAKE_PREFIX_PATH=$PREFIX \
-DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \
- -DPYTHON_EXECUTABLE:FILEPATH=$PYTHON \
- -DPYTHON_INCLUDE_DIR:PATH=$PREFIX/include/python$MY_PY_VER \
- -DPYTHON_LIBRARY:FILEPATH=$PREFIX/lib/${PY_LIB} \
- -DPYTHON_LIBRARY:FILEPATH=$PREFIX/lib/${PY_LIB} \
- -DPYTHONOCC_WRAP_SMESH=ON \
- -DSMESH_INCLUDE_PATH:PATH=$PREFIX/include/smesh \
- -DSMESH_LIB_PATH:PATH=$PREFIX/lib \
+ -DPython3_FIND_STRATEGY=LOCATION \
+ -DPython3_FIND_FRAMEWORK=NEVER \
+ -DSWIG_HIDE_WARNINGS=ON \
.
+
# Build step
-# on linux travis, limit the number of concurrent jobs otherwise
-# gcc gets out of memory
-ninja -j 6 install
+ninja
+
+# Install step
+ninja install
# fix rpaths
-#if [ `uname` == Darwin ]; then
-# for lib in `ls $SP_DIR/OCC/_*.so`; do
-# install_name_tool -rpath $PREFIX/lib @loader_path/../../../ $lib
-# done
-#fi
+if [ `uname` == Darwin ]; then
+ for lib in `ls $SP_DIR/OCC/_*.so`; do
+ install_name_tool -rpath $PREFIX/lib @loader_path/../../../ $lib
+ done
+fi
diff --git a/ci/conda/conda_build_config.yaml b/ci/conda/conda_build_config.yaml
new file mode 100644
index 000000000..8a4eef150
--- /dev/null
+++ b/ci/conda/conda_build_config.yaml
@@ -0,0 +1,8 @@
+CONDA_BUILD_SYSROOT:
+- /opt/MacOSX10.9.sdk # [osx]
+
+c_compiler:
+ - vs2015 # [win]
+
+cxx_compiler:
+ - vs2015 # [win]
\ No newline at end of file
diff --git a/ci/conda/cross-linux.cmake b/ci/conda/cross-linux.cmake
new file mode 100644
index 000000000..1693e0327
--- /dev/null
+++ b/ci/conda/cross-linux.cmake
@@ -0,0 +1,16 @@
+# this one is important
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_PLATFORM Linux)
+
+# specify the cross compiler
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+
+# where is the target environment
+set(CMAKE_FIND_ROOT_PATH $ENV{PREFIX} $ENV{BUILD_PREFIX}/$ENV{HOST}/sysroot)
+
+# search for programs in the build host directories
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
index 93d8fec26..052e34095 100644
--- a/ci/conda/meta.yaml
+++ b/ci/conda/meta.yaml
@@ -1,46 +1,41 @@
-# change the version number to "0.17.1" or "0.18" in case of a release build
+{% set version = "7.4.0beta" %}
+
package:
name: pythonocc-core
- version: 0.18.2
+ version: {{ version }}
source:
path: ../..
build:
- script_env:
- - CC
- - CXX
-
number: {{ GIT_DESCRIBE_NUMBER }}
binary_relocation: false [osx]
requirements:
build:
- - python
- - oce ==0.18.3
- - tbb
- - tbb-devel
+ - {{ compiler('cxx') }}
+ - {{ cdt('libx11-devel') }} # [linux]
+ - {{ cdt('xorg-x11-proto-devel') }} # [linux]
+ - {{ cdt('mesa-libgl-devel') }} # [linux]
+ - ninja
- cmake
- - ninja ==1.8.2
- - swig ==3.0.12
- - freetype >=2.9
- - smesh ==6.7.6
+ - swig >=3.0.11
+
+ host:
+ - python {{ python }}
+ - opencascade ==7.4.0
run:
- - oce ==0.18.3
- - python
- - tbb
- - freetype
- - smesh ==6.7.6
- - six
+ - opencascade ==7.4.0
+ - python {{ python }}
test:
imports:
- OCC
- OCC.Core.BRepPrimAPI
-
-
+ requires:
+ - pyqt >=5
about:
home: https://github.com/tpaviot/pythonocc-core
diff --git a/cmake/OCE_Modules.cmake b/cmake/OCE_Modules.cmake
index 25ff07cf6..4677b8b32 100644
--- a/cmake/OCE_Modules.cmake
+++ b/cmake/OCE_Modules.cmake
@@ -1,314 +1,358 @@
LIST(APPEND OCE_TOOLKIT_MODEL
-# TKERNEL
- FSD
- MMgt
- OSD
- Plugin
- Quantity
- Resource
- SortTools
- Standard
- StdFail
- Storage
- TColStd
- TCollection
- TShort
- Units
- UnitsAPI
- IncludeLibrary
- Dico
- NCollection
- Message
+
+# TKernel
+ FSD
+ MMgt
+ OSD
+ Plugin
+ Quantity
+ Resource
+ Standard
+ StdFail
+ Storage
+ TColStd
+ TCollection
+ TShort
+ Units
+ UnitsAPI
+ NCollection
+ Message
# TKMath
- math
- ElCLib
- ElSLib
- BSplCLib
- BSplSLib
- PLib
- Precision
- GeomAbs
- Poly
- CSLib
- Convert
- Bnd
- gp
- TColgp
- TopLoc
-# TKAdvTools
- Dynamic
- Materials
- Expr
- ExprIntrp
- GraphDS
- GraphTools
+ math
+ ElCLib
+ ElSLib
+ BSplCLib
+ BSplSLib
+ PLib
+ Precision
+ GeomAbs
+ Poly
+ CSLib
+ Convert
+ Bnd
+ gp
+ TColgp
+ TopLoc
+ BVH
+ Expr
+ ExprIntrp
+# TKBRep
+ TopoDS
+ TopExp
+ TopTools
+ BRep
+ BRepLProp
+ BRepAdaptor
+ BRepTools
+ BinTools
# TKG2d
- Geom2d
- LProp
- TColGeom2d
- Adaptor2d
- Geom2dLProp
- Geom2dAdaptor
- GProp
+ Geom2d
+ LProp
+ TColGeom2d
+ Adaptor2d
+ Geom2dLProp
+ Geom2dAdaptor
+ Geom2dEvaluator
# TKG3d
- Geom
- TColGeom
- GeomAdaptor
- AdvApprox
- GeomLProp
- Adaptor3d
- LProp3d
- TopAbs
+ Geom
+ GProp
+ TColGeom
+ GeomAdaptor
+ AdvApprox
+ GeomLProp
+ Adaptor3d
+ LProp3d
+ TopAbs
+ GeomEvaluator
# TKGeomBase
- ProjLib
- GeomProjLib
- GCPnts
- CPnts
- Approx
- AppParCurves
- FEmTool
- AppCont
- Extrema
- IntAna
- IntAna2d
- GeomConvert
- AdvApp2Var
- GeomLib
- Geom2dConvert
- Hermit
- BndLib
- AppDef
- GeomTools
- GC
- GCE2d
- gce
-# TKBRep
- TopoDS
- TopExp
- TopTools
- BRep
- BRepLProp
- BRepAdaptor
- BRepTools
-# TKGeomAlgo
- Hatch
- GeomInt
- IntStart
- IntWalk
- IntImp
- IntCurveSurface
- IntSurf
- IntPatch
- Geom2dInt
- IntImpParGen
- IntRes2d
- IntCurve
- TopTrans
- Intf
- ApproxInt
- GccAna
- GccEnt
- GccInt
- GccIter
- GccGeo
- HatchGen
- Geom2dHatch
- Law
- AppBlend
- Plate
- GeomPlate
- LocalAnalysis
- GeomAPI
- GeomFill
- Geom2dAPI
- Geom2dGcc
- FairCurve
- NLPlate
- IntPolyh
- TopClass
-# TKTopAlgo
- IntCurvesFace
- MAT
- MAT2d
- Bisector
- BRepMAT2d
- BRepCheck
- BRepBndLib
- BRepExtrema
- BRepClass
- BRepClass3d
- BRepLib
- BRepGProp
- BRepIntCurveSurface
- BRepTopAdaptor
- BRepBuilderAPI
- BRepApprox
-# TKPrim
- BRepPrim
- Primitives
- BRepSweep
- Sweep
- BRepPrimAPI
+ ProjLib
+ GeomProjLib
+ GCPnts
+ CPnts
+ Approx
+ AppParCurves
+ FEmTool
+ AppCont
+ Extrema
+ IntAna
+ IntAna2d
+ GeomConvert
+ AdvApp2Var
+ GeomLib
+ Geom2dConvert
+ Hermit
+ BndLib
+ AppDef
+ GeomTools
+ GC
+ GCE2d
+ gce
# TKBO
- IntTools
- BRepAlgoAPI
- BOPCol
- BOPInt
- BOPDS
- BOPAlgo
- BOPTools
+ IntTools
+ BRepAlgoAPI
+ BOPDS
+ BOPAlgo
+ BOPTools
+# TKBool
+ TopOpeBRep
+ TopOpeBRepDS
+ TopOpeBRepBuild
+ TopOpeBRepTool
+ BRepAlgo
+ BRepFill
+ BRepProj
+# TKFeat
+ LocOpe
+ BRepFeat
+# TKFillet
+ ChFiDS
+ ChFi2d
+ ChFi3d
+ ChFiKPart
+ Blend
+ BRepBlend
+ BlendFunc
+ BRepFilletAPI
+ FilletSurf
+# TKGeomAlgo
+ Hatch
+ GeomInt
+ IntStart
+ IntWalk
+ IntImp
+ IntCurveSurface
+ IntSurf
+ IntPatch
+ Geom2dInt
+ IntImpParGen
+ IntRes2d
+ IntCurve
+ TopTrans
+ Intf
+ ApproxInt
+ GccAna
+ GccEnt
+ GccInt
+ HatchGen
+ Geom2dHatch
+ Law
+ AppBlend
+ Plate
+ GeomPlate
+ LocalAnalysis
+ GeomAPI
+ GeomFill
+ Geom2dAPI
+ Geom2dGcc
+ FairCurve
+ NLPlate
+ IntPolyh
+ TopClass
# TKHLR
- HLRTopoBRep
- HLRBRep
- HLRAlgo
- HLRAppli
- Intrv
- TopBas
- TopCnx
- Contap
+ HLRTopoBRep
+ HLRBRep
+ HLRAlgo
+ HLRAppli
+ Intrv
+ TopBas
+ TopCnx
+ Contap
# TKMesh
- BRepMesh
- IntPoly
+ BRepMesh
+ BRepMeshData
+ IMeshTools
+ IMeshData
+# TKOffset
+ BRepOffsetAPI
+ Draft
+ BRepOffset
+ BiTgte
+# TKPrim
+ BRepPrim
+ BRepSweep
+ Sweep
+ BRepPrimAPI
# TKShHealing
- ShapeBuild
- ShapeExtend
- ShapeConstruct
- ShapeCustom
- ShapeAnalysis
- ShapeFix
- ShapeUpgrade
- ShapeAlgo
- ShapeProcess
- ShapeProcessAPI
+ ShapeBuild
+ ShapeExtend
+ ShapeConstruct
+ ShapeCustom
+ ShapeAnalysis
+ ShapeFix
+ ShapeUpgrade
+ ShapeAlgo
+ ShapeProcess
+ ShapeProcessAPI
+# TKTopAlgo
+ IntCurvesFace
+ MAT
+ MAT2d
+ Bisector
+ BRepMAT2d
+ BRepCheck
+ BRepBndLib
+ BRepExtrema
+ BRepClass
+ BRepClass3d
+ BRepLib
+ BRepGProp
+ BRepIntCurveSurface
+ BRepTopAdaptor
+ BRepBuilderAPI
+ BRepApprox
# TKXMesh
- XBRepMesh
-# TKBool
- TopOpeBRep
- TopOpeBRepDS
- TopOpeBRepBuild
- TopOpeBRepTool
- BRepAlgo
- BRepFill
- BRepProj
-# TKFillet
- ChFiDS
- ChFi2d
- ChFi3d
- ChFiKPart
- Blend
- BRepBlend
- BlendFunc
- BRepFilletAPI
- FilletSurf
-# TKFeat
- LocOpe
- BRepFeat
-# TKOffset
- BRepOffsetAPI
- Draft
- BRepOffset
- BiTgte
+ XBRepMesh
)
LIST(APPEND OCE_TOOLKIT_VISUALIZATION
-# TKVoxel
- Voxel
-# TKMeshVS
- MeshVS
+
# TKService
- Aspect
- SelectBasics
- Image
- InterfaceGraphic
- TColQuantity
-# TKNIS
- NIS
+ Aspect
+ SelectBasics
+ Image
+ InterfaceGraphic
+ TColQuantity
# TKV3d
- V3d
- Graphic3d
- Visual3d
- Select3D
- Prs3d
- StdPrs
- SelectMgr
- PrsMgr
- AIS
- DsgPrs
- StdSelect
- )
+ V3d
+ Graphic3d
+ Visual3d
+ Select3D
+ Prs3d
+ StdPrs
+ SelectMgr
+ PrsMgr
+ AIS
+ DsgPrs
+ StdSelect
+# TKMeshVS
+ MeshVS
+)
LIST(APPEND OCE_TOOLKIT_DATAEXCHANGE
+
+# TKBinXCAF
+ BinXCAFDrivers
+ BinMXCAFDoc
# TKIGES
- IGESControl
-# TKSTEPAttr
- RWStepDimTol
- RWStepVisual
- StepDimTol
- StepVisual
+ IGESControl
+ IGESData
+ IGESToBRep
+# TKRWMesh
+ RWGltf
+ RWObj
# TKSTEP
- StepAP214
- RWStepAP214
- StepAP203
- RWStepAP203
- STEPConstruct
- STEPEdit
- GeomToStep
- StepToGeom
- StepToTopoDS
- TopoDSToStep
- STEPControl
- STEPSelections
- StepAP209
+ StepAP214
+ RWStepAP214
+ StepAP203
+ RWStepAP203
+ STEPConstruct
+ STEPEdit
+ GeomToStep
+ StepToGeom
+ StepToTopoDS
+ TopoDSToStep
+ STEPControl
+ STEPSelections
+ StepAP209
+ RWStepAP242
+ StepAP242
# TKSTEP209
- RWStepElement
- RWStepFEA
- StepElement
- StepFEA
-# TKSTL
- StlMesh
- StlAPI
- StlTransfer
- RWStl
+ RWStepElement
+ RWStepFEA
+ StepElement
+ StepFEA
+# TKSTEPAttr
+ RWStepDimTol
+ RWStepVisual
+ StepDimTol
+ StepVisual
# TKSTEPBase
- StepBasic
- RWStepBasic
- StepRepr
- RWStepRepr
- StepGeom
- RWStepGeom
- StepShape
- RWStepShape
+ StepBasic
+ RWStepBasic
+ StepRepr
+ RWStepRepr
+ StepGeom
+ RWStepGeom
+ StepShape
+ RWStepShape
+ StepData
+# TKSTL
+ StlAPI
+ RWStl
+# TKVRML
+ Vrml
+ VrmlAPI
+ VrmlConverter
+ VrmlData
+# TKXCAF
+ XCAFApp
+ XCAFDimTolObjects
+ XCAFDoc
+ XCAFPrs
+ XCAFView
+ XCAFNoteObjects
+# TKXDEIGES
+ IGESCAFControl
+# TKXDESTEP
+ STEPCAFControl
# TKXSBase
- Interface
- IFSelect
- XSControl
- Transfer
- TransferBRep
- )
+ Interface
+ IFSelect
+ XSControl
+ Transfer
+ TransferBRep
+ MoniTool
+# TKXmlXCAF
+ XmlXCAFDrivers
+ XmlMXCAFDoc
+)
LIST(APPEND OCE_TOOLKIT_OCAF
+
+# TKBin
+ BinDrivers
+ BinMDataXtd
+ BinMNaming
+# TKBinL
+ BinLDrivers
+ BinMDF
+ BinMDataStd
+ BinMDocStd
+ BinMFunction
+ BinObjMgt
+# TKBinTObj
+ BinTObjDrivers
# TKCAF
- TDataXtd
- TNaming
- TPrsStd
- AppStd
-# TKLCAF
- TDF
- TDataStd
- TFunction
- TDocStd
- AppStdL
+ TDataXtd
+ TNaming
+ AppStd
# TKCDF
- CDF
- CDM
- PCDM
- UTL
-# TKXCAF
- XCAFApp
- XCAFDoc
- XCAFPrs
-# TKXDESTEP
- STEPCAFControl
-# TKXDEIGES
- IGESCAFControl
- )
+ CDF
+ CDM
+ LDOM
+ PCDM
+ UTL
+# TKLCAF
+ TDF
+ TDataStd
+ TFunction
+ TDocStd
+ AppStdL
+# TKTObj
+ TObj
+# TKVAF
+ TPrsStd
+# TKXml
+ XmlDrivers
+ XmlMDataXtd
+ XmlMNaming
+# TKXmlL
+ XmlLDrivers
+ XmlMDF
+ XmlMDataStd
+ XmlMDocStd
+ XmlMFunction
+ XmlObjMgt
+# TKXmlTObj
+ XmlTObjDrivers
+)
diff --git a/cmake/__init__.py b/cmake/__init__.py
index 98c99ed44..81327853b 100644
--- a/cmake/__init__.py
+++ b/cmake/__init__.py
@@ -1,10 +1,10 @@
import unittest
-PYTHONOCC_VERSION_MAJOR = 0
-PYTHONOCC_VERSION_MINOR = 18
-PYTHONOCC_VERSION_PATCH = 2
+PYTHONOCC_VERSION_MAJOR = 7
+PYTHONOCC_VERSION_MINOR = 4
+PYTHONOCC_VERSION_PATCH = 0
# Empty for official releases, set to -dev, -rc1, etc for development releases
-PYTHONOCC_VERSION_DEVEL = ''
+PYTHONOCC_VERSION_DEVEL = 'beta'
VERSION = "%s.%s.%s%s" % (PYTHONOCC_VERSION_MAJOR, PYTHONOCC_VERSION_MINOR,
PYTHONOCC_VERSION_PATCH, PYTHONOCC_VERSION_DEVEL)
diff --git a/src/Addons/Addons.h b/src/Addons/Addons.h
deleted file mode 100644
index 03af6591f..000000000
--- a/src/Addons/Addons.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-##Copyright 2016 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#if !defined __Addons__
-#define __Addons__
-
-#include
-#include
-#include
-
-TopoDS_Shape text_to_brep(char *text_to_render, char* aFontName, Font_FontAspect aFontAspect, Standard_Real aSize, Standard_Boolean isCompositeCurve);
-void display_available_fonts();
-void register_font(char* aFontPath);
-
-#endif
diff --git a/src/Addons/Addons.i b/src/Addons/Addons.i
deleted file mode 100644
index 3914cdb07..000000000
--- a/src/Addons/Addons.i
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-##Copyright 2016 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-%module(package="OCC") Addons
-
-%include ../SWIG_files/common/ExceptionCatcher.i
-
-%{
-#include
-#include
-#include
-#include
-%}
-
-// Font related functions
-enum Font_FontAspect
-{
-Font_FA_Undefined = 0,
-Font_FA_Regular = 1,
-Font_FA_Bold = 2,
-Font_FA_Italic = 3,
-Font_FA_BoldItalic = 4
-};
-
-
-
-%feature("compactdefaultargs") text_to_brep;
-%feature("autodoc", " * Creates a shape of the given text.
- :param text_to_render: Text to render
- :type text_to_render: char *
- :param aFontName: Font name
- :type aFontName: char *
- :param aFontAspect: Fontaspect, Font_FA_Regular, Font_FA_Bold, Font_FA_Italic or Font_FA_BoldItalic
- :type aFontAspect: Font_FontAspect
- :param aSize: Size of the font
- :type aSize: float
- :param isCompositeCurve:
- :type isCompositeCurve: bool
- :rtype: TopoDS_Shape
-") text_to_brep;
-TopoDS_Shape text_to_brep(char *text_to_render, char *aFontName, Font_FontAspect aFontAspect, float aSize, bool isCompositeCurve);
-
-%feature("compactdefaultargs") display_available_fonts;
-%feature("autodoc", " * Prints a list of all available fonts.
- :rtype: void
-") display_available_fonts;
-void display_available_fonts();
-
-%feature("compactdefaultargs") register_font;
-%feature("autodoc", " * Add a font to the available font list.
- :param aFontPath: Path to the font.
- :type aFontPath: char *
- :rtype: void
-") register_font;
-void register_font(char *aFontPath);
-
-
-class TextItem {
- public:
-
- %feature("compactdefaultargs") TextItem;
- %feature("autodoc", " * Displays a text in the screen
- :param theText: Text to display
- :type theText: const TCollection_AsciiString&
- :param theX1: X-Position on the display
- :type theX1: float
- :param theY1: Y-Position on the display
- :type theY1: float
- :param theHeight: Size of the font
- :type theHeight: float
- :param theFontName: Name of the font
- :type theFontName: const TCollection_AsciiString&
- :param theColor: Rgb color. E.g. Quantity_Color(0..1, 0..1, 0..1, 1)
- :type theColor: const Quantity_Color&
- :param theSubtitleColor: Rgb color of the sub title
- :type theSubtitleColor: const Quantity_Color&
- :param theTypeOfDisplay: Type of display, e.g. Aspect_TODT_NORMAL, Aspect_TODT_SUBTITLE, Aspect_TODT_DEKALE
- :type theTypeOfDisplay: int
- :param theLayer:
- :type: const Handle_Visual3d_Layer&
- :param ScrollX:
- :type: const float
- :param ScrollY:
- :type: const float
-") TextItem;
- TextItem(const TCollection_AsciiString& theText,
- float theX1,
- float theY1,
- float theHeight,
- const TCollection_AsciiString& theFontName,
- const Quantity_Color& theColor,
- const Quantity_Color& theSubtitleColor,
- int theTypeOfDisplay,
- const Handle_Visual3d_Layer& theLayer,
- float ScrollX=0.0,
- float ScrollY=0.0);
- void RedrawLayerPrs();
-};
-
-
-
-class LineItem {
- public:
- %feature("compactdefaultargs") LineItem;
- %feature("autodoc", " * Creates a shape of the given text
- :param X1: X-Position of the first point
- :type X1: float
- :param Y1: Y-Position of the first point
- :type Y1: float
- :param X2: X-Position of the second point
- :type X2: float
- :param Y2: Y-Position of the second point
- :type Y2: float
- :param theLayer: The Layer
- :type theLayer: const Handle_Visual3d_Layer&
- :param theType: Type of line: 0..10
- :type theType: int
- :param theWidth: Width of the line
- :type theWidth: float
- :param theTransp: Transparency: 0..1
- :type theTransp: float
- :param theColor: Rgb color
- :type theColor: const Quantity_Color &
-
-") LineItem;
- LineItem(float X1, float Y1,
- float X2, float Y2,
- const Handle_Visual3d_Layer& theLayer,
- int theType,
- float theWidth=0.5,
- float theTransp=1,
- const Quantity_Color& theColor=Quantity_Color(Quantity_NOC_WHITE));
- void RedrawLayerPrs();
-};
-
-
-class TextureItem {
-public:
- %feature("compactdefaultargs") TextureItem;
- %feature("autodoc", " * Creates a shape of the given text
- :param theImageFilename: Path to the image
- :type theImageFilename: const TCollection_AsciiString&
- :param theView: The display view
- :type theView: V3d_View *
- :param theLayer: Layer for the texture
- :type theLayer: const Handle_Visual3d_Layer&
-
-") TextureItem;
- TextureItem(const TCollection_AsciiString& theImageFilename,
- const Handle_Visual3d_Layer& theLayer);
- // redraw method
- void RedrawLayerPrs();
- // set position
- void SetPosition(int x_abs, int y_abs);
-};
diff --git a/src/Addons/Font3d.cpp b/src/Addons/Font3d.cpp
deleted file mode 100644
index 0bc150d72..000000000
--- a/src/Addons/Font3d.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-##Copyright 2016 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#include "Addons.h"
-
-// converts text to brep
-TopoDS_Shape text_to_brep(char *text_to_render, char* aFontName, Font_FontAspect aFontAspect, Standard_Real aSize, Standard_Boolean isCompositeCurve) {
- Font_BRepFont aFont;
- aFont.SetCompositeCurveMode(isCompositeCurve);
- if (aFont.Init (aFontName, aFontAspect, aSize))
- {
- std::cout << "Font " << aFontName << " succesffuly initialized.\n";
- }
- else {
- std::cerr << "Font " << aFontName << " initialization failed.\n";
- }
- return aFont.RenderText(text_to_render);
-}
-
-// display_available_fonts
-void display_available_fonts() {
- Handle(Font_FontMgr) aMgr = Font_FontMgr::GetInstance();
- for (Font_NListOfSystemFont::Iterator anIter (aMgr->GetAvailableFonts());
- anIter.More(); anIter.Next())
- {
- const Handle(Font_SystemFont)& aFont = anIter.Value();
- std::cout << (aFont->FontName()->String()).ToCString()
- << " " << aFont->FontAspect()
- << " " << (aFont->FontPath()->String()).ToCString() << "_\n";
- }
- }
-
-// register a new font given the font path
-// returns the font name
-void register_font(char* aFontPath) {
- Handle(Font_FontMgr) aMgr = Font_FontMgr::GetInstance();
- Font_FontAspect aFontAspect;
- Handle(Font_SystemFont) aFont = aMgr->CheckFont (aFontPath);
- if (aFont.IsNull())
- {
- std::cerr << "Error: font '" << aFontPath << "' is not found!\n";
- }
- else {
- aFontAspect = aFont->FontAspect();
- Handle(TCollection_HAsciiString) aName = aFont->FontName();
- aFont = new Font_SystemFont (aName, aFontAspect, new TCollection_HAsciiString (aFontPath));
- aMgr->RegisterFont (aFont, Standard_True);
- std::cout << "Font name:" << aName->String() << ", Aspect:" << aFontAspect << " successfully registered.\n";
- }
-}
diff --git a/src/Addons/LineItem.cpp b/src/Addons/LineItem.cpp
deleted file mode 100644
index 8c9f1e055..000000000
--- a/src/Addons/LineItem.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-##Copyright 2017 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#include "LineItem.h"
-
-
-// default constructor for line item
-LineItem::LineItem(Standard_Real X1, Standard_Real Y1,
- Standard_Real X2, Standard_Real Y2,
- const Handle(Visual3d_Layer)& theLayer,
- int theType,
- Standard_Real theWidth,
- Standard_Real theTransp,
- const Quantity_Color& theColor) :
- myX1(X1), myY1(Y1), myX2(X2), myY2(Y2),
- myWidth(theWidth), myTransparency(theTransp),
- myType(theType), myLayer(theLayer), myColor (theColor)
-{
- if (!myLayer.IsNull ())
- myLayer->AddLayerItem (this);
-}
-
-// render line
-void LineItem::RedrawLayerPrs ()
-{
- if (myLayer.IsNull ())
- return;
- myLayer->SetColor(myColor);
- myLayer->SetTransparency((Standard_ShortReal)myTransparency);
- myLayer->SetLineAttributes((Aspect_TypeOfLine)myType, myWidth);
- myLayer->BeginPolyline();
- myLayer->AddVertex(myX1, myY1);
- myLayer->AddVertex(myX2, myY2);
- myLayer->ClosePrimitive();
-}
diff --git a/src/Addons/LineItem.h b/src/Addons/LineItem.h
deleted file mode 100644
index 98e6db9a6..000000000
--- a/src/Addons/LineItem.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-##Copyright 2017 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#if !defined __LineItem__
-#define __LineItem__
-
-#include
-#include
-#include
-
-DEFINE_STANDARD_HANDLE(LineItem, Visual3d_LayerItem)
-
-// this class provides a presentation of text item in v3d view under-/overlayer
-class LineItem : public Visual3d_LayerItem
-{
-public:
- // constructor
- LineItem(Standard_Real X1, Standard_Real Y1,
- Standard_Real X2, Standard_Real Y2,
- const Handle(Visual3d_Layer)& theLayer,
- int theType = (int)Aspect_TOL_SOLID,
- Standard_Real theWidth = 0.5,
- Standard_Real theTransp = 1.0,
- const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_WHITE));
- // redraw method
- void RedrawLayerPrs();
-
-private:
- Standard_Real myX1, myY1, myX2, myY2;
- Standard_Real myWidth;
- Standard_Real myTransparency;
- int myType;
- Handle(Visual3d_Layer) myLayer;
- Quantity_Color myColor;
-};
-
-#endif
diff --git a/src/Addons/TextItem.cpp b/src/Addons/TextItem.cpp
deleted file mode 100644
index f3fb1ab77..000000000
--- a/src/Addons/TextItem.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-##Copyright 2017 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#include "TextItem.h"
-
-
-// create and add to display the text item
-TextItem::TextItem (const TCollection_AsciiString& theText,
- const Standard_Real theX1,
- const Standard_Real theY1,
- const Standard_Real theHeight,
- const TCollection_AsciiString& theFontName,
- const Quantity_Color& theColor,
- const Quantity_Color& theSubtitleColor,
- int theTypeOfDisplay,
- const Handle(Visual3d_Layer)& theLayer,
- const Standard_Real scrollX,
- const Standard_Real scrollY)
- : myX1 (theX1), myY1 (theY1),
- myScrollX(scrollX), myScrollY(scrollY),
- myText (theText),
- myHeight (theHeight),
- myLayer (theLayer),
- myColor (theColor),
- mySubtitleColor (theSubtitleColor),
- myType ((Aspect_TypeOfDisplayText) theTypeOfDisplay),
- myFontName (theFontName)
-{
- if (!myLayer.IsNull ())
- myLayer->AddLayerItem (this);
-}
-
-// render item
-void TextItem::RedrawLayerPrs ()
-{
- if (myLayer.IsNull ())
- return;
- myLayer->SetColor (myColor);
- myLayer->SetTextAttributes (myFontName.ToCString (), myType, mySubtitleColor);
- myX1 += myScrollX;
- myY1 += myScrollY;
- myLayer->DrawText (myText.ToCString (), myX1, myY1, myHeight);
-}
diff --git a/src/Addons/TextItem.h b/src/Addons/TextItem.h
deleted file mode 100644
index 7f22405a9..000000000
--- a/src/Addons/TextItem.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-##Copyright 2017 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#if !defined __TextItem__
-#define __TextItem__
-
-#include
-#include
-#include
-
-DEFINE_STANDARD_HANDLE(TextItem, Visual3d_LayerItem)
-
-// this class provides a presentation of text item in v3d view under-/overlayer
-class TextItem : public Visual3d_LayerItem
-{
-public:
- // constructor
- TextItem(const TCollection_AsciiString& theText,
- const Standard_Real theX1,
- const Standard_Real theY1,
- const Standard_Real theHeight,
- const TCollection_AsciiString& theFontName,
- const Quantity_Color& theColor,
- const Quantity_Color& theSubtitleColor,
- int theTypeOfDisplay,
- const Handle(Visual3d_Layer)& theLayer,
- const Standard_Real scrollX=0.0,
- const Standard_Real scrollY=0.0);
-
- // redraw method
- void RedrawLayerPrs();
-
-private:
-
- Standard_Real myX1;
- Standard_Real myY1;
- TCollection_AsciiString myText;
- Standard_Real myHeight;
- Handle(Visual3d_Layer) myLayer;
- Quantity_Color myColor;
- Quantity_Color mySubtitleColor;
- Aspect_TypeOfDisplayText myType;
- TCollection_AsciiString myFontName;
- Standard_Real myScrollX;
- Standard_Real myScrollY;
-};
-
-#endif
diff --git a/src/Addons/TextureItem.cpp b/src/Addons/TextureItem.cpp
deleted file mode 100644
index 8a4f6e998..000000000
--- a/src/Addons/TextureItem.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-##Copyright 2017 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#include "TextureItem.h"
-
-#include
-
-TextureItem::TextureItem (const TCollection_AsciiString& theImageFilename,
- const Handle(Visual3d_Layer)& theLayer):
- myLayer(theLayer), x(0), y(0), myTextureId (-1)
-{
- Handle(Image_AlienPixMap) theImage=new Image_AlienPixMap();
- theImage->Load(theImageFilename);
- if (!theImage.IsNull()) {
- myW = theImage->Width();
- myH = theImage->Height();
-
- unsigned char *aData = (unsigned char*)Standard::Allocate ((myW * myH) << 2);
- unsigned char *p = aData;
- Standard_Integer i, j;
- Quantity_Color aColor;
- Quantity_Parameter theAlpha;
-
- for ( j = 0; j < myH; j++) {
- for ( i = 0; i < myW; i++ ) {
- aColor = theImage->PixelColor (i, j, theAlpha);
- *p++ = (unsigned char)(255 * aColor.Red());
- *p++ = (unsigned char)(255 * aColor.Green());
- *p++ = (unsigned char)(255 * aColor.Blue());
- *p++ = (unsigned char)(255 * theAlpha);
- }
- }
- Init (aData);
- }
- if (!myLayer.IsNull ())
- myLayer->AddLayerItem (this);
-}
-
-/*! Destroys the object and frees all allocated resources.
-*/
-TextureItem::~TextureItem()
-{
- if (myTextureId > 0)
- glDeleteTextures (1, &myTextureId);
- myTextureId = -1;
-}
-
-void TextureItem::Init(unsigned char* theData)
-{
- glGenTextures(1, &myTextureId);
- glBindTexture(GL_TEXTURE_2D, myTextureId);
-
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
- glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, myW, myH, 0, GL_RGBA, GL_UNSIGNED_BYTE, theData);
-
- Standard_Address aData = theData;
- Standard::Free (aData);
-}
-
-// render item
-void TextureItem::RedrawLayerPrs ()
-{
- glEnable(GL_TEXTURE_2D);
- glEnable(GL_BLEND);
- glBindTexture(GL_TEXTURE_2D, myTextureId);
- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glBegin(GL_QUADS);
-
- glTexCoord2f (0.0f, 0.0f); glVertex2f (x, y);
- glTexCoord2f (1.0f, 0.0f); glVertex2f (x + myW, y);
- glTexCoord2f (1.0f, 1.0f); glVertex2f (x + myW, y + myH);
- glTexCoord2f (0.0f, 1.0f); glVertex2f (x, y + myH);
-
- glEnd();
- glDisable(GL_BLEND);
- glDisable(GL_TEXTURE_2D);
-}
diff --git a/src/Addons/TextureItem.h b/src/Addons/TextureItem.h
deleted file mode 100644
index 37bb7e4ee..000000000
--- a/src/Addons/TextureItem.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-##Copyright 2017 Thomas Paviot (tpaviot@gmail.com)
-##
-##This file is part of pythonOCC.
-##
-##pythonOCC is free software: you can redistribute it and/or modify
-##it under the terms of the GNU Lesser General Public License as published by
-##the Free Software Foundation, either version 3 of the License, or
-##(at your option) any later version.
-##
-##pythonOCC is distributed in the hope that it will be useful,
-##but WITHOUT ANY WARRANTY; without even the implied warranty of
-##MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-##GNU General Public License for more details.
-##
-##You should have received a copy of the GNU Lesser General Public License
-##along with pythonOCC. If not, see .
-*/
-
-#if !defined __TextureItem__
-#define __TextureItem__
-
-#include
-#include
-#include
-#include
-#include
-
-DEFINE_STANDARD_HANDLE(TextureItem, Visual3d_LayerItem)
-
-// this class provides a presentation of text item in v3d view under-/overlayer
-class TextureItem : public Visual3d_LayerItem
-{
-public:
- // constructor
- TextureItem (const TCollection_AsciiString& theImageFilename,
- const Handle(Visual3d_Layer)& theLayer);
-
- // Destructor.
- ~TextureItem();
-
- // redraw method
- void RedrawLayerPrs();
-
- //! Sets texture position in the view port.
- void SetPosition(int x_abs, int y_abs) {x=x_abs;y=y_abs;}
-
-private:
- //! Allocates and initializes the texture.
- void Init (unsigned char* theData);
- Aspect_TypeOfConstraint myPos;
- unsigned int myTextureId;
- Handle(Visual3d_Layer) myLayer;
- int myH;
- int myW;
- int x;
- int y;
-};
-
-#endif
diff --git a/src/Display/OCCViewer.py b/src/Display/OCCViewer.py
index 011829eca..cd5499bbb 100644
--- a/src/Display/OCCViewer.py
+++ b/src/Display/OCCViewer.py
@@ -28,7 +28,7 @@
import OCC
from OCC.Core.Aspect import Aspect_GFM_VER
-from OCC.Core.AIS import AIS_Shape, AIS_Shaded, AIS_TexturedShape, AIS_WireFrame
+from OCC.Core.AIS import AIS_Shape, AIS_Shaded, AIS_TexturedShape, AIS_WireFrame, AIS_Shape_SelectionMode
from OCC.Core.TopoDS import TopoDS_Shape
from OCC.Core.gp import gp_Dir, gp_Pnt, gp_Pnt2d, gp_Vec
from OCC.Core.BRepBuilderAPI import (BRepBuilderAPI_MakeVertex,
@@ -40,22 +40,24 @@
from OCC.Core.Geom import Geom_Curve, Geom_Surface
from OCC.Core.Geom2d import Geom2d_Curve
from OCC.Core.Visualization import Display3d
-from OCC.Core.V3d import (V3d_ZBUFFER, V3d_PHONG, V3d_Zpos, V3d_Zneg, V3d_Xpos,
- V3d_Xneg, V3d_Ypos, V3d_Yneg, V3d_XposYnegZpos, V3d_TEX_ALL,
- V3d_TEX_NONE, V3d_TEX_ENVIRONMENT,
- V3d_LayerMgr)
+from OCC.Core.V3d import (V3d_ZBUFFER, V3d_Zpos, V3d_Zneg, V3d_Xpos,
+ V3d_Xneg, V3d_Ypos, V3d_Yneg, V3d_XposYnegZpos)
from OCC.Core.TCollection import TCollection_ExtendedString, TCollection_AsciiString
from OCC.Core.Quantity import (Quantity_Color, Quantity_TOC_RGB, Quantity_NOC_WHITE,
Quantity_NOC_BLACK, Quantity_NOC_BLUE1,
Quantity_NOC_CYAN1, Quantity_NOC_RED,
Quantity_NOC_GREEN, Quantity_NOC_ORANGE, Quantity_NOC_YELLOW)
-from OCC.Core.Prs3d import Prs3d_Arrow, Prs3d_Presentation, Prs3d_Text, Prs3d_TextAspect
+from OCC.Core.Prs3d import Prs3d_Arrow, Prs3d_Text, Prs3d_TextAspect
from OCC.Core.Graphic3d import (Graphic3d_NOM_NEON_GNC, Graphic3d_NOT_ENV_CLOUDS,
- Handle_Graphic3d_TextureEnv, Graphic3d_TextureEnv,
+ Handle_Graphic3d_TextureEnv_Create, Graphic3d_TextureEnv,
Graphic3d_Camera, Graphic3d_RM_RAYTRACING,
Graphic3d_RM_RASTERIZATION,
Graphic3d_StereoMode_QuadBuffer,
- Graphic3d_RenderingParams)
+ Graphic3d_RenderingParams,
+ Graphic3d_MaterialAspect,
+ Graphic3d_TOSM_FRAGMENT,
+ Graphic3d_Structure
+ )
from OCC.Core.Aspect import Aspect_TOTP_RIGHT_LOWER, Aspect_FM_STRETCH, Aspect_FM_NONE
# Shaders and Units definition must be found by occ
@@ -165,7 +167,7 @@ def unregister_callback(self, callback):
self._select_callbacks.remove(callback)
def MoveTo(self, X, Y):
- self.Context.MoveTo(X, Y, self.View)
+ self.Context.MoveTo(X, Y, self.View, True)
def FitAll(self):
self.View.ZFitAll()
@@ -198,7 +200,7 @@ def Create(self, create_default_lights=True, draw_face_boundaries=True, phong_sh
if phong_shading:
# gouraud shading by default, prefer phong instead
- self.View.SetShadingModel(V3d_PHONG)
+ self.View.SetShadingModel(Graphic3d_TOSM_FRAGMENT)
# the selected elements gray by default, better to use orange...
# self.Context.SelectionColor(Quantity_NOC_ORANGE)
@@ -207,15 +209,19 @@ def Create(self, create_default_lights=True, draw_face_boundaries=True, phong_sh
self._struc_mgr = self.Context.MainPrsMgr().StructureManager()
# overlayer
- self.OverLayer = self.Viewer.Viewer().OverLayer()
- if self.OverLayer is None:
- aMgr = V3d_LayerMgr(self.View)
- self.OverLayer = aMgr.Overlay()
- self.View.SetLayerMgr(aMgr)
- print("Layer manager created")
- height, width = self.View.Window().Size()
- print("Layer dimensions: %i, %i" % (height, width))
- self.OverLayer.SetViewport(height, width)
+ ## TODO : code below is deprecated
+ ## for overlayers see
+ ## https://dev.opencascade.org/doc/overview/html/occt_dev_guides__upgrade.html
+ ##
+ # self.OverLayer = self.Viewer.Viewer().OverLayer()
+ # if self.OverLayer is None:
+ # aMgr = V3d_LayerMgr(self.View)
+ # self.OverLayer = aMgr.Overlay()
+ # self.View.SetLayerMgr(aMgr)
+ # print("Layer manager created")
+ # height, width = self.View.Window().Size()
+ # print("Layer dimensions: %i, %i" % (height, width))
+ # self.OverLayer.SetViewport(height, width)
# turn self._inited flag to True
self._inited = True
@@ -228,20 +234,20 @@ def ResetView(self):
def Repaint(self):
# overlayed objects
- self.OverLayer.Begin()
- for item in self._overlay_items:
- item.RedrawLayerPrs()
- self.OverLayer.End()
+ #self.OverLayer.Begin()
+ #for item in self._overlay_items:
+ # item.RedrawLayerPrs()
+ #self.OverLayer.End()
# finally redraw the view
self.Viewer.Redraw()
def SetModeWireFrame(self):
self.View.SetComputedMode(False)
- self.Context.SetDisplayMode(AIS_WireFrame)
+ self.Context.SetDisplayMode(AIS_WireFrame, True)
def SetModeShaded(self):
self.View.SetComputedMode(False)
- self.Context.SetDisplayMode(AIS_Shaded)
+ self.Context.SetDisplayMode(AIS_Shaded, True)
def SetModeHLR(self):
self.View.SetComputedMode(True)
@@ -287,12 +293,10 @@ def EnableTextureEnv(self, name_of_texture=Graphic3d_NOT_ENV_CLOUDS):
"""
texture_env = Graphic3d_TextureEnv(name_of_texture)
self.View.SetTextureEnv(texture_env)
- self.View.SetSurfaceDetail(V3d_TEX_ENVIRONMENT)
self.View.Redraw()
def DisableTextureEnv(self):
- self.View.SetSurfaceDetail(V3d_TEX_NONE)
- a_null_texture = Handle_Graphic3d_TextureEnv()
+ a_null_texture = Handle_Graphic3d_TextureEnv_Create()
self.View.SetTextureEnv(a_null_texture) # Passing null handle to clear the texture data
self.View.Redraw()
@@ -352,7 +356,7 @@ def display_graduated_trihedron(self):
def display_triedron(self):
""" Show a black triedron in lower right corner
"""
- self.View.TriedronDisplay(Aspect_TOTP_RIGHT_LOWER, Quantity_NOC_BLACK, 0.1, V3d_ZBUFFER)
+ self.View.TriedronDisplay(Aspect_TOTP_RIGHT_LOWER, Quantity_Color(Quantity_NOC_BLACK), 0.1, V3d_ZBUFFER)
def hide_triedron(self):
""" Show a black triedron in lower right corner
@@ -390,25 +394,25 @@ def DisplayVector(self, vec, pnt, update=False):
""" displays a vector as an arrow
"""
if self._inited:
- aPresentation = Prs3d_Presentation(self._struc_mgr)
+ aStructure = Graphic3d_Structure(self._struc_mgr)
pnt_as_vec = gp_Vec(pnt.X(), pnt.Y(), pnt.Z())
start = pnt_as_vec + vec
pnt_start = gp_Pnt(start.X(), start.Y(), start.Z())
Prs3d_Arrow.Draw(
- aPresentation,
+ aStructure,
pnt_start,
gp_Dir(vec),
math.radians(20),
vec.Magnitude()
)
- aPresentation.Display()
+ aStructure.Display()
# it would be more coherent if a AIS_InteractiveObject
# would be returned
if update:
self.Repaint()
- return aPresentation
+ return aStructure
def DisplayMessage(self, point, text_to_write, height=None, message_color=None, update=False):
"""
@@ -416,7 +420,7 @@ def DisplayMessage(self, point, text_to_write, height=None, message_color=None,
:text_to_write: a string
:message_color: triple with the range 0-1
"""
- aPresentation = Prs3d_Presentation(self._struc_mgr)
+ aStructure = Graphic3d_Structure(self._struc_mgr)
text_aspect = Prs3d_TextAspect()
if message_color is not None:
@@ -425,16 +429,16 @@ def DisplayMessage(self, point, text_to_write, height=None, message_color=None,
text_aspect.SetHeight(height)
if isinstance(point, gp_Pnt2d):
point = gp_Pnt(point.X(), point.Y(), 0)
- Prs3d_Text.Draw(aPresentation,
+ Prs3d_Text.Draw(aStructure,
text_aspect,
to_string(text_to_write),
point)
- aPresentation.Display()
+ aStructure.Display()
# @TODO: it would be more coherent if a AIS_InteractiveObject
# is be returned
if update:
self.Repaint()
- return aPresentation
+ return aStructure
def DisplayShape(self, shapes, material=None, texture=None, color=None, transparency=None, update=False):
""" display one or a set of displayable objects
@@ -474,7 +478,6 @@ def DisplayShape(self, shapes, material=None, texture=None, color=None, transpar
for shape in shapes:
if material or texture:
if texture:
- self.View.SetSurfaceDetail(V3d_TEX_ALL)
shape_to_display = AIS_TexturedShape(shape)
filename, toScaleU, toScaleV, toRepeatU, toRepeatV, originU, originV = texture.GetProperties()
shape_to_display.SetTextureFileName(TCollection_AsciiString(filename))
@@ -485,7 +488,7 @@ def DisplayShape(self, shapes, material=None, texture=None, color=None, transpar
shape_to_display.SetDisplayMode(3)
elif material:
shape_to_display = AIS_Shape(shape)
- shape_to_display.SetMaterial(material)
+ shape_to_display.SetMaterial(Graphic3d_MaterialAspect(material))
else:
# TODO: can we use .Set to attach all TopoDS_Shapes
# to this AIS_Shape instance?
@@ -509,10 +512,12 @@ def DisplayShape(self, shapes, material=None, texture=None, color=None, transpar
if material is None:
#The default material is too shiny to show the object
#color well, so I set it to something less reflective
- shape_to_display.SetMaterial(Graphic3d_NOM_NEON_GNC)
+ shape_to_display.SetMaterial(Graphic3d_MaterialAspect(Graphic3d_NOM_NEON_GNC))
if color:
if isinstance(color, str):
color = get_color_from_name(color)
+ elif isinstance(color, int):
+ color = Quantity_Color(color)
for shp in ais_shapes:
self.Context.SetColor(shp, color, False)
if transparency:
@@ -538,7 +543,7 @@ def DisplayColoredShape(self, shapes, color='YELLOW', update=False, ):
'CYAN': Quantity_NOC_CYAN1,
'BLACK': Quantity_NOC_BLACK,
'ORANGE': Quantity_NOC_ORANGE}
- clr = Quantity_Color(dict_color[color])
+ clr = dict_color[color]
elif isinstance(color, Quantity_Color):
clr = color
else:
@@ -547,17 +552,19 @@ def DisplayColoredShape(self, shapes, color='YELLOW', update=False, ):
return self.DisplayShape(shapes, color=clr, update=update)
def EnableAntiAliasing(self):
- self.View.SetAntialiasingOn()
- self.Repaint()
+ #self.View.SetAntialiasingOn()
+ #self.Repaint()
+ print("Warning: EnableAntiAliasing does not work as exce$")
def DisableAntiAliasing(self):
- self.View.SetAntialiasingOff()
- self.Repaint()
+ #self.View.SetAntialiasingOff()
+ #self.Repaint()
+ print("Warning: DisableAntiAliasing does not work as exce$")
def EraseAll(self):
# nessecary to remove text added by DisplayMessage
self.Context.PurgeDisplay()
- self.Context.EraseAll()
+ self.Context.EraseAll(True)
def Tumble(self, num_images, animation=True):
self.View.Tumble(num_images, animation)
@@ -566,14 +573,12 @@ def Pan(self, dx, dy):
self.View.Pan(dx, dy)
def SetSelectionMode(self, mode=None):
- self.Context.CloseAllContexts()
- self.Context.OpenLocalContext()
topo_level = next(modes)
if mode is None:
- self.Context.ActivateStandardMode(topo_level)
+ self.Context.Activate(AIS_Shape_SelectionMode(topo_level), True)
else:
- self.Context.ActivateStandardMode(mode)
- self.Context.UpdateSelected()
+ self.Context.Activate(AIS_Shape_SelectionMode(mode), True)
+ self.Context.UpdateSelected(True)
def SetSelectionModeVertex(self):
self.SetSelectionMode(TopAbs_VERTEX)
@@ -585,10 +590,10 @@ def SetSelectionModeFace(self):
self.SetSelectionMode(TopAbs_FACE)
def SetSelectionModeShape(self):
- self.Context.CloseAllContexts()
+ self.Context.Deactivate()
def SetSelectionModeNeutral(self):
- self.Context.CloseAllContexts()
+ self.Context.Deactivate()
def GetSelectedShapes(self):
return self.selected_shapes
@@ -600,7 +605,7 @@ def GetSelectedShape(self):
return self.selected_shape
def SelectArea(self, Xmin, Ymin, Xmax, Ymax):
- self.Context.Select(Xmin, Ymin, Xmax, Ymax, self.View)
+ self.Context.Select(Xmin, Ymin, Xmax, Ymax, self.View, True)
self.Context.InitSelected()
# reinit the selected_shapes list
self.selected_shapes = []
@@ -613,7 +618,7 @@ def SelectArea(self, Xmin, Ymin, Xmax, Ymax):
callback(self.selected_shapes, Xmin, Ymin, Xmax, Ymax)
def Select(self, X, Y):
- self.Context.Select()
+ self.Context.Select(True)
self.Context.InitSelected()
self.selected_shapes = []
diff --git a/src/Display/SimpleGui.py b/src/Display/SimpleGui.py
index ebe2293f3..6e0f4c04a 100644
--- a/src/Display/SimpleGui.py
+++ b/src/Display/SimpleGui.py
@@ -182,10 +182,11 @@ def add_function_to_menu(self, menu_name, _callable):
if not app: # create QApplication if it doesnt exist
app = QtWidgets.QApplication(sys.argv)
win = MainWindow()
+ win.resize(size[0] -1, size[1] -1)
win.show()
- win.resize(size[0], size[1])
win.centerOnScreen()
win.canva.InitDriver()
+ win.resize(size[0], size[1])
win.canva.qApp = app
display = win.canva._display
diff --git a/src/Display/WebGl/threejs_renderer.py b/src/Display/WebGl/threejs_renderer.py
index 56d024e10..3d5d5f091 100644
--- a/src/Display/WebGl/threejs_renderer.py
+++ b/src/Display/WebGl/threejs_renderer.py
@@ -30,7 +30,7 @@
from OCC.Extend.TopologyUtils import is_edge, is_wire, discretize_edge, discretize_wire
from OCC.Display.WebGl.simple_server import start_server
-THREEJS_RELEASE = "r106"
+THREEJS_RELEASE = "r110"
def spinning_cursor():
while True:
diff --git a/src/Extend/DataExchange.py b/src/Extend/DataExchange.py
index 8d3993e66..c3fb812cb 100644
--- a/src/Extend/DataExchange.py
+++ b/src/Extend/DataExchange.py
@@ -19,10 +19,12 @@
from OCC.Core.TopoDS import TopoDS_Shape
from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
-from OCC.Core.StlAPI import StlAPI_Reader, StlAPI_Writer
+from OCC.Core.StlAPI import stlapi_Read, StlAPI_Writer
from OCC.Core.BRep import BRep_Builder
from OCC.Core.TopoDS import TopoDS_Compound
from OCC.Core.IGESControl import IGESControl_Reader, IGESControl_Writer
+# TODO : ugly, the following line must be imported for STEPControl to be imported
+from OCC.Core.StepShape import StepShape_Shell
from OCC.Core.STEPControl import STEPControl_Reader, STEPControl_Writer, STEPControl_AsIs
from OCC.Core.Interface import Interface_Static_SetCVal
from OCC.Core.IFSelect import IFSelect_RetDone, IFSelect_ItemsByEntity
@@ -350,9 +352,8 @@ def read_stl_file(filename):
if not os.path.isfile(filename):
raise FileNotFoundError("%s not found." % filename)
- stl_reader = StlAPI_Reader()
the_shape = TopoDS_Shape()
- stl_reader.Read(the_shape, filename)
+ stlapi_Read(the_shape, filename)
if the_shape.IsNull():
raise AssertionError("Shape is null.")
diff --git a/src/Extend/ShapeFactory.py b/src/Extend/ShapeFactory.py
index 54775aa0d..d04c0f13b 100644
--- a/src/Extend/ShapeFactory.py
+++ b/src/Extend/ShapeFactory.py
@@ -44,7 +44,6 @@ def make_edge(*args):
def make_edge2d(*args):
edge = BRepBuilderAPI_MakeEdge2d(*args)
result = edge.Edge()
- edge.Delete()
return result
diff --git a/src/Extend/TopologyUtils.py b/src/Extend/TopologyUtils.py
index 2c7dea6d9..27c2a1882 100644
--- a/src/Extend/TopologyUtils.py
+++ b/src/Extend/TopologyUtils.py
@@ -19,29 +19,30 @@
from __future__ import print_function
+from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakeSphere
from OCC.Core.BRep import BRep_Tool
from OCC.Core.BRepTools import BRepTools_WireExplorer
from OCC.Core.TopAbs import (TopAbs_VERTEX, TopAbs_EDGE, TopAbs_FACE, TopAbs_WIRE,
- TopAbs_SHELL, TopAbs_SOLID, TopAbs_COMPOUND,
- TopAbs_COMPSOLID)
+ TopAbs_SHELL, TopAbs_SOLID, TopAbs_COMPOUND,
+ TopAbs_COMPSOLID)
from OCC.Core.TopExp import TopExp_Explorer, topexp_MapShapesAndAncestors
from OCC.Core.TopTools import (TopTools_ListOfShape,
- TopTools_ListIteratorOfListOfShape,
- TopTools_IndexedDataMapOfShapeListOfShape)
-from OCC.Core.TopoDS import (TopoDS_Wire, TopoDS_Vertex, TopoDS_Edge,
- TopoDS_Face, TopoDS_Shell, TopoDS_Solid,
- TopoDS_Compound, TopoDS_CompSolid, topods_Edge,
- topods_Vertex, TopoDS_Iterator)
+ TopTools_ListIteratorOfListOfShape,
+ TopTools_IndexedDataMapOfShapeListOfShape)
+from OCC.Core.TopoDS import (topods, TopoDS_Wire, TopoDS_Vertex, TopoDS_Edge,
+ TopoDS_Face, TopoDS_Shell, TopoDS_Solid,
+ TopoDS_Compound, TopoDS_CompSolid, topods_Edge,
+ topods_Vertex, TopoDS_Iterator)
from OCC.Core.GCPnts import GCPnts_UniformAbscissa
from OCC.Core.BRepAdaptor import BRepAdaptor_Curve
+
class WireExplorer(object):
'''
Wire traversal
'''
def __init__(self, wire):
- if not isinstance(wire, TopoDS_Wire):
- raise AssertionError('not a TopoDS_Wire')
+ assert isinstance(wire, TopoDS_Wire), 'not a TopoDS_Wire'
self.wire = wire
self.wire_explorer = BRepTools_WireExplorer(self.wire)
self.done = False
@@ -56,7 +57,7 @@ def _loop_topo(self, edges=True):
topologyType = topods_Edge if edges else topods_Vertex
seq = []
hashes = [] # list that stores hashes to avoid redundancy
- occ_seq = TopTools_ListOfShape()
+ occ_seq = []
while self.wire_explorer.More():
# loop edges
if edges:
@@ -64,18 +65,19 @@ def _loop_topo(self, edges=True):
# loop vertices
else:
current_item = self.wire_explorer.CurrentVertex()
- current_item_hash = current_item.__hash__()
- if not current_item_hash in hashes:
- hashes.append(current_item_hash)
- occ_seq.Append(current_item)
+ #current_item_hash = current_item.__hash__()
+ #if not current_item_hash in hashes:
+ # hashes.append(current_item_hash)
+ # occ_seq.Append(current_item)
+ occ_seq.append(current_item)
self.wire_explorer.Next()
# Convert occ_seq to python list
- occ_iterator = TopTools_ListIteratorOfListOfShape(occ_seq)
- while occ_iterator.More():
- topo_to_add = topologyType(occ_iterator.Value())
+ #occ_iterator = TopTools_ListIteratorOfListOfShape(occ_seq)
+ for elem in occ_seq:#while occ_iterator.More():
+ topo_to_add = topologyType(elem)#occ_iterator.Value())
seq.append(topo_to_add)
- occ_iterator.Next()
+ #occ_iterator.Next()
self.done = True
return iter(seq)
@@ -91,7 +93,7 @@ class TopologyExplorer(object):
Topology traversal
'''
- def __init__(self, myShape, ignore_orientation=False):
+ def __init__(self, myShape, ignore_orientation=True):
"""
implements topology traversal from any TopoDS_Shape
@@ -121,6 +123,19 @@ def __init__(self, myShape, ignore_orientation=False):
"""
self.myShape = myShape
self.ignore_orientation = ignore_orientation
+
+ # the topoFactory dicts maps topology types and functions that can
+ # create this topology
+ self.topoFactory = {
+ TopAbs_VERTEX: topods.Vertex,
+ TopAbs_EDGE: topods.Edge,
+ TopAbs_FACE: topods.Face,
+ TopAbs_WIRE: topods.Wire,
+ TopAbs_SHELL: topods.Shell,
+ TopAbs_SOLID: topods.Solid,
+ TopAbs_COMPOUND: topods.Compound,
+ TopAbs_COMPSOLID: topods.CompSolid
+ }
self.topExp = TopExp_Explorer()
def _loop_topo(self, topologyType, topologicalEntity=None, topologyTypeToAvoid=None):
@@ -139,8 +154,7 @@ def _loop_topo(self, topologyType, topologicalEntity=None, topologyTypeToAvoid=N
TopAbs_COMPOUND: TopoDS_Compound,
TopAbs_COMPSOLID: TopoDS_CompSolid}
- if not topologyType in topoTypes.keys():
- raise AssertionError('%s not one of %s' % (topologyType, topoTypes.keys()))
+ assert topologyType in topoTypes.keys(), '%s not one of %s' % (topologyType, topoTypes.keys())
# use self.myShape if nothing is specified
if topologicalEntity is None and topologyTypeToAvoid is None:
self.topExp.Init(self.myShape, topologyType)
@@ -153,22 +167,24 @@ def _loop_topo(self, topologyType, topologicalEntity=None, topologyTypeToAvoid=N
topologyType,
topologyTypeToAvoid)
seq = []
- hashes = [] # list that stores hashes to avoid redundancy
- occ_seq = TopTools_ListOfShape()
+ #hashes = [] # list that stores hashes to avoid redundancy
+ #occ_seq = [] #TopTools_ListOfShape()
while self.topExp.More():
current_item = self.topExp.Current()
- current_item_hash = current_item.__hash__()
-
- if not current_item_hash in hashes:
- hashes.append(current_item_hash)
- occ_seq.Append(current_item)
+ #current_item_hash = current_item.__hash__()
+ topo_to_add = self.topoFactory[topologyType](current_item)
+ seq.append(topo_to_add)
+ #if not current_item_hash in hashes:
+ #hashes.append(current_item_hash)
+ #occ_seq.append(current_item)
self.topExp.Next()
# Convert occ_seq to python list
- occ_iterator = TopTools_ListIteratorOfListOfShape(occ_seq)
- while occ_iterator.More():
- seq.append(occ_iterator.Value())
- occ_iterator.Next()
+ #occ_iterator = TopTools_ListIteratorOfListOfShape(occ_seq)
+ #for elem in occ_seq:#while occ_iterator.More():
+ # topo_to_add = self.topoFactory[topologyType](elem)
+ # seq.append(topo_to_add)
+ # #occ_iterator.Next()
if self.ignore_orientation:
# filter out those entities that share the same TShape
@@ -182,7 +198,7 @@ def _loop_topo(self, topologyType, topologicalEntity=None, topologyTypeToAvoid=N
break
if _present is False:
filter_orientation_seq.append(i)
- return filter_orientation_seq
+ return iter(filter_orientation_seq)
else:
return iter(seq)
@@ -193,7 +209,10 @@ def faces(self):
return self._loop_topo(TopAbs_FACE)
def _number_of_topo(self, iterable):
- return sum(1 for _ in iterable)
+ n = 0
+ for i in iterable:
+ n += 1
+ return n
def number_of_faces(self):
return self._number_of_topo(self.faces())
@@ -292,13 +311,12 @@ def _map_shapes_and_ancestors(self, topoTypeA, topoTypeB, topologicalEntity):
_map = TopTools_IndexedDataMapOfShapeListOfShape()
topexp_MapShapesAndAncestors(self.myShape, topoTypeA, topoTypeB, _map)
results = _map.FindFromKey(topologicalEntity)
- if results.IsEmpty():
+ if results.Size() == 0:
yield None
topology_iterator = TopTools_ListIteratorOfListOfShape(results)
while topology_iterator.More():
-
- topo_entity = topology_iterator.Value()
+ topo_entity = self.topoFactory[topoTypeB](topology_iterator.Value())
# return the entity if not in set
# to assure we're not returning entities several times
@@ -330,7 +348,7 @@ def _number_shapes_ancestors(self, topoTypeA, topoTypeB, topologicalEntity):
_map = TopTools_IndexedDataMapOfShapeListOfShape()
topexp_MapShapesAndAncestors(self.myShape, topoTypeA, topoTypeB, _map)
results = _map.FindFromKey(topologicalEntity)
- if results.IsEmpty():
+ if results.Size() == 0:
return None
topology_iterator = TopTools_ListIteratorOfListOfShape(results)
while topology_iterator.More():
@@ -366,7 +384,10 @@ def edges_from_face(self, face):
return self._loop_topo(TopAbs_EDGE, face)
def number_of_edges_from_face(self, face):
- return sum(1 for _ in self._loop_topo(TopAbs_EDGE, face))
+ cnt = 0
+ for i in self._loop_topo(TopAbs_EDGE, face):
+ cnt += 1
+ return cnt
# ======================================================================
# VERTEX <-> EDGE
@@ -375,7 +396,10 @@ def vertices_from_edge(self, edg):
return self._loop_topo(TopAbs_VERTEX, edg)
def number_of_vertices_from_edge(self, edg):
- return sum(1 for _ in self._loop_topo(TopAbs_VERTEX, edg))
+ cnt = 0
+ for i in self._loop_topo(TopAbs_VERTEX, edg):
+ cnt += 1
+ return cnt
def edges_from_vertex(self, vertex):
return self._map_shapes_and_ancestors(TopAbs_VERTEX, TopAbs_EDGE, vertex)
@@ -390,7 +414,10 @@ def edges_from_wire(self, wire):
return self._loop_topo(TopAbs_EDGE, wire)
def number_of_edges_from_wire(self, wire):
- return sum(1 for _ in self._loop_topo(TopAbs_EDGE, wire))
+ cnt = 0
+ for i in self._loop_topo(TopAbs_EDGE, wire):
+ cnt += 1
+ return cnt
def wires_from_edge(self, edg):
return self._map_shapes_and_ancestors(TopAbs_EDGE, TopAbs_WIRE, edg)
@@ -408,7 +435,10 @@ def wires_from_face(self, face):
return self._loop_topo(TopAbs_WIRE, face)
def number_of_wires_from_face(self, face):
- return sum(1 for _ in self._loop_topo(TopAbs_WIRE, face))
+ cnt = 0
+ for i in self._loop_topo(TopAbs_WIRE, face):
+ cnt += 1
+ return cnt
def faces_from_wire(self, wire):
return self._map_shapes_and_ancestors(TopAbs_WIRE, TopAbs_FACE, wire)
@@ -429,7 +459,10 @@ def vertices_from_face(self, face):
return self._loop_topo(TopAbs_VERTEX, face)
def number_of_vertices_from_face(self, face):
- return sum(1 for _ in self._loop_topo(TopAbs_VERTEX, face))
+ cnt = 0
+ for i in self._loop_topo(TopAbs_VERTEX, face):
+ cnt += 1
+ return cnt
# ======================================================================
# FACE <-> SOLID
@@ -444,28 +477,30 @@ def faces_from_solids(self, solid):
return self._loop_topo(TopAbs_FACE, solid)
def number_of_faces_from_solids(self, solid):
- return sum(1 for _ in self._loop_topo(TopAbs_FACE, solid))
+ cnt = 0
+ for i in self._loop_topo(TopAbs_FACE, solid):
+ cnt += 1
+ return cnt
def dump_topology_to_string(shape, level=0, buffer=""):
"""
- Reutnrs the details of an object from the top down
+ Return the details of an object from the top down
"""
brt = BRep_Tool()
s = shape.ShapeType()
- str_topology = ""
if s == TopAbs_VERTEX:
pnt = brt.Pnt(topods_Vertex(shape))
- str_topology += ".." * level + "\n" % (hash(shape), pnt.X(), pnt.Y(), pnt.Z())
+ print( ".." * level + "\n" % (hash(shape), pnt.X(), pnt.Y(), pnt.Z()))
else:
- str_topology += ".." * level
- str += str(shape)
+ print(".." * level, end ="")
+ print(shape_type_string(shape))
it = TopoDS_Iterator(shape)
while it.More() and level < 5: # LEVEL MAX
shp = it.Value()
it.Next()
- str_topology += dump_topology_to_string(shp, level + 1, buffer)
- return str_topology
+ print(dump_topology_to_string(shp, level + 1, buffer))
+
#
# Edge and wire discretizers
#
diff --git a/src/SWIG_files/common/FunctionTransformers.i b/src/SWIG_files/common/FunctionTransformers.i
index f200d6f86..50d42a99b 100644
--- a/src/SWIG_files/common/FunctionTransformers.i
+++ b/src/SWIG_files/common/FunctionTransformers.i
@@ -19,6 +19,10 @@ along with pythonOCC. If not, see .
*/
+%{
+#include
+%}
+
/*
Standard_Real & function transformation
*/
@@ -128,44 +132,80 @@ FairCurve_Analysis & function transformation
}
%typemap(out) TopoDS_Shape {
+ TopoDS_Shape* sh = &$1;
PyObject *resultobj = 0;
- if($1.IsNull()){
+ if (!sh || sh->IsNull()) {
Py_RETURN_NONE;
- } else {
- TopAbs_ShapeEnum shape_type = $1.ShapeType();
+ }
+ else {
+ TopAbs_ShapeEnum shape_type = sh->ShapeType();
+ switch (shape_type)
+ {
+ case TopAbs_COMPOUND:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Compound(TopoDS::Compound(*sh)), SWIGTYPE_p_TopoDS_Compound, SWIG_POINTER_OWN | 0);
+ break;
+ case TopAbs_COMPSOLID:
+ resultobj = SWIG_NewPointerObj(new TopoDS_CompSolid(TopoDS::CompSolid(*sh)), SWIGTYPE_p_TopoDS_CompSolid, SWIG_POINTER_OWN | 0 );
+ break;
+ case TopAbs_SOLID:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Solid(TopoDS::Solid(*sh)), SWIGTYPE_p_TopoDS_Solid, SWIG_POINTER_OWN | 0 );
+ break;
+ case TopAbs_SHELL:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Shell(TopoDS::Shell(*sh)), SWIGTYPE_p_TopoDS_Shell, SWIG_POINTER_OWN | 0 );
+ break;
+ case TopAbs_FACE:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Face(TopoDS::Face(*sh)), SWIGTYPE_p_TopoDS_Face, SWIG_POINTER_OWN | 0 );
+ break;
+ case TopAbs_WIRE:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Wire(TopoDS::Wire(*sh)), SWIGTYPE_p_TopoDS_Wire, SWIG_POINTER_OWN | 0 );
+ break;
+ case TopAbs_EDGE:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Edge(TopoDS::Edge(*sh)), SWIGTYPE_p_TopoDS_Edge, SWIG_POINTER_OWN | 0 );
+ break;
+ case TopAbs_VERTEX:
+ resultobj = SWIG_NewPointerObj(new TopoDS_Vertex(TopoDS::Vertex(*sh)), SWIGTYPE_p_TopoDS_Vertex, SWIG_POINTER_OWN | 0 );
+ break;
+ default:
+ break;
+ }
+ }
+ return resultobj;
+}
+
+// Return TopoDS_Shapes by copy, as we could get lifetimes errors
+%typemap(out) const TopoDS_Shape& {
+ TopoDS_Shape* sh = $1;
+ PyObject *resultobj = 0;
+ if (!sh || sh->IsNull()) {
+ Py_RETURN_NONE;
+ }
+ else {
+ TopAbs_ShapeEnum shape_type = sh->ShapeType();
switch (shape_type)
{
case TopAbs_COMPOUND:
- resultobj = SWIG_NewPointerObj((new TopoDS_Compound(static_cast< const TopoDS_Compound& >($1))),
- SWIGTYPE_p_TopoDS_Compound, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Compound(TopoDS::Compound(*sh)), SWIGTYPE_p_TopoDS_Compound, SWIG_POINTER_OWN | 0);
break;
case TopAbs_COMPSOLID:
- resultobj = SWIG_NewPointerObj((new TopoDS_CompSolid(static_cast< const TopoDS_CompSolid& >($1))),
- SWIGTYPE_p_TopoDS_CompSolid, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_CompSolid(TopoDS::CompSolid(*sh)), SWIGTYPE_p_TopoDS_CompSolid, SWIG_POINTER_OWN | 0 );
break;
case TopAbs_SOLID:
- resultobj = SWIG_NewPointerObj((new TopoDS_Solid(static_cast< const TopoDS_Solid& >($1))),
- SWIGTYPE_p_TopoDS_Solid, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Solid(TopoDS::Solid(*sh)), SWIGTYPE_p_TopoDS_Solid, SWIG_POINTER_OWN | 0 );
break;
case TopAbs_SHELL:
- resultobj = SWIG_NewPointerObj((new TopoDS_Shell(static_cast< const TopoDS_Shell& >($1))),
- SWIGTYPE_p_TopoDS_Shell, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Shell(TopoDS::Shell(*sh)), SWIGTYPE_p_TopoDS_Shell, SWIG_POINTER_OWN | 0 );
break;
case TopAbs_FACE:
- resultobj = SWIG_NewPointerObj((new TopoDS_Face(static_cast< const TopoDS_Face& >($1))),
- SWIGTYPE_p_TopoDS_Face, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Face(TopoDS::Face(*sh)), SWIGTYPE_p_TopoDS_Face, SWIG_POINTER_OWN | 0 );
break;
case TopAbs_WIRE:
- resultobj = SWIG_NewPointerObj((new TopoDS_Wire(static_cast< const TopoDS_Wire& >($1))),
- SWIGTYPE_p_TopoDS_Wire, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Wire(TopoDS::Wire(*sh)), SWIGTYPE_p_TopoDS_Wire, SWIG_POINTER_OWN | 0 );
break;
case TopAbs_EDGE:
- resultobj = SWIG_NewPointerObj((new TopoDS_Edge(static_cast< const TopoDS_Edge& >($1))),
- SWIGTYPE_p_TopoDS_Edge, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Edge(TopoDS::Edge(*sh)), SWIGTYPE_p_TopoDS_Edge, SWIG_POINTER_OWN | 0 );
break;
case TopAbs_VERTEX:
- resultobj = SWIG_NewPointerObj((new TopoDS_Vertex(static_cast< const TopoDS_Vertex& >($1))),
- SWIGTYPE_p_TopoDS_Vertex, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj(new TopoDS_Vertex(TopoDS::Vertex(*sh)), SWIGTYPE_p_TopoDS_Vertex, SWIG_POINTER_OWN | 0 );
break;
default:
break;
diff --git a/src/SWIG_files/common/OccHandle.i b/src/SWIG_files/common/OccHandle.i
index 114034ef4..f9f7fff32 100644
--- a/src/SWIG_files/common/OccHandle.i
+++ b/src/SWIG_files/common/OccHandle.i
@@ -43,225 +43,162 @@ along with pythonOCC. If not, see .
* %make_alias(MyClass)
*/
-#if !defined(SHARED_PTR_DISOWN)
-#define SHARED_PTR_DISOWN 0
-#endif
-
%pythoncode {
from six import with_metaclass
import warnings
from OCC.Wrapper.wrapper_utils import Proxy, deprecated
}
-%{
-#include
+namespace opencascade {
+template class handle{};
+}
+#define Handle(TYPE) opencascade::handle
-// The following is an evil hack to edit the reference counter of Standard_Transient
-template
-struct Rob {
- friend typename Tag::type get(Tag) {
- return M;
- }
-};
+#define DEFINE_STANDARD_HANDLE(C1,C2)
-// tag used to access A::count
-struct Standard_Transient_f {
- typedef volatile Standard_Integer Standard_Transient::*type;
- friend type get(Standard_Transient_f);
-};
+%define WRAP_OCC_TRANSIENT(CONST, TYPE)
-template struct Rob;
-void IncRef(Standard_Transient& a) {
- a.*get(Standard_Transient_f()) += 1;
+%typemap(out) opencascade::handle {
+ TYPE * presult = !$1.IsNull() ? $1.get() : 0;
+ if (presult) presult->IncrementRefCounter();
+ %set_output(SWIG_NewPointerObj(%as_voidptr(presult), $descriptor(TYPE *), SWIG_POINTER_OWN));
}
-%}
-
-%define WRAP_OCC_TRANSIENT_TYPE(CONST, TYPE)
-
-%naturalvar TYPE;
-%naturalvar Handle_ ## TYPE;
+%typemap(out) Handle_ ## TYPE {
+ TYPE * presult = !$1.IsNull() ? $1.get() : 0;
+ if (presult) presult->IncrementRefCounter();
+ %set_output(SWIG_NewPointerObj(%as_voidptr(presult), $descriptor(TYPE *), SWIG_POINTER_OWN));
+}
+%typemap(out) CONST TYPE {
+ TYPE * presult = new TYPE(static_cast< CONST TYPE& >($1));
+ presult->IncrementRefCounter();
+ %set_output(SWIG_NewPointerObj(%as_voidptr(presult), $descriptor(TYPE *), SWIG_POINTER_OWN));
+}
-%feature("unref") TYPE
- "(void)arg1; delete smartarg1;"
+%typemap(out) CONST opencascade::handle&{
+ TYPE * presult = !$1->IsNull() ? $1->get() : 0;
+ if (presult) presult->IncrementRefCounter();
+ %set_output(SWIG_NewPointerObj(%as_voidptr(presult), $descriptor(TYPE *), SWIG_POINTER_OWN));
+}
-%typemap(out) CONST TYPE {
- Handle_ ## TYPE *smartresult = new Handle_ ## TYPE(new $1_ltype(($1_ltype &)$1));
- %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(Handle_ ## TYPE *), SWIG_POINTER_OWN));
+%typemap(out) CONST Handle_ ## TYPE&{
+ TYPE * presult = !$1->IsNull() ? $1->get() : 0;
+ if (presult) presult->IncrementRefCounter();
+ %set_output(SWIG_NewPointerObj(%as_voidptr(presult), $descriptor(TYPE *), SWIG_POINTER_OWN));
}
-%typemap(out) CONST TYPE * {
- Handle_ ## TYPE *smartresult = $1 ? new Handle_ ## TYPE($1) : 0;
- %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(Handle_ ## TYPE *), $owner | SWIG_POINTER_OWN));
+%typemap(out) CONST TYPE&, CONST TYPE* {
+ if ($1) $1->IncrementRefCounter();
+ %set_output(SWIG_NewPointerObj(%as_voidptr($1), $descriptor(TYPE *), SWIG_POINTER_OWN));
}
-
-// plain pointer
-// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
-%typemap(in) CONST TYPE * (void *argp = 0, int res = 0, Handle_ ## TYPE tempshared, Handle_ ## TYPE *smartarg = 0) {
+%typemap(in) opencascade::handle< TYPE > (void *argp, int res = 0) {
int newmem = 0;
- res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(Handle_ ## TYPE *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(TYPE *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) {
- %argument_fail(res, "$type", $symname, $argnum);
- }
- if (newmem & SWIG_CAST_NEW_MEMORY) {
- tempshared = *%reinterpret_cast(argp, Handle_ ## TYPE *);
- delete %reinterpret_cast(argp, Handle_ ## TYPE *);
- $1 = %const_cast(tempshared.operator->(), $1_ltype);
- } else {
- smartarg = %reinterpret_cast(argp, Handle_ ## TYPE *);
- $1 = %const_cast((smartarg ? smartarg->operator->() : 0), $1_ltype);
+ %argument_fail(res, "$type", $symname, $argnum);
}
+ if (argp) $1 = opencascade::handle< TYPE >(%reinterpret_cast(argp, TYPE*));
}
-// plain reference
-%typemap(in) CONST TYPE & (void *argp = 0, int res = 0, Handle_ ## TYPE tempshared) {
+
+// shared_ptr by reference
+%typemap(in) opencascade::handle &(void *argp, int res = 0, $*1_ltype tempshared) {
int newmem = 0;
- res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(Handle_ ## TYPE *), %convertptr_flags, &newmem);
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(TYPE *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) {
- %argument_fail(res, "$type", $symname, $argnum);
- }
- if (!argp) { %argument_nullref("$type", $symname, $argnum); }
- if (newmem & SWIG_CAST_NEW_MEMORY) {
- tempshared = *%reinterpret_cast(argp, Handle_ ## TYPE *);
- delete %reinterpret_cast(argp, Handle_ ## TYPE *);
- $1 = %const_cast(tempshared.operator->(), $1_ltype);
- } else {
- $1 = %const_cast(%reinterpret_cast(argp, Handle_ ## TYPE *)->operator->(), $1_ltype);
+ %argument_fail(res, "$type", $symname, $argnum);
}
-}
-
-%typemap(out) Handle_ ## TYPE {
- Handle_ ## TYPE *smartresult = !$1.IsNull() ? new Handle_ ## TYPE($1) : 0;
- %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(Handle_ ## TYPE *), SWIG_POINTER_OWN));
-}
-// We return reference to handles as copy to handles as the lifetime
-// is different in python than in c++
-%typemap(out) Handle_ ## TYPE & {
- Handle_ ## TYPE *smartresult = !$1->IsNull() ? new Handle_ ## TYPE(*$1) : 0;
- %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(Handle_ ## TYPE *), SWIG_POINTER_OWN));
+ if (argp) tempshared = opencascade::handle< TYPE >(%reinterpret_cast(argp, TYPE*));
+ $1 = &tempshared;
}
-%typemap(out) CONST TYPE & {
- Handle_ ## TYPE *smartresult = new Handle_ ## TYPE($1);
- if (!$owner) {
- // he handle may not delete the object since it is owned by another class
- IncRef(*$1);
+// shared_ptr by reference
+%typemap(in) Handle_ ## TYPE &(void *argp, int res = 0, $*1_ltype tempshared) {
+ int newmem = 0;
+ res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(TYPE *), %convertptr_flags, &newmem);
+ if (!SWIG_IsOK(res)) {
+ %argument_fail(res, "$type", $symname, $argnum);
}
- %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(Handle_ ## TYPE *), SWIG_POINTER_OWN));
-}
-
-%typemap(in, numinputs = 0) Handle_ ## TYPE& OUTPUT(Handle_ ## TYPE temp){
- $1 = &temp;
-}
-%typemap(argout) Handle_ ## TYPE& OUTPUT{
- Handle_ ## TYPE *smartresult = !$1->IsNull() ? new Handle_ ## TYPE(*$1) : 0;
- $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(Handle_ ## TYPE *), SWIG_POINTER_OWN));
+ if (argp) tempshared = opencascade::handle< TYPE >(%reinterpret_cast(argp, TYPE*));
+ $1 = &tempshared;
}
-// Typecheck typemaps
-// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting
-// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain.
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1)
+%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1)
TYPE CONST,
TYPE CONST &,
TYPE CONST *,
TYPE *CONST&,
- Handle_ ## TYPE,
- Handle_ ## TYPE &,
- Handle_ ## TYPE *,
- Handle_ ## TYPE *& {
- int res = SWIG_ConvertPtr($input, 0, $descriptor(Handle_ ## TYPE *), 0);
+ CONST opencascade::handle,
+ CONST opencascade::handle &,
+ CONST opencascade::handle *,
+ CONST opencascade::handle *& {
+ int res = SWIG_ConvertPtr($input, 0, $descriptor(TYPE *), 0);
$1 = SWIG_CheckState(res);
}
-
%enddef
-// This is the main macro used from usercode
-// Do not call this on a handle class!
%define %wrap_handle(TYPE)
- %nodefaultctor Handle_ ## TYPE;
- // The handle class should be invisible/transparent in python
- %ignore Handle_ ## TYPE;
- // deactivate warnings
- %ignore Handle_ ## TYPE::operator=;
- %ignore TYPE::operator=;
+class TYPE;
+
+// Avoid creating ValueWrappers
+%template() opencascade::handle;
+
+#if (defined(_MSC_VER) && _MSC_VER >= 1800)
+class Handle_ ## TYPE : public opencascade::handle< TYPE >{
+public:
+ template
+ inline Handle_## TYPE(const T2* theOther) : Handle(TYPE)(theOther) {} \
+};
+#else
+typedef opencascade::handle< TYPE > Handle_ ## TYPE;
+#endif
+
+// deactivate warnings
+%ignore TYPE::operator=;
+%ignore opencascade::handle< TYPE >;
+%ignore Handle_ ## TYPE;
+
+#define SWIGEMPTYHACK
+WRAP_OCC_TRANSIENT(SWIGEMPTYHACK, TYPE)
+WRAP_OCC_TRANSIENT(const, TYPE)
+
+%feature("unref") TYPE "if($this && $this->DecrementRefCounter()==0) delete $this;"
- // Tell, that Handle_A is a smart pointer to A
- %feature("smartptr", noblock=1) TYPE { Handle_ ## TYPE }
-
%inline %{
- Handle_ ## TYPE Handle_ ## TYPE ## _Create() {
- return Handle_ ## TYPE();
+ opencascade::handle Handle_ ## TYPE ## _Create() {
+ return opencascade::handle();
}
-%}
- #define SWIGEMPTYHACK
- WRAP_OCC_TRANSIENT_TYPE(SWIGEMPTYHACK, TYPE)
- WRAP_OCC_TRANSIENT_TYPE(const, TYPE)
-
- // Allow to use e.g. Handle_Geom_Curve_DownCast(curve)
- %inline %{
- Handle_ ## TYPE Handle_ ## TYPE ## _DownCast(const Handle_Standard_Transient& t) {
- return Handle_ ## TYPE ## ::DownCast(t);
- }
-
- bool Handle_ ## TYPE ## _IsNull(const Handle_ ## TYPE & t) {
- return t.IsNull();
- }
- %}
-
- // This two functions are just for backwards compatibilty
- %extend TYPE {
- %pythoncode {
- @deprecated("It is not required anymore.")
- def GetHandle(self):
- return self
-
- @deprecated("It is not required anymore.")
- def GetObject(self):
- return self
-
- @deprecated("Use is None instead")
- def IsNull(self):
- return Handle_ ## TYPE ## _IsNull(self);
-
- @staticmethod
- def DownCast(t):
- return Handle_ ## TYPE ## _DownCast(t)
- }
+ opencascade::handle Handle_ ## TYPE ## _DownCast(const opencascade::handle& t) {
+ return opencascade::handle::DownCast(t);
}
+ bool Handle_ ## TYPE ## _IsNull(const opencascade::handle & t) {
+ return t.IsNull();
+ }
+%}
+
+// This two functions are just for backwards compatibilty
+%extend TYPE {
+ %pythoncode {
+
+ @staticmethod
+ def DownCast(t):
+ return Handle_ ## TYPE ## _DownCast(t)
+ }
+}
%enddef
+
%define %make_alias(TYPE)
- %pythoncode {
- class Meta_ ## TYPE(type):
- def __call__(cls, wrap=None):
- if wrap is None:
- return Handle_ ## TYPE ## _Create()
- else:
- warnings.warn("class Handle_%s is deprecated. Use %s instead." % ("TYPE", "TYPE"),
- category=DeprecationWarning,
- stacklevel=2)
- warnings.simplefilter('default', DeprecationWarning)
- return Proxy(wrap)
-
- class Handle_ ## TYPE(with_metaclass(Meta_ ## TYPE, TYPE)):
- @staticmethod
- def DownCast(o):
- warnings.warn("Handle_%s.DownCast is deprecated. Use %s.DownCast instead." % ("TYPE", "TYPE"),
- category=DeprecationWarning,
- stacklevel=2)
- warnings.simplefilter('default', DeprecationWarning)
- return Handle_## TYPE(Handle_ ## TYPE ## _DownCast(o))
- }
+
%enddef
diff --git a/src/SWIG_files/deprecated_modules/AIS.py b/src/SWIG_files/deprecated_modules/AIS.py
deleted file mode 100644
index 4e48ec5bb..000000000
--- a/src/SWIG_files/deprecated_modules/AIS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AIS is deprecated since pythonocc-0.18.2. Use OCC.Core.AIS", DeprecationWarning)
-
-from OCC.Core.AIS import *
diff --git a/src/SWIG_files/deprecated_modules/Adaptor2d.py b/src/SWIG_files/deprecated_modules/Adaptor2d.py
deleted file mode 100644
index 9a98e3cd2..000000000
--- a/src/SWIG_files/deprecated_modules/Adaptor2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Adaptor2d is deprecated since pythonocc-0.18.2. Use OCC.Core.Adaptor2d", DeprecationWarning)
-
-from OCC.Core.Adaptor2d import *
diff --git a/src/SWIG_files/deprecated_modules/Adaptor3d.py b/src/SWIG_files/deprecated_modules/Adaptor3d.py
deleted file mode 100644
index 4d6ce4a74..000000000
--- a/src/SWIG_files/deprecated_modules/Adaptor3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Adaptor3d is deprecated since pythonocc-0.18.2. Use OCC.Core.Adaptor3d", DeprecationWarning)
-
-from OCC.Core.Adaptor3d import *
diff --git a/src/SWIG_files/deprecated_modules/AdvApp2Var.py b/src/SWIG_files/deprecated_modules/AdvApp2Var.py
deleted file mode 100644
index 3ec1e7297..000000000
--- a/src/SWIG_files/deprecated_modules/AdvApp2Var.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AdvApp2Var is deprecated since pythonocc-0.18.2. Use OCC.Core.AdvApp2Var", DeprecationWarning)
-
-from OCC.Core.AdvApp2Var import *
diff --git a/src/SWIG_files/deprecated_modules/AdvApprox.py b/src/SWIG_files/deprecated_modules/AdvApprox.py
deleted file mode 100644
index 88cb3e786..000000000
--- a/src/SWIG_files/deprecated_modules/AdvApprox.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AdvApprox is deprecated since pythonocc-0.18.2. Use OCC.Core.AdvApprox", DeprecationWarning)
-
-from OCC.Core.AdvApprox import *
diff --git a/src/SWIG_files/deprecated_modules/AppBlend.py b/src/SWIG_files/deprecated_modules/AppBlend.py
deleted file mode 100644
index 94230e92c..000000000
--- a/src/SWIG_files/deprecated_modules/AppBlend.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AppBlend is deprecated since pythonocc-0.18.2. Use OCC.Core.AppBlend", DeprecationWarning)
-
-from OCC.Core.AppBlend import *
diff --git a/src/SWIG_files/deprecated_modules/AppCont.py b/src/SWIG_files/deprecated_modules/AppCont.py
deleted file mode 100644
index 9815bf3b3..000000000
--- a/src/SWIG_files/deprecated_modules/AppCont.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AppCont is deprecated since pythonocc-0.18.2. Use OCC.Core.AppCont", DeprecationWarning)
-
-from OCC.Core.AppCont import *
diff --git a/src/SWIG_files/deprecated_modules/AppDef.py b/src/SWIG_files/deprecated_modules/AppDef.py
deleted file mode 100644
index ac86d76a0..000000000
--- a/src/SWIG_files/deprecated_modules/AppDef.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AppDef is deprecated since pythonocc-0.18.2. Use OCC.Core.AppDef", DeprecationWarning)
-
-from OCC.Core.AppDef import *
diff --git a/src/SWIG_files/deprecated_modules/AppParCurves.py b/src/SWIG_files/deprecated_modules/AppParCurves.py
deleted file mode 100644
index 0576a7779..000000000
--- a/src/SWIG_files/deprecated_modules/AppParCurves.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AppParCurves is deprecated since pythonocc-0.18.2. Use OCC.Core.AppParCurves", DeprecationWarning)
-
-from OCC.Core.AppParCurves import *
diff --git a/src/SWIG_files/deprecated_modules/AppStd.py b/src/SWIG_files/deprecated_modules/AppStd.py
deleted file mode 100644
index 54754ed6c..000000000
--- a/src/SWIG_files/deprecated_modules/AppStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AppStd is deprecated since pythonocc-0.18.2. Use OCC.Core.AppStd", DeprecationWarning)
-
-from OCC.Core.AppStd import *
diff --git a/src/SWIG_files/deprecated_modules/AppStdL.py b/src/SWIG_files/deprecated_modules/AppStdL.py
deleted file mode 100644
index 4c49573ac..000000000
--- a/src/SWIG_files/deprecated_modules/AppStdL.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.AppStdL is deprecated since pythonocc-0.18.2. Use OCC.Core.AppStdL", DeprecationWarning)
-
-from OCC.Core.AppStdL import *
diff --git a/src/SWIG_files/deprecated_modules/Approx.py b/src/SWIG_files/deprecated_modules/Approx.py
deleted file mode 100644
index d8b758d13..000000000
--- a/src/SWIG_files/deprecated_modules/Approx.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Approx is deprecated since pythonocc-0.18.2. Use OCC.Core.Approx", DeprecationWarning)
-
-from OCC.Core.Approx import *
diff --git a/src/SWIG_files/deprecated_modules/ApproxInt.py b/src/SWIG_files/deprecated_modules/ApproxInt.py
deleted file mode 100644
index 5ad50d13f..000000000
--- a/src/SWIG_files/deprecated_modules/ApproxInt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ApproxInt is deprecated since pythonocc-0.18.2. Use OCC.Core.ApproxInt", DeprecationWarning)
-
-from OCC.Core.ApproxInt import *
diff --git a/src/SWIG_files/deprecated_modules/Aspect.py b/src/SWIG_files/deprecated_modules/Aspect.py
deleted file mode 100644
index cbfc762ab..000000000
--- a/src/SWIG_files/deprecated_modules/Aspect.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Aspect is deprecated since pythonocc-0.18.2. Use OCC.Core.Aspect", DeprecationWarning)
-
-from OCC.Core.Aspect import *
diff --git a/src/SWIG_files/deprecated_modules/BOPAlgo.py b/src/SWIG_files/deprecated_modules/BOPAlgo.py
deleted file mode 100644
index 46696617f..000000000
--- a/src/SWIG_files/deprecated_modules/BOPAlgo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BOPAlgo is deprecated since pythonocc-0.18.2. Use OCC.Core.BOPAlgo", DeprecationWarning)
-
-from OCC.Core.BOPAlgo import *
diff --git a/src/SWIG_files/deprecated_modules/BOPCol.py b/src/SWIG_files/deprecated_modules/BOPCol.py
deleted file mode 100644
index aaf41dd7c..000000000
--- a/src/SWIG_files/deprecated_modules/BOPCol.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BOPCol is deprecated since pythonocc-0.18.2. Use OCC.Core.BOPCol", DeprecationWarning)
-
-from OCC.Core.BOPCol import *
diff --git a/src/SWIG_files/deprecated_modules/BOPDS.py b/src/SWIG_files/deprecated_modules/BOPDS.py
deleted file mode 100644
index e687693ab..000000000
--- a/src/SWIG_files/deprecated_modules/BOPDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BOPDS is deprecated since pythonocc-0.18.2. Use OCC.Core.BOPDS", DeprecationWarning)
-
-from OCC.Core.BOPDS import *
diff --git a/src/SWIG_files/deprecated_modules/BOPInt.py b/src/SWIG_files/deprecated_modules/BOPInt.py
deleted file mode 100644
index 803c60f13..000000000
--- a/src/SWIG_files/deprecated_modules/BOPInt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BOPInt is deprecated since pythonocc-0.18.2. Use OCC.Core.BOPInt", DeprecationWarning)
-
-from OCC.Core.BOPInt import *
diff --git a/src/SWIG_files/deprecated_modules/BOPTools.py b/src/SWIG_files/deprecated_modules/BOPTools.py
deleted file mode 100644
index 7194b5ee9..000000000
--- a/src/SWIG_files/deprecated_modules/BOPTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BOPTools is deprecated since pythonocc-0.18.2. Use OCC.Core.BOPTools", DeprecationWarning)
-
-from OCC.Core.BOPTools import *
diff --git a/src/SWIG_files/deprecated_modules/BRep.py b/src/SWIG_files/deprecated_modules/BRep.py
deleted file mode 100644
index 75005a93d..000000000
--- a/src/SWIG_files/deprecated_modules/BRep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRep is deprecated since pythonocc-0.18.2. Use OCC.Core.BRep", DeprecationWarning)
-
-from OCC.Core.BRep import *
diff --git a/src/SWIG_files/deprecated_modules/BRepAdaptor.py b/src/SWIG_files/deprecated_modules/BRepAdaptor.py
deleted file mode 100644
index d1c6fe40b..000000000
--- a/src/SWIG_files/deprecated_modules/BRepAdaptor.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepAdaptor is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepAdaptor", DeprecationWarning)
-
-from OCC.Core.BRepAdaptor import *
diff --git a/src/SWIG_files/deprecated_modules/BRepAlgo.py b/src/SWIG_files/deprecated_modules/BRepAlgo.py
deleted file mode 100644
index 3b2c46b79..000000000
--- a/src/SWIG_files/deprecated_modules/BRepAlgo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepAlgo is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepAlgo", DeprecationWarning)
-
-from OCC.Core.BRepAlgo import *
diff --git a/src/SWIG_files/deprecated_modules/BRepAlgoAPI.py b/src/SWIG_files/deprecated_modules/BRepAlgoAPI.py
deleted file mode 100644
index 3341aea25..000000000
--- a/src/SWIG_files/deprecated_modules/BRepAlgoAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepAlgoAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepAlgoAPI", DeprecationWarning)
-
-from OCC.Core.BRepAlgoAPI import *
diff --git a/src/SWIG_files/deprecated_modules/BRepApprox.py b/src/SWIG_files/deprecated_modules/BRepApprox.py
deleted file mode 100644
index 9468be635..000000000
--- a/src/SWIG_files/deprecated_modules/BRepApprox.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepApprox is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepApprox", DeprecationWarning)
-
-from OCC.Core.BRepApprox import *
diff --git a/src/SWIG_files/deprecated_modules/BRepBlend.py b/src/SWIG_files/deprecated_modules/BRepBlend.py
deleted file mode 100644
index 2da0a1b26..000000000
--- a/src/SWIG_files/deprecated_modules/BRepBlend.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepBlend is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepBlend", DeprecationWarning)
-
-from OCC.Core.BRepBlend import *
diff --git a/src/SWIG_files/deprecated_modules/BRepBndLib.py b/src/SWIG_files/deprecated_modules/BRepBndLib.py
deleted file mode 100644
index 4b8f684c9..000000000
--- a/src/SWIG_files/deprecated_modules/BRepBndLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepBndLib is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepBndLib", DeprecationWarning)
-
-from OCC.Core.BRepBndLib import *
diff --git a/src/SWIG_files/deprecated_modules/BRepBuilderAPI.py b/src/SWIG_files/deprecated_modules/BRepBuilderAPI.py
deleted file mode 100644
index c10b9c889..000000000
--- a/src/SWIG_files/deprecated_modules/BRepBuilderAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepBuilderAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepBuilderAPI", DeprecationWarning)
-
-from OCC.Core.BRepBuilderAPI import *
diff --git a/src/SWIG_files/deprecated_modules/BRepCheck.py b/src/SWIG_files/deprecated_modules/BRepCheck.py
deleted file mode 100644
index f5136827b..000000000
--- a/src/SWIG_files/deprecated_modules/BRepCheck.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepCheck is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepCheck", DeprecationWarning)
-
-from OCC.Core.BRepCheck import *
diff --git a/src/SWIG_files/deprecated_modules/BRepClass.py b/src/SWIG_files/deprecated_modules/BRepClass.py
deleted file mode 100644
index 481cc6c4d..000000000
--- a/src/SWIG_files/deprecated_modules/BRepClass.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepClass is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepClass", DeprecationWarning)
-
-from OCC.Core.BRepClass import *
diff --git a/src/SWIG_files/deprecated_modules/BRepClass3d.py b/src/SWIG_files/deprecated_modules/BRepClass3d.py
deleted file mode 100644
index 178b776ac..000000000
--- a/src/SWIG_files/deprecated_modules/BRepClass3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepClass3d is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepClass3d", DeprecationWarning)
-
-from OCC.Core.BRepClass3d import *
diff --git a/src/SWIG_files/deprecated_modules/BRepExtrema.py b/src/SWIG_files/deprecated_modules/BRepExtrema.py
deleted file mode 100644
index 3bd821c39..000000000
--- a/src/SWIG_files/deprecated_modules/BRepExtrema.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepExtrema is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepExtrema", DeprecationWarning)
-
-from OCC.Core.BRepExtrema import *
diff --git a/src/SWIG_files/deprecated_modules/BRepFeat.py b/src/SWIG_files/deprecated_modules/BRepFeat.py
deleted file mode 100644
index 27c548855..000000000
--- a/src/SWIG_files/deprecated_modules/BRepFeat.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepFeat is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepFeat", DeprecationWarning)
-
-from OCC.Core.BRepFeat import *
diff --git a/src/SWIG_files/deprecated_modules/BRepFill.py b/src/SWIG_files/deprecated_modules/BRepFill.py
deleted file mode 100644
index 856b8fa5a..000000000
--- a/src/SWIG_files/deprecated_modules/BRepFill.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepFill is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepFill", DeprecationWarning)
-
-from OCC.Core.BRepFill import *
diff --git a/src/SWIG_files/deprecated_modules/BRepFilletAPI.py b/src/SWIG_files/deprecated_modules/BRepFilletAPI.py
deleted file mode 100644
index 66a8c9f67..000000000
--- a/src/SWIG_files/deprecated_modules/BRepFilletAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepFilletAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepFilletAPI", DeprecationWarning)
-
-from OCC.Core.BRepFilletAPI import *
diff --git a/src/SWIG_files/deprecated_modules/BRepGProp.py b/src/SWIG_files/deprecated_modules/BRepGProp.py
deleted file mode 100644
index c81e8b78a..000000000
--- a/src/SWIG_files/deprecated_modules/BRepGProp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepGProp is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepGProp", DeprecationWarning)
-
-from OCC.Core.BRepGProp import *
diff --git a/src/SWIG_files/deprecated_modules/BRepIntCurveSurface.py b/src/SWIG_files/deprecated_modules/BRepIntCurveSurface.py
deleted file mode 100644
index b42f46492..000000000
--- a/src/SWIG_files/deprecated_modules/BRepIntCurveSurface.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepIntCurveSurface is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepIntCurveSurface", DeprecationWarning)
-
-from OCC.Core.BRepIntCurveSurface import *
diff --git a/src/SWIG_files/deprecated_modules/BRepLProp.py b/src/SWIG_files/deprecated_modules/BRepLProp.py
deleted file mode 100644
index 66539176d..000000000
--- a/src/SWIG_files/deprecated_modules/BRepLProp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepLProp is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepLProp", DeprecationWarning)
-
-from OCC.Core.BRepLProp import *
diff --git a/src/SWIG_files/deprecated_modules/BRepLib.py b/src/SWIG_files/deprecated_modules/BRepLib.py
deleted file mode 100644
index 4628ddf6e..000000000
--- a/src/SWIG_files/deprecated_modules/BRepLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepLib is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepLib", DeprecationWarning)
-
-from OCC.Core.BRepLib import *
diff --git a/src/SWIG_files/deprecated_modules/BRepMAT2d.py b/src/SWIG_files/deprecated_modules/BRepMAT2d.py
deleted file mode 100644
index 9943800c0..000000000
--- a/src/SWIG_files/deprecated_modules/BRepMAT2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepMAT2d is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepMAT2d", DeprecationWarning)
-
-from OCC.Core.BRepMAT2d import *
diff --git a/src/SWIG_files/deprecated_modules/BRepMesh.py b/src/SWIG_files/deprecated_modules/BRepMesh.py
deleted file mode 100644
index 9b4270d7a..000000000
--- a/src/SWIG_files/deprecated_modules/BRepMesh.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepMesh is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepMesh", DeprecationWarning)
-
-from OCC.Core.BRepMesh import *
diff --git a/src/SWIG_files/deprecated_modules/BRepOffset.py b/src/SWIG_files/deprecated_modules/BRepOffset.py
deleted file mode 100644
index 599f7682e..000000000
--- a/src/SWIG_files/deprecated_modules/BRepOffset.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepOffset is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepOffset", DeprecationWarning)
-
-from OCC.Core.BRepOffset import *
diff --git a/src/SWIG_files/deprecated_modules/BRepOffsetAPI.py b/src/SWIG_files/deprecated_modules/BRepOffsetAPI.py
deleted file mode 100644
index 2e6e7f62e..000000000
--- a/src/SWIG_files/deprecated_modules/BRepOffsetAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepOffsetAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepOffsetAPI", DeprecationWarning)
-
-from OCC.Core.BRepOffsetAPI import *
diff --git a/src/SWIG_files/deprecated_modules/BRepPrim.py b/src/SWIG_files/deprecated_modules/BRepPrim.py
deleted file mode 100644
index c5668193c..000000000
--- a/src/SWIG_files/deprecated_modules/BRepPrim.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepPrim is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepPrim", DeprecationWarning)
-
-from OCC.Core.BRepPrim import *
diff --git a/src/SWIG_files/deprecated_modules/BRepPrimAPI.py b/src/SWIG_files/deprecated_modules/BRepPrimAPI.py
deleted file mode 100644
index 6f17311fd..000000000
--- a/src/SWIG_files/deprecated_modules/BRepPrimAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepPrimAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepPrimAPI", DeprecationWarning)
-
-from OCC.Core.BRepPrimAPI import *
diff --git a/src/SWIG_files/deprecated_modules/BRepProj.py b/src/SWIG_files/deprecated_modules/BRepProj.py
deleted file mode 100644
index db9a0148c..000000000
--- a/src/SWIG_files/deprecated_modules/BRepProj.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepProj is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepProj", DeprecationWarning)
-
-from OCC.Core.BRepProj import *
diff --git a/src/SWIG_files/deprecated_modules/BRepSweep.py b/src/SWIG_files/deprecated_modules/BRepSweep.py
deleted file mode 100644
index 9ab2f1203..000000000
--- a/src/SWIG_files/deprecated_modules/BRepSweep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepSweep is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepSweep", DeprecationWarning)
-
-from OCC.Core.BRepSweep import *
diff --git a/src/SWIG_files/deprecated_modules/BRepTools.py b/src/SWIG_files/deprecated_modules/BRepTools.py
deleted file mode 100644
index 7a8d37825..000000000
--- a/src/SWIG_files/deprecated_modules/BRepTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepTools is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepTools", DeprecationWarning)
-
-from OCC.Core.BRepTools import *
diff --git a/src/SWIG_files/deprecated_modules/BRepTopAdaptor.py b/src/SWIG_files/deprecated_modules/BRepTopAdaptor.py
deleted file mode 100644
index af7585ac7..000000000
--- a/src/SWIG_files/deprecated_modules/BRepTopAdaptor.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BRepTopAdaptor is deprecated since pythonocc-0.18.2. Use OCC.Core.BRepTopAdaptor", DeprecationWarning)
-
-from OCC.Core.BRepTopAdaptor import *
diff --git a/src/SWIG_files/deprecated_modules/BSplCLib.py b/src/SWIG_files/deprecated_modules/BSplCLib.py
deleted file mode 100644
index 245f0ca21..000000000
--- a/src/SWIG_files/deprecated_modules/BSplCLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BSplCLib is deprecated since pythonocc-0.18.2. Use OCC.Core.BSplCLib", DeprecationWarning)
-
-from OCC.Core.BSplCLib import *
diff --git a/src/SWIG_files/deprecated_modules/BSplSLib.py b/src/SWIG_files/deprecated_modules/BSplSLib.py
deleted file mode 100644
index 9dd9ca47f..000000000
--- a/src/SWIG_files/deprecated_modules/BSplSLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BSplSLib is deprecated since pythonocc-0.18.2. Use OCC.Core.BSplSLib", DeprecationWarning)
-
-from OCC.Core.BSplSLib import *
diff --git a/src/SWIG_files/deprecated_modules/BiTgte.py b/src/SWIG_files/deprecated_modules/BiTgte.py
deleted file mode 100644
index 6a59808f4..000000000
--- a/src/SWIG_files/deprecated_modules/BiTgte.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BiTgte is deprecated since pythonocc-0.18.2. Use OCC.Core.BiTgte", DeprecationWarning)
-
-from OCC.Core.BiTgte import *
diff --git a/src/SWIG_files/deprecated_modules/BinDrivers.py b/src/SWIG_files/deprecated_modules/BinDrivers.py
deleted file mode 100644
index e547d22e3..000000000
--- a/src/SWIG_files/deprecated_modules/BinDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.BinDrivers", DeprecationWarning)
-
-from OCC.Core.BinDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/BinLDrivers.py b/src/SWIG_files/deprecated_modules/BinLDrivers.py
deleted file mode 100644
index ba5113855..000000000
--- a/src/SWIG_files/deprecated_modules/BinLDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinLDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.BinLDrivers", DeprecationWarning)
-
-from OCC.Core.BinLDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/BinMDF.py b/src/SWIG_files/deprecated_modules/BinMDF.py
deleted file mode 100644
index 145c6dd67..000000000
--- a/src/SWIG_files/deprecated_modules/BinMDF.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMDF is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMDF", DeprecationWarning)
-
-from OCC.Core.BinMDF import *
diff --git a/src/SWIG_files/deprecated_modules/BinMDataStd.py b/src/SWIG_files/deprecated_modules/BinMDataStd.py
deleted file mode 100644
index 4358e1b7d..000000000
--- a/src/SWIG_files/deprecated_modules/BinMDataStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMDataStd is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMDataStd", DeprecationWarning)
-
-from OCC.Core.BinMDataStd import *
diff --git a/src/SWIG_files/deprecated_modules/BinMDataXtd.py b/src/SWIG_files/deprecated_modules/BinMDataXtd.py
deleted file mode 100644
index c7da272f3..000000000
--- a/src/SWIG_files/deprecated_modules/BinMDataXtd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMDataXtd is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMDataXtd", DeprecationWarning)
-
-from OCC.Core.BinMDataXtd import *
diff --git a/src/SWIG_files/deprecated_modules/BinMDocStd.py b/src/SWIG_files/deprecated_modules/BinMDocStd.py
deleted file mode 100644
index 9a785589b..000000000
--- a/src/SWIG_files/deprecated_modules/BinMDocStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMDocStd is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMDocStd", DeprecationWarning)
-
-from OCC.Core.BinMDocStd import *
diff --git a/src/SWIG_files/deprecated_modules/BinMFunction.py b/src/SWIG_files/deprecated_modules/BinMFunction.py
deleted file mode 100644
index a1fdc47fe..000000000
--- a/src/SWIG_files/deprecated_modules/BinMFunction.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMFunction is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMFunction", DeprecationWarning)
-
-from OCC.Core.BinMFunction import *
diff --git a/src/SWIG_files/deprecated_modules/BinMNaming.py b/src/SWIG_files/deprecated_modules/BinMNaming.py
deleted file mode 100644
index d1fa77664..000000000
--- a/src/SWIG_files/deprecated_modules/BinMNaming.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMNaming is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMNaming", DeprecationWarning)
-
-from OCC.Core.BinMNaming import *
diff --git a/src/SWIG_files/deprecated_modules/BinMPrsStd.py b/src/SWIG_files/deprecated_modules/BinMPrsStd.py
deleted file mode 100644
index 2c21a03b6..000000000
--- a/src/SWIG_files/deprecated_modules/BinMPrsStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMPrsStd is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMPrsStd", DeprecationWarning)
-
-from OCC.Core.BinMPrsStd import *
diff --git a/src/SWIG_files/deprecated_modules/BinMXCAFDoc.py b/src/SWIG_files/deprecated_modules/BinMXCAFDoc.py
deleted file mode 100644
index f42952354..000000000
--- a/src/SWIG_files/deprecated_modules/BinMXCAFDoc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinMXCAFDoc is deprecated since pythonocc-0.18.2. Use OCC.Core.BinMXCAFDoc", DeprecationWarning)
-
-from OCC.Core.BinMXCAFDoc import *
diff --git a/src/SWIG_files/deprecated_modules/BinObjMgt.py b/src/SWIG_files/deprecated_modules/BinObjMgt.py
deleted file mode 100644
index d0f96c2e2..000000000
--- a/src/SWIG_files/deprecated_modules/BinObjMgt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinObjMgt is deprecated since pythonocc-0.18.2. Use OCC.Core.BinObjMgt", DeprecationWarning)
-
-from OCC.Core.BinObjMgt import *
diff --git a/src/SWIG_files/deprecated_modules/BinTObjDrivers.py b/src/SWIG_files/deprecated_modules/BinTObjDrivers.py
deleted file mode 100644
index f6cc5a8f4..000000000
--- a/src/SWIG_files/deprecated_modules/BinTObjDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinTObjDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.BinTObjDrivers", DeprecationWarning)
-
-from OCC.Core.BinTObjDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/BinXCAFDrivers.py b/src/SWIG_files/deprecated_modules/BinXCAFDrivers.py
deleted file mode 100644
index 710249ecf..000000000
--- a/src/SWIG_files/deprecated_modules/BinXCAFDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BinXCAFDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.BinXCAFDrivers", DeprecationWarning)
-
-from OCC.Core.BinXCAFDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/Bisector.py b/src/SWIG_files/deprecated_modules/Bisector.py
deleted file mode 100644
index a06943aa0..000000000
--- a/src/SWIG_files/deprecated_modules/Bisector.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Bisector is deprecated since pythonocc-0.18.2. Use OCC.Core.Bisector", DeprecationWarning)
-
-from OCC.Core.Bisector import *
diff --git a/src/SWIG_files/deprecated_modules/Blend.py b/src/SWIG_files/deprecated_modules/Blend.py
deleted file mode 100644
index 5fd9b0e69..000000000
--- a/src/SWIG_files/deprecated_modules/Blend.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Blend is deprecated since pythonocc-0.18.2. Use OCC.Core.Blend", DeprecationWarning)
-
-from OCC.Core.Blend import *
diff --git a/src/SWIG_files/deprecated_modules/BlendFunc.py b/src/SWIG_files/deprecated_modules/BlendFunc.py
deleted file mode 100644
index 700d90fdd..000000000
--- a/src/SWIG_files/deprecated_modules/BlendFunc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BlendFunc is deprecated since pythonocc-0.18.2. Use OCC.Core.BlendFunc", DeprecationWarning)
-
-from OCC.Core.BlendFunc import *
diff --git a/src/SWIG_files/deprecated_modules/Bnd.py b/src/SWIG_files/deprecated_modules/Bnd.py
deleted file mode 100644
index ae209982f..000000000
--- a/src/SWIG_files/deprecated_modules/Bnd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Bnd is deprecated since pythonocc-0.18.2. Use OCC.Core.Bnd", DeprecationWarning)
-
-from OCC.Core.Bnd import *
diff --git a/src/SWIG_files/deprecated_modules/BndLib.py b/src/SWIG_files/deprecated_modules/BndLib.py
deleted file mode 100644
index 7ca5b3eef..000000000
--- a/src/SWIG_files/deprecated_modules/BndLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.BndLib is deprecated since pythonocc-0.18.2. Use OCC.Core.BndLib", DeprecationWarning)
-
-from OCC.Core.BndLib import *
diff --git a/src/SWIG_files/deprecated_modules/CDF.py b/src/SWIG_files/deprecated_modules/CDF.py
deleted file mode 100644
index ef0243863..000000000
--- a/src/SWIG_files/deprecated_modules/CDF.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.CDF is deprecated since pythonocc-0.18.2. Use OCC.Core.CDF", DeprecationWarning)
-
-from OCC.Core.CDF import *
diff --git a/src/SWIG_files/deprecated_modules/CDM.py b/src/SWIG_files/deprecated_modules/CDM.py
deleted file mode 100644
index 94ca0ba10..000000000
--- a/src/SWIG_files/deprecated_modules/CDM.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.CDM is deprecated since pythonocc-0.18.2. Use OCC.Core.CDM", DeprecationWarning)
-
-from OCC.Core.CDM import *
diff --git a/src/SWIG_files/deprecated_modules/CPnts.py b/src/SWIG_files/deprecated_modules/CPnts.py
deleted file mode 100644
index db27977bf..000000000
--- a/src/SWIG_files/deprecated_modules/CPnts.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.CPnts is deprecated since pythonocc-0.18.2. Use OCC.Core.CPnts", DeprecationWarning)
-
-from OCC.Core.CPnts import *
diff --git a/src/SWIG_files/deprecated_modules/CSLib.py b/src/SWIG_files/deprecated_modules/CSLib.py
deleted file mode 100644
index ff33597a6..000000000
--- a/src/SWIG_files/deprecated_modules/CSLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.CSLib is deprecated since pythonocc-0.18.2. Use OCC.Core.CSLib", DeprecationWarning)
-
-from OCC.Core.CSLib import *
diff --git a/src/SWIG_files/deprecated_modules/ChFi2d.py b/src/SWIG_files/deprecated_modules/ChFi2d.py
deleted file mode 100644
index 38b03abf5..000000000
--- a/src/SWIG_files/deprecated_modules/ChFi2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ChFi2d is deprecated since pythonocc-0.18.2. Use OCC.Core.ChFi2d", DeprecationWarning)
-
-from OCC.Core.ChFi2d import *
diff --git a/src/SWIG_files/deprecated_modules/ChFi3d.py b/src/SWIG_files/deprecated_modules/ChFi3d.py
deleted file mode 100644
index f15d1c010..000000000
--- a/src/SWIG_files/deprecated_modules/ChFi3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ChFi3d is deprecated since pythonocc-0.18.2. Use OCC.Core.ChFi3d", DeprecationWarning)
-
-from OCC.Core.ChFi3d import *
diff --git a/src/SWIG_files/deprecated_modules/ChFiDS.py b/src/SWIG_files/deprecated_modules/ChFiDS.py
deleted file mode 100644
index 0be734a4c..000000000
--- a/src/SWIG_files/deprecated_modules/ChFiDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ChFiDS is deprecated since pythonocc-0.18.2. Use OCC.Core.ChFiDS", DeprecationWarning)
-
-from OCC.Core.ChFiDS import *
diff --git a/src/SWIG_files/deprecated_modules/ChFiKPart.py b/src/SWIG_files/deprecated_modules/ChFiKPart.py
deleted file mode 100644
index 7ce66778e..000000000
--- a/src/SWIG_files/deprecated_modules/ChFiKPart.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ChFiKPart is deprecated since pythonocc-0.18.2. Use OCC.Core.ChFiKPart", DeprecationWarning)
-
-from OCC.Core.ChFiKPart import *
diff --git a/src/SWIG_files/deprecated_modules/Contap.py b/src/SWIG_files/deprecated_modules/Contap.py
deleted file mode 100644
index 87a3a2eb5..000000000
--- a/src/SWIG_files/deprecated_modules/Contap.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Contap is deprecated since pythonocc-0.18.2. Use OCC.Core.Contap", DeprecationWarning)
-
-from OCC.Core.Contap import *
diff --git a/src/SWIG_files/deprecated_modules/Convert.py b/src/SWIG_files/deprecated_modules/Convert.py
deleted file mode 100644
index 6b080dfdc..000000000
--- a/src/SWIG_files/deprecated_modules/Convert.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Convert is deprecated since pythonocc-0.18.2. Use OCC.Core.Convert", DeprecationWarning)
-
-from OCC.Core.Convert import *
diff --git a/src/SWIG_files/deprecated_modules/Dico.py b/src/SWIG_files/deprecated_modules/Dico.py
deleted file mode 100644
index 17cbd1c0a..000000000
--- a/src/SWIG_files/deprecated_modules/Dico.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Dico is deprecated since pythonocc-0.18.2. Use OCC.Core.Dico", DeprecationWarning)
-
-from OCC.Core.Dico import *
diff --git a/src/SWIG_files/deprecated_modules/Draft.py b/src/SWIG_files/deprecated_modules/Draft.py
deleted file mode 100644
index 86a17a3f8..000000000
--- a/src/SWIG_files/deprecated_modules/Draft.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Draft is deprecated since pythonocc-0.18.2. Use OCC.Core.Draft", DeprecationWarning)
-
-from OCC.Core.Draft import *
diff --git a/src/SWIG_files/deprecated_modules/DsgPrs.py b/src/SWIG_files/deprecated_modules/DsgPrs.py
deleted file mode 100644
index 208afd2fa..000000000
--- a/src/SWIG_files/deprecated_modules/DsgPrs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.DsgPrs is deprecated since pythonocc-0.18.2. Use OCC.Core.DsgPrs", DeprecationWarning)
-
-from OCC.Core.DsgPrs import *
diff --git a/src/SWIG_files/deprecated_modules/Dynamic.py b/src/SWIG_files/deprecated_modules/Dynamic.py
deleted file mode 100644
index a9c2695de..000000000
--- a/src/SWIG_files/deprecated_modules/Dynamic.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Dynamic is deprecated since pythonocc-0.18.2. Use OCC.Core.Dynamic", DeprecationWarning)
-
-from OCC.Core.Dynamic import *
diff --git a/src/SWIG_files/deprecated_modules/ElCLib.py b/src/SWIG_files/deprecated_modules/ElCLib.py
deleted file mode 100644
index d8ada6080..000000000
--- a/src/SWIG_files/deprecated_modules/ElCLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ElCLib is deprecated since pythonocc-0.18.2. Use OCC.Core.ElCLib", DeprecationWarning)
-
-from OCC.Core.ElCLib import *
diff --git a/src/SWIG_files/deprecated_modules/ElSLib.py b/src/SWIG_files/deprecated_modules/ElSLib.py
deleted file mode 100644
index f1e54b126..000000000
--- a/src/SWIG_files/deprecated_modules/ElSLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ElSLib is deprecated since pythonocc-0.18.2. Use OCC.Core.ElSLib", DeprecationWarning)
-
-from OCC.Core.ElSLib import *
diff --git a/src/SWIG_files/deprecated_modules/Expr.py b/src/SWIG_files/deprecated_modules/Expr.py
deleted file mode 100644
index 1cebf9731..000000000
--- a/src/SWIG_files/deprecated_modules/Expr.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Expr is deprecated since pythonocc-0.18.2. Use OCC.Core.Expr", DeprecationWarning)
-
-from OCC.Core.Expr import *
diff --git a/src/SWIG_files/deprecated_modules/ExprIntrp.py b/src/SWIG_files/deprecated_modules/ExprIntrp.py
deleted file mode 100644
index 7da78932d..000000000
--- a/src/SWIG_files/deprecated_modules/ExprIntrp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ExprIntrp is deprecated since pythonocc-0.18.2. Use OCC.Core.ExprIntrp", DeprecationWarning)
-
-from OCC.Core.ExprIntrp import *
diff --git a/src/SWIG_files/deprecated_modules/Extrema.py b/src/SWIG_files/deprecated_modules/Extrema.py
deleted file mode 100644
index 8bc0495bd..000000000
--- a/src/SWIG_files/deprecated_modules/Extrema.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Extrema is deprecated since pythonocc-0.18.2. Use OCC.Core.Extrema", DeprecationWarning)
-
-from OCC.Core.Extrema import *
diff --git a/src/SWIG_files/deprecated_modules/FEmTool.py b/src/SWIG_files/deprecated_modules/FEmTool.py
deleted file mode 100644
index 433a13ac2..000000000
--- a/src/SWIG_files/deprecated_modules/FEmTool.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.FEmTool is deprecated since pythonocc-0.18.2. Use OCC.Core.FEmTool", DeprecationWarning)
-
-from OCC.Core.FEmTool import *
diff --git a/src/SWIG_files/deprecated_modules/FSD.py b/src/SWIG_files/deprecated_modules/FSD.py
deleted file mode 100644
index 1d9adf353..000000000
--- a/src/SWIG_files/deprecated_modules/FSD.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.FSD is deprecated since pythonocc-0.18.2. Use OCC.Core.FSD", DeprecationWarning)
-
-from OCC.Core.FSD import *
diff --git a/src/SWIG_files/deprecated_modules/FairCurve.py b/src/SWIG_files/deprecated_modules/FairCurve.py
deleted file mode 100644
index 7abb79be8..000000000
--- a/src/SWIG_files/deprecated_modules/FairCurve.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.FairCurve is deprecated since pythonocc-0.18.2. Use OCC.Core.FairCurve", DeprecationWarning)
-
-from OCC.Core.FairCurve import *
diff --git a/src/SWIG_files/deprecated_modules/FilletSurf.py b/src/SWIG_files/deprecated_modules/FilletSurf.py
deleted file mode 100644
index b95d99e60..000000000
--- a/src/SWIG_files/deprecated_modules/FilletSurf.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.FilletSurf is deprecated since pythonocc-0.18.2. Use OCC.Core.FilletSurf", DeprecationWarning)
-
-from OCC.Core.FilletSurf import *
diff --git a/src/SWIG_files/deprecated_modules/GC.py b/src/SWIG_files/deprecated_modules/GC.py
deleted file mode 100644
index 8dacfa97c..000000000
--- a/src/SWIG_files/deprecated_modules/GC.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GC is deprecated since pythonocc-0.18.2. Use OCC.Core.GC", DeprecationWarning)
-
-from OCC.Core.GC import *
diff --git a/src/SWIG_files/deprecated_modules/GCE2d.py b/src/SWIG_files/deprecated_modules/GCE2d.py
deleted file mode 100644
index 005b7c3b6..000000000
--- a/src/SWIG_files/deprecated_modules/GCE2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GCE2d is deprecated since pythonocc-0.18.2. Use OCC.Core.GCE2d", DeprecationWarning)
-
-from OCC.Core.GCE2d import *
diff --git a/src/SWIG_files/deprecated_modules/GCPnts.py b/src/SWIG_files/deprecated_modules/GCPnts.py
deleted file mode 100644
index 239c3e8c9..000000000
--- a/src/SWIG_files/deprecated_modules/GCPnts.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GCPnts is deprecated since pythonocc-0.18.2. Use OCC.Core.GCPnts", DeprecationWarning)
-
-from OCC.Core.GCPnts import *
diff --git a/src/SWIG_files/deprecated_modules/GEOMAlgo.py b/src/SWIG_files/deprecated_modules/GEOMAlgo.py
deleted file mode 100644
index 4aa70bc99..000000000
--- a/src/SWIG_files/deprecated_modules/GEOMAlgo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GEOMAlgo is deprecated since pythonocc-0.18.2. Use OCC.Core.GEOMAlgo", DeprecationWarning)
-
-from OCC.Core.GEOMAlgo import *
diff --git a/src/SWIG_files/deprecated_modules/GProp.py b/src/SWIG_files/deprecated_modules/GProp.py
deleted file mode 100644
index 7bb99e21c..000000000
--- a/src/SWIG_files/deprecated_modules/GProp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GProp is deprecated since pythonocc-0.18.2. Use OCC.Core.GProp", DeprecationWarning)
-
-from OCC.Core.GProp import *
diff --git a/src/SWIG_files/deprecated_modules/GccAna.py b/src/SWIG_files/deprecated_modules/GccAna.py
deleted file mode 100644
index b1ca98f2a..000000000
--- a/src/SWIG_files/deprecated_modules/GccAna.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GccAna is deprecated since pythonocc-0.18.2. Use OCC.Core.GccAna", DeprecationWarning)
-
-from OCC.Core.GccAna import *
diff --git a/src/SWIG_files/deprecated_modules/GccEnt.py b/src/SWIG_files/deprecated_modules/GccEnt.py
deleted file mode 100644
index 435abc6e4..000000000
--- a/src/SWIG_files/deprecated_modules/GccEnt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GccEnt is deprecated since pythonocc-0.18.2. Use OCC.Core.GccEnt", DeprecationWarning)
-
-from OCC.Core.GccEnt import *
diff --git a/src/SWIG_files/deprecated_modules/GccGeo.py b/src/SWIG_files/deprecated_modules/GccGeo.py
deleted file mode 100644
index 804e252a1..000000000
--- a/src/SWIG_files/deprecated_modules/GccGeo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GccGeo is deprecated since pythonocc-0.18.2. Use OCC.Core.GccGeo", DeprecationWarning)
-
-from OCC.Core.GccGeo import *
diff --git a/src/SWIG_files/deprecated_modules/GccInt.py b/src/SWIG_files/deprecated_modules/GccInt.py
deleted file mode 100644
index 6dfc2eae9..000000000
--- a/src/SWIG_files/deprecated_modules/GccInt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GccInt is deprecated since pythonocc-0.18.2. Use OCC.Core.GccInt", DeprecationWarning)
-
-from OCC.Core.GccInt import *
diff --git a/src/SWIG_files/deprecated_modules/GccIter.py b/src/SWIG_files/deprecated_modules/GccIter.py
deleted file mode 100644
index e7a243351..000000000
--- a/src/SWIG_files/deprecated_modules/GccIter.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GccIter is deprecated since pythonocc-0.18.2. Use OCC.Core.GccIter", DeprecationWarning)
-
-from OCC.Core.GccIter import *
diff --git a/src/SWIG_files/deprecated_modules/Geom.py b/src/SWIG_files/deprecated_modules/Geom.py
deleted file mode 100644
index 2c7429c87..000000000
--- a/src/SWIG_files/deprecated_modules/Geom.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom", DeprecationWarning)
-
-from OCC.Core.Geom import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2d.py b/src/SWIG_files/deprecated_modules/Geom2d.py
deleted file mode 100644
index 918b3b6cf..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2d is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2d", DeprecationWarning)
-
-from OCC.Core.Geom2d import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dAPI.py b/src/SWIG_files/deprecated_modules/Geom2dAPI.py
deleted file mode 100644
index 237ea5a05..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dAPI", DeprecationWarning)
-
-from OCC.Core.Geom2dAPI import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dAdaptor.py b/src/SWIG_files/deprecated_modules/Geom2dAdaptor.py
deleted file mode 100644
index 7d27b0d53..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dAdaptor.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dAdaptor is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dAdaptor", DeprecationWarning)
-
-from OCC.Core.Geom2dAdaptor import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dConvert.py b/src/SWIG_files/deprecated_modules/Geom2dConvert.py
deleted file mode 100644
index 30a9b4f9a..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dConvert.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dConvert is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dConvert", DeprecationWarning)
-
-from OCC.Core.Geom2dConvert import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dGcc.py b/src/SWIG_files/deprecated_modules/Geom2dGcc.py
deleted file mode 100644
index cead22e6c..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dGcc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dGcc is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dGcc", DeprecationWarning)
-
-from OCC.Core.Geom2dGcc import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dHatch.py b/src/SWIG_files/deprecated_modules/Geom2dHatch.py
deleted file mode 100644
index 2c5685500..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dHatch.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dHatch is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dHatch", DeprecationWarning)
-
-from OCC.Core.Geom2dHatch import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dInt.py b/src/SWIG_files/deprecated_modules/Geom2dInt.py
deleted file mode 100644
index e022754f4..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dInt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dInt is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dInt", DeprecationWarning)
-
-from OCC.Core.Geom2dInt import *
diff --git a/src/SWIG_files/deprecated_modules/Geom2dLProp.py b/src/SWIG_files/deprecated_modules/Geom2dLProp.py
deleted file mode 100644
index da6ca55f2..000000000
--- a/src/SWIG_files/deprecated_modules/Geom2dLProp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Geom2dLProp is deprecated since pythonocc-0.18.2. Use OCC.Core.Geom2dLProp", DeprecationWarning)
-
-from OCC.Core.Geom2dLProp import *
diff --git a/src/SWIG_files/deprecated_modules/GeomAPI.py b/src/SWIG_files/deprecated_modules/GeomAPI.py
deleted file mode 100644
index 318abca4d..000000000
--- a/src/SWIG_files/deprecated_modules/GeomAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomAPI", DeprecationWarning)
-
-from OCC.Core.GeomAPI import *
diff --git a/src/SWIG_files/deprecated_modules/GeomAbs.py b/src/SWIG_files/deprecated_modules/GeomAbs.py
deleted file mode 100644
index 15eebfe01..000000000
--- a/src/SWIG_files/deprecated_modules/GeomAbs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomAbs is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomAbs", DeprecationWarning)
-
-from OCC.Core.GeomAbs import *
diff --git a/src/SWIG_files/deprecated_modules/GeomAdaptor.py b/src/SWIG_files/deprecated_modules/GeomAdaptor.py
deleted file mode 100644
index 67f7e2108..000000000
--- a/src/SWIG_files/deprecated_modules/GeomAdaptor.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomAdaptor is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomAdaptor", DeprecationWarning)
-
-from OCC.Core.GeomAdaptor import *
diff --git a/src/SWIG_files/deprecated_modules/GeomConvert.py b/src/SWIG_files/deprecated_modules/GeomConvert.py
deleted file mode 100644
index 01ecb85c8..000000000
--- a/src/SWIG_files/deprecated_modules/GeomConvert.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomConvert is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomConvert", DeprecationWarning)
-
-from OCC.Core.GeomConvert import *
diff --git a/src/SWIG_files/deprecated_modules/GeomFill.py b/src/SWIG_files/deprecated_modules/GeomFill.py
deleted file mode 100644
index 6467f44fd..000000000
--- a/src/SWIG_files/deprecated_modules/GeomFill.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomFill is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomFill", DeprecationWarning)
-
-from OCC.Core.GeomFill import *
diff --git a/src/SWIG_files/deprecated_modules/GeomInt.py b/src/SWIG_files/deprecated_modules/GeomInt.py
deleted file mode 100644
index b698fff18..000000000
--- a/src/SWIG_files/deprecated_modules/GeomInt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomInt is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomInt", DeprecationWarning)
-
-from OCC.Core.GeomInt import *
diff --git a/src/SWIG_files/deprecated_modules/GeomLProp.py b/src/SWIG_files/deprecated_modules/GeomLProp.py
deleted file mode 100644
index 5d87bb83c..000000000
--- a/src/SWIG_files/deprecated_modules/GeomLProp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomLProp is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomLProp", DeprecationWarning)
-
-from OCC.Core.GeomLProp import *
diff --git a/src/SWIG_files/deprecated_modules/GeomLib.py b/src/SWIG_files/deprecated_modules/GeomLib.py
deleted file mode 100644
index 43d0eca4d..000000000
--- a/src/SWIG_files/deprecated_modules/GeomLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomLib is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomLib", DeprecationWarning)
-
-from OCC.Core.GeomLib import *
diff --git a/src/SWIG_files/deprecated_modules/GeomPlate.py b/src/SWIG_files/deprecated_modules/GeomPlate.py
deleted file mode 100644
index 23a319c81..000000000
--- a/src/SWIG_files/deprecated_modules/GeomPlate.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomPlate is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomPlate", DeprecationWarning)
-
-from OCC.Core.GeomPlate import *
diff --git a/src/SWIG_files/deprecated_modules/GeomProjLib.py b/src/SWIG_files/deprecated_modules/GeomProjLib.py
deleted file mode 100644
index 4f464259c..000000000
--- a/src/SWIG_files/deprecated_modules/GeomProjLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomProjLib is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomProjLib", DeprecationWarning)
-
-from OCC.Core.GeomProjLib import *
diff --git a/src/SWIG_files/deprecated_modules/GeomToStep.py b/src/SWIG_files/deprecated_modules/GeomToStep.py
deleted file mode 100644
index 2c65e4437..000000000
--- a/src/SWIG_files/deprecated_modules/GeomToStep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomToStep is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomToStep", DeprecationWarning)
-
-from OCC.Core.GeomToStep import *
diff --git a/src/SWIG_files/deprecated_modules/GeomTools.py b/src/SWIG_files/deprecated_modules/GeomTools.py
deleted file mode 100644
index ea5b3bf5f..000000000
--- a/src/SWIG_files/deprecated_modules/GeomTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GeomTools is deprecated since pythonocc-0.18.2. Use OCC.Core.GeomTools", DeprecationWarning)
-
-from OCC.Core.GeomTools import *
diff --git a/src/SWIG_files/deprecated_modules/GraphDS.py b/src/SWIG_files/deprecated_modules/GraphDS.py
deleted file mode 100644
index d6e58d3c9..000000000
--- a/src/SWIG_files/deprecated_modules/GraphDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GraphDS is deprecated since pythonocc-0.18.2. Use OCC.Core.GraphDS", DeprecationWarning)
-
-from OCC.Core.GraphDS import *
diff --git a/src/SWIG_files/deprecated_modules/GraphTools.py b/src/SWIG_files/deprecated_modules/GraphTools.py
deleted file mode 100644
index bdaa0f24c..000000000
--- a/src/SWIG_files/deprecated_modules/GraphTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.GraphTools is deprecated since pythonocc-0.18.2. Use OCC.Core.GraphTools", DeprecationWarning)
-
-from OCC.Core.GraphTools import *
diff --git a/src/SWIG_files/deprecated_modules/Graphic3d.py b/src/SWIG_files/deprecated_modules/Graphic3d.py
deleted file mode 100644
index 51b8b0c51..000000000
--- a/src/SWIG_files/deprecated_modules/Graphic3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Graphic3d is deprecated since pythonocc-0.18.2. Use OCC.Core.Graphic3d", DeprecationWarning)
-
-from OCC.Core.Graphic3d import *
diff --git a/src/SWIG_files/deprecated_modules/HLRAlgo.py b/src/SWIG_files/deprecated_modules/HLRAlgo.py
deleted file mode 100644
index 5d16a2e6b..000000000
--- a/src/SWIG_files/deprecated_modules/HLRAlgo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.HLRAlgo is deprecated since pythonocc-0.18.2. Use OCC.Core.HLRAlgo", DeprecationWarning)
-
-from OCC.Core.HLRAlgo import *
diff --git a/src/SWIG_files/deprecated_modules/HLRAppli.py b/src/SWIG_files/deprecated_modules/HLRAppli.py
deleted file mode 100644
index 0466fcb87..000000000
--- a/src/SWIG_files/deprecated_modules/HLRAppli.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.HLRAppli is deprecated since pythonocc-0.18.2. Use OCC.Core.HLRAppli", DeprecationWarning)
-
-from OCC.Core.HLRAppli import *
diff --git a/src/SWIG_files/deprecated_modules/HLRBRep.py b/src/SWIG_files/deprecated_modules/HLRBRep.py
deleted file mode 100644
index 644d68e61..000000000
--- a/src/SWIG_files/deprecated_modules/HLRBRep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.HLRBRep is deprecated since pythonocc-0.18.2. Use OCC.Core.HLRBRep", DeprecationWarning)
-
-from OCC.Core.HLRBRep import *
diff --git a/src/SWIG_files/deprecated_modules/HLRTopoBRep.py b/src/SWIG_files/deprecated_modules/HLRTopoBRep.py
deleted file mode 100644
index 87a32858e..000000000
--- a/src/SWIG_files/deprecated_modules/HLRTopoBRep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.HLRTopoBRep is deprecated since pythonocc-0.18.2. Use OCC.Core.HLRTopoBRep", DeprecationWarning)
-
-from OCC.Core.HLRTopoBRep import *
diff --git a/src/SWIG_files/deprecated_modules/Hatch.py b/src/SWIG_files/deprecated_modules/Hatch.py
deleted file mode 100644
index 86de8bafd..000000000
--- a/src/SWIG_files/deprecated_modules/Hatch.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Hatch is deprecated since pythonocc-0.18.2. Use OCC.Core.Hatch", DeprecationWarning)
-
-from OCC.Core.Hatch import *
diff --git a/src/SWIG_files/deprecated_modules/HatchGen.py b/src/SWIG_files/deprecated_modules/HatchGen.py
deleted file mode 100644
index 9e8bd9762..000000000
--- a/src/SWIG_files/deprecated_modules/HatchGen.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.HatchGen is deprecated since pythonocc-0.18.2. Use OCC.Core.HatchGen", DeprecationWarning)
-
-from OCC.Core.HatchGen import *
diff --git a/src/SWIG_files/deprecated_modules/Hermit.py b/src/SWIG_files/deprecated_modules/Hermit.py
deleted file mode 100644
index e19ab17c6..000000000
--- a/src/SWIG_files/deprecated_modules/Hermit.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Hermit is deprecated since pythonocc-0.18.2. Use OCC.Core.Hermit", DeprecationWarning)
-
-from OCC.Core.Hermit import *
diff --git a/src/SWIG_files/deprecated_modules/IFSelect.py b/src/SWIG_files/deprecated_modules/IFSelect.py
deleted file mode 100644
index 9f66160f8..000000000
--- a/src/SWIG_files/deprecated_modules/IFSelect.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IFSelect is deprecated since pythonocc-0.18.2. Use OCC.Core.IFSelect", DeprecationWarning)
-
-from OCC.Core.IFSelect import *
diff --git a/src/SWIG_files/deprecated_modules/IGESCAFControl.py b/src/SWIG_files/deprecated_modules/IGESCAFControl.py
deleted file mode 100644
index 89db9ce78..000000000
--- a/src/SWIG_files/deprecated_modules/IGESCAFControl.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IGESCAFControl is deprecated since pythonocc-0.18.2. Use OCC.Core.IGESCAFControl", DeprecationWarning)
-
-from OCC.Core.IGESCAFControl import *
diff --git a/src/SWIG_files/deprecated_modules/IGESControl.py b/src/SWIG_files/deprecated_modules/IGESControl.py
deleted file mode 100644
index 02c64bc3a..000000000
--- a/src/SWIG_files/deprecated_modules/IGESControl.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IGESControl is deprecated since pythonocc-0.18.2. Use OCC.Core.IGESControl", DeprecationWarning)
-
-from OCC.Core.IGESControl import *
diff --git a/src/SWIG_files/deprecated_modules/IVtk.py b/src/SWIG_files/deprecated_modules/IVtk.py
deleted file mode 100644
index b1b8eb6bf..000000000
--- a/src/SWIG_files/deprecated_modules/IVtk.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IVtk is deprecated since pythonocc-0.18.2. Use OCC.Core.IVtk", DeprecationWarning)
-
-from OCC.Core.IVtk import *
diff --git a/src/SWIG_files/deprecated_modules/IVtkOCC.py b/src/SWIG_files/deprecated_modules/IVtkOCC.py
deleted file mode 100644
index 92117b22b..000000000
--- a/src/SWIG_files/deprecated_modules/IVtkOCC.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IVtkOCC is deprecated since pythonocc-0.18.2. Use OCC.Core.IVtkOCC", DeprecationWarning)
-
-from OCC.Core.IVtkOCC import *
diff --git a/src/SWIG_files/deprecated_modules/IVtkTools.py b/src/SWIG_files/deprecated_modules/IVtkTools.py
deleted file mode 100644
index d24818e63..000000000
--- a/src/SWIG_files/deprecated_modules/IVtkTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IVtkTools is deprecated since pythonocc-0.18.2. Use OCC.Core.IVtkTools", DeprecationWarning)
-
-from OCC.Core.IVtkTools import *
diff --git a/src/SWIG_files/deprecated_modules/IVtkVTK.py b/src/SWIG_files/deprecated_modules/IVtkVTK.py
deleted file mode 100644
index fa7e6529e..000000000
--- a/src/SWIG_files/deprecated_modules/IVtkVTK.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IVtkVTK is deprecated since pythonocc-0.18.2. Use OCC.Core.IVtkVTK", DeprecationWarning)
-
-from OCC.Core.IVtkVTK import *
diff --git a/src/SWIG_files/deprecated_modules/Image.py b/src/SWIG_files/deprecated_modules/Image.py
deleted file mode 100644
index cb124a950..000000000
--- a/src/SWIG_files/deprecated_modules/Image.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Image is deprecated since pythonocc-0.18.2. Use OCC.Core.Image", DeprecationWarning)
-
-from OCC.Core.Image import *
diff --git a/src/SWIG_files/deprecated_modules/IncludeLibrary.py b/src/SWIG_files/deprecated_modules/IncludeLibrary.py
deleted file mode 100644
index 025996abe..000000000
--- a/src/SWIG_files/deprecated_modules/IncludeLibrary.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IncludeLibrary is deprecated since pythonocc-0.18.2. Use OCC.Core.IncludeLibrary", DeprecationWarning)
-
-from OCC.Core.IncludeLibrary import *
diff --git a/src/SWIG_files/deprecated_modules/IntAna.py b/src/SWIG_files/deprecated_modules/IntAna.py
deleted file mode 100644
index 39f648aaf..000000000
--- a/src/SWIG_files/deprecated_modules/IntAna.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntAna is deprecated since pythonocc-0.18.2. Use OCC.Core.IntAna", DeprecationWarning)
-
-from OCC.Core.IntAna import *
diff --git a/src/SWIG_files/deprecated_modules/IntAna2d.py b/src/SWIG_files/deprecated_modules/IntAna2d.py
deleted file mode 100644
index 8e45c13ed..000000000
--- a/src/SWIG_files/deprecated_modules/IntAna2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntAna2d is deprecated since pythonocc-0.18.2. Use OCC.Core.IntAna2d", DeprecationWarning)
-
-from OCC.Core.IntAna2d import *
diff --git a/src/SWIG_files/deprecated_modules/IntCurve.py b/src/SWIG_files/deprecated_modules/IntCurve.py
deleted file mode 100644
index e722bed67..000000000
--- a/src/SWIG_files/deprecated_modules/IntCurve.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntCurve is deprecated since pythonocc-0.18.2. Use OCC.Core.IntCurve", DeprecationWarning)
-
-from OCC.Core.IntCurve import *
diff --git a/src/SWIG_files/deprecated_modules/IntCurveSurface.py b/src/SWIG_files/deprecated_modules/IntCurveSurface.py
deleted file mode 100644
index 878589ed3..000000000
--- a/src/SWIG_files/deprecated_modules/IntCurveSurface.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntCurveSurface is deprecated since pythonocc-0.18.2. Use OCC.Core.IntCurveSurface", DeprecationWarning)
-
-from OCC.Core.IntCurveSurface import *
diff --git a/src/SWIG_files/deprecated_modules/IntCurvesFace.py b/src/SWIG_files/deprecated_modules/IntCurvesFace.py
deleted file mode 100644
index baac74cab..000000000
--- a/src/SWIG_files/deprecated_modules/IntCurvesFace.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntCurvesFace is deprecated since pythonocc-0.18.2. Use OCC.Core.IntCurvesFace", DeprecationWarning)
-
-from OCC.Core.IntCurvesFace import *
diff --git a/src/SWIG_files/deprecated_modules/IntImp.py b/src/SWIG_files/deprecated_modules/IntImp.py
deleted file mode 100644
index 8d90fa512..000000000
--- a/src/SWIG_files/deprecated_modules/IntImp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntImp is deprecated since pythonocc-0.18.2. Use OCC.Core.IntImp", DeprecationWarning)
-
-from OCC.Core.IntImp import *
diff --git a/src/SWIG_files/deprecated_modules/IntImpParGen.py b/src/SWIG_files/deprecated_modules/IntImpParGen.py
deleted file mode 100644
index 4092ec778..000000000
--- a/src/SWIG_files/deprecated_modules/IntImpParGen.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntImpParGen is deprecated since pythonocc-0.18.2. Use OCC.Core.IntImpParGen", DeprecationWarning)
-
-from OCC.Core.IntImpParGen import *
diff --git a/src/SWIG_files/deprecated_modules/IntPatch.py b/src/SWIG_files/deprecated_modules/IntPatch.py
deleted file mode 100644
index 82a01b62d..000000000
--- a/src/SWIG_files/deprecated_modules/IntPatch.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntPatch is deprecated since pythonocc-0.18.2. Use OCC.Core.IntPatch", DeprecationWarning)
-
-from OCC.Core.IntPatch import *
diff --git a/src/SWIG_files/deprecated_modules/IntPoly.py b/src/SWIG_files/deprecated_modules/IntPoly.py
deleted file mode 100644
index 799a938c2..000000000
--- a/src/SWIG_files/deprecated_modules/IntPoly.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntPoly is deprecated since pythonocc-0.18.2. Use OCC.Core.IntPoly", DeprecationWarning)
-
-from OCC.Core.IntPoly import *
diff --git a/src/SWIG_files/deprecated_modules/IntPolyh.py b/src/SWIG_files/deprecated_modules/IntPolyh.py
deleted file mode 100644
index b85cd59e7..000000000
--- a/src/SWIG_files/deprecated_modules/IntPolyh.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntPolyh is deprecated since pythonocc-0.18.2. Use OCC.Core.IntPolyh", DeprecationWarning)
-
-from OCC.Core.IntPolyh import *
diff --git a/src/SWIG_files/deprecated_modules/IntRes2d.py b/src/SWIG_files/deprecated_modules/IntRes2d.py
deleted file mode 100644
index 5db246c41..000000000
--- a/src/SWIG_files/deprecated_modules/IntRes2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntRes2d is deprecated since pythonocc-0.18.2. Use OCC.Core.IntRes2d", DeprecationWarning)
-
-from OCC.Core.IntRes2d import *
diff --git a/src/SWIG_files/deprecated_modules/IntStart.py b/src/SWIG_files/deprecated_modules/IntStart.py
deleted file mode 100644
index 1dac00b8d..000000000
--- a/src/SWIG_files/deprecated_modules/IntStart.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntStart is deprecated since pythonocc-0.18.2. Use OCC.Core.IntStart", DeprecationWarning)
-
-from OCC.Core.IntStart import *
diff --git a/src/SWIG_files/deprecated_modules/IntSurf.py b/src/SWIG_files/deprecated_modules/IntSurf.py
deleted file mode 100644
index 1e15202b2..000000000
--- a/src/SWIG_files/deprecated_modules/IntSurf.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntSurf is deprecated since pythonocc-0.18.2. Use OCC.Core.IntSurf", DeprecationWarning)
-
-from OCC.Core.IntSurf import *
diff --git a/src/SWIG_files/deprecated_modules/IntTools.py b/src/SWIG_files/deprecated_modules/IntTools.py
deleted file mode 100644
index 7c3dcb74c..000000000
--- a/src/SWIG_files/deprecated_modules/IntTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntTools is deprecated since pythonocc-0.18.2. Use OCC.Core.IntTools", DeprecationWarning)
-
-from OCC.Core.IntTools import *
diff --git a/src/SWIG_files/deprecated_modules/IntWalk.py b/src/SWIG_files/deprecated_modules/IntWalk.py
deleted file mode 100644
index e1f888de3..000000000
--- a/src/SWIG_files/deprecated_modules/IntWalk.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.IntWalk is deprecated since pythonocc-0.18.2. Use OCC.Core.IntWalk", DeprecationWarning)
-
-from OCC.Core.IntWalk import *
diff --git a/src/SWIG_files/deprecated_modules/Interface.py b/src/SWIG_files/deprecated_modules/Interface.py
deleted file mode 100644
index 740d09f46..000000000
--- a/src/SWIG_files/deprecated_modules/Interface.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Interface is deprecated since pythonocc-0.18.2. Use OCC.Core.Interface", DeprecationWarning)
-
-from OCC.Core.Interface import *
diff --git a/src/SWIG_files/deprecated_modules/InterfaceGraphic.py b/src/SWIG_files/deprecated_modules/InterfaceGraphic.py
deleted file mode 100644
index f1a7f4bcf..000000000
--- a/src/SWIG_files/deprecated_modules/InterfaceGraphic.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.InterfaceGraphic is deprecated since pythonocc-0.18.2. Use OCC.Core.InterfaceGraphic", DeprecationWarning)
-
-from OCC.Core.InterfaceGraphic import *
diff --git a/src/SWIG_files/deprecated_modules/Intf.py b/src/SWIG_files/deprecated_modules/Intf.py
deleted file mode 100644
index 5d7151ae2..000000000
--- a/src/SWIG_files/deprecated_modules/Intf.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Intf is deprecated since pythonocc-0.18.2. Use OCC.Core.Intf", DeprecationWarning)
-
-from OCC.Core.Intf import *
diff --git a/src/SWIG_files/deprecated_modules/Intrv.py b/src/SWIG_files/deprecated_modules/Intrv.py
deleted file mode 100644
index ed8e5be23..000000000
--- a/src/SWIG_files/deprecated_modules/Intrv.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Intrv is deprecated since pythonocc-0.18.2. Use OCC.Core.Intrv", DeprecationWarning)
-
-from OCC.Core.Intrv import *
diff --git a/src/SWIG_files/deprecated_modules/LDOM.py b/src/SWIG_files/deprecated_modules/LDOM.py
deleted file mode 100644
index d6148a3f9..000000000
--- a/src/SWIG_files/deprecated_modules/LDOM.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.LDOM is deprecated since pythonocc-0.18.2. Use OCC.Core.LDOM", DeprecationWarning)
-
-from OCC.Core.LDOM import *
diff --git a/src/SWIG_files/deprecated_modules/LProp.py b/src/SWIG_files/deprecated_modules/LProp.py
deleted file mode 100644
index 1e6609174..000000000
--- a/src/SWIG_files/deprecated_modules/LProp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.LProp is deprecated since pythonocc-0.18.2. Use OCC.Core.LProp", DeprecationWarning)
-
-from OCC.Core.LProp import *
diff --git a/src/SWIG_files/deprecated_modules/LProp3d.py b/src/SWIG_files/deprecated_modules/LProp3d.py
deleted file mode 100644
index 7b00ef516..000000000
--- a/src/SWIG_files/deprecated_modules/LProp3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.LProp3d is deprecated since pythonocc-0.18.2. Use OCC.Core.LProp3d", DeprecationWarning)
-
-from OCC.Core.LProp3d import *
diff --git a/src/SWIG_files/deprecated_modules/Law.py b/src/SWIG_files/deprecated_modules/Law.py
deleted file mode 100644
index 29b7245bc..000000000
--- a/src/SWIG_files/deprecated_modules/Law.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Law is deprecated since pythonocc-0.18.2. Use OCC.Core.Law", DeprecationWarning)
-
-from OCC.Core.Law import *
diff --git a/src/SWIG_files/deprecated_modules/LocOpe.py b/src/SWIG_files/deprecated_modules/LocOpe.py
deleted file mode 100644
index 60c3f763c..000000000
--- a/src/SWIG_files/deprecated_modules/LocOpe.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.LocOpe is deprecated since pythonocc-0.18.2. Use OCC.Core.LocOpe", DeprecationWarning)
-
-from OCC.Core.LocOpe import *
diff --git a/src/SWIG_files/deprecated_modules/LocalAnalysis.py b/src/SWIG_files/deprecated_modules/LocalAnalysis.py
deleted file mode 100644
index 5f40aad80..000000000
--- a/src/SWIG_files/deprecated_modules/LocalAnalysis.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.LocalAnalysis is deprecated since pythonocc-0.18.2. Use OCC.Core.LocalAnalysis", DeprecationWarning)
-
-from OCC.Core.LocalAnalysis import *
diff --git a/src/SWIG_files/deprecated_modules/MAT.py b/src/SWIG_files/deprecated_modules/MAT.py
deleted file mode 100644
index 0e6f4f11e..000000000
--- a/src/SWIG_files/deprecated_modules/MAT.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MAT is deprecated since pythonocc-0.18.2. Use OCC.Core.MAT", DeprecationWarning)
-
-from OCC.Core.MAT import *
diff --git a/src/SWIG_files/deprecated_modules/MAT2d.py b/src/SWIG_files/deprecated_modules/MAT2d.py
deleted file mode 100644
index b66f8dca7..000000000
--- a/src/SWIG_files/deprecated_modules/MAT2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MAT2d is deprecated since pythonocc-0.18.2. Use OCC.Core.MAT2d", DeprecationWarning)
-
-from OCC.Core.MAT2d import *
diff --git a/src/SWIG_files/deprecated_modules/MDF.py b/src/SWIG_files/deprecated_modules/MDF.py
deleted file mode 100644
index 9ddd4fa2e..000000000
--- a/src/SWIG_files/deprecated_modules/MDF.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MDF is deprecated since pythonocc-0.18.2. Use OCC.Core.MDF", DeprecationWarning)
-
-from OCC.Core.MDF import *
diff --git a/src/SWIG_files/deprecated_modules/MDataStd.py b/src/SWIG_files/deprecated_modules/MDataStd.py
deleted file mode 100644
index 532175e6f..000000000
--- a/src/SWIG_files/deprecated_modules/MDataStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MDataStd is deprecated since pythonocc-0.18.2. Use OCC.Core.MDataStd", DeprecationWarning)
-
-from OCC.Core.MDataStd import *
diff --git a/src/SWIG_files/deprecated_modules/MDataXtd.py b/src/SWIG_files/deprecated_modules/MDataXtd.py
deleted file mode 100644
index 659347d4a..000000000
--- a/src/SWIG_files/deprecated_modules/MDataXtd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MDataXtd is deprecated since pythonocc-0.18.2. Use OCC.Core.MDataXtd", DeprecationWarning)
-
-from OCC.Core.MDataXtd import *
diff --git a/src/SWIG_files/deprecated_modules/MDocStd.py b/src/SWIG_files/deprecated_modules/MDocStd.py
deleted file mode 100644
index 64db70774..000000000
--- a/src/SWIG_files/deprecated_modules/MDocStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MDocStd is deprecated since pythonocc-0.18.2. Use OCC.Core.MDocStd", DeprecationWarning)
-
-from OCC.Core.MDocStd import *
diff --git a/src/SWIG_files/deprecated_modules/MFunction.py b/src/SWIG_files/deprecated_modules/MFunction.py
deleted file mode 100644
index 5d8cd7873..000000000
--- a/src/SWIG_files/deprecated_modules/MFunction.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MFunction is deprecated since pythonocc-0.18.2. Use OCC.Core.MFunction", DeprecationWarning)
-
-from OCC.Core.MFunction import *
diff --git a/src/SWIG_files/deprecated_modules/MMgt.py b/src/SWIG_files/deprecated_modules/MMgt.py
deleted file mode 100644
index 7056e6934..000000000
--- a/src/SWIG_files/deprecated_modules/MMgt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MMgt is deprecated since pythonocc-0.18.2. Use OCC.Core.MMgt", DeprecationWarning)
-
-from OCC.Core.MMgt import *
diff --git a/src/SWIG_files/deprecated_modules/MNaming.py b/src/SWIG_files/deprecated_modules/MNaming.py
deleted file mode 100644
index 1bd2f2ce9..000000000
--- a/src/SWIG_files/deprecated_modules/MNaming.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MNaming is deprecated since pythonocc-0.18.2. Use OCC.Core.MNaming", DeprecationWarning)
-
-from OCC.Core.MNaming import *
diff --git a/src/SWIG_files/deprecated_modules/MPrsStd.py b/src/SWIG_files/deprecated_modules/MPrsStd.py
deleted file mode 100644
index 1b3537b1e..000000000
--- a/src/SWIG_files/deprecated_modules/MPrsStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MPrsStd is deprecated since pythonocc-0.18.2. Use OCC.Core.MPrsStd", DeprecationWarning)
-
-from OCC.Core.MPrsStd import *
diff --git a/src/SWIG_files/deprecated_modules/Materials.py b/src/SWIG_files/deprecated_modules/Materials.py
deleted file mode 100644
index ab1389211..000000000
--- a/src/SWIG_files/deprecated_modules/Materials.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Materials is deprecated since pythonocc-0.18.2. Use OCC.Core.Materials", DeprecationWarning)
-
-from OCC.Core.Materials import *
diff --git a/src/SWIG_files/deprecated_modules/MeshVS.py b/src/SWIG_files/deprecated_modules/MeshVS.py
deleted file mode 100644
index 44f9289b6..000000000
--- a/src/SWIG_files/deprecated_modules/MeshVS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.MeshVS is deprecated since pythonocc-0.18.2. Use OCC.Core.MeshVS", DeprecationWarning)
-
-from OCC.Core.MeshVS import *
diff --git a/src/SWIG_files/deprecated_modules/Message.py b/src/SWIG_files/deprecated_modules/Message.py
deleted file mode 100644
index a0251c670..000000000
--- a/src/SWIG_files/deprecated_modules/Message.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Message is deprecated since pythonocc-0.18.2. Use OCC.Core.Message", DeprecationWarning)
-
-from OCC.Core.Message import *
diff --git a/src/SWIG_files/deprecated_modules/NCollection.py b/src/SWIG_files/deprecated_modules/NCollection.py
deleted file mode 100644
index cdb2b453a..000000000
--- a/src/SWIG_files/deprecated_modules/NCollection.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.NCollection is deprecated since pythonocc-0.18.2. Use OCC.Core.NCollection", DeprecationWarning)
-
-from OCC.Core.NCollection import *
diff --git a/src/SWIG_files/deprecated_modules/NETGENPlugin.py b/src/SWIG_files/deprecated_modules/NETGENPlugin.py
deleted file mode 100644
index 816a8dcf2..000000000
--- a/src/SWIG_files/deprecated_modules/NETGENPlugin.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.NETGENPlugin is deprecated since pythonocc-0.18.2. Use OCC.Core.NETGENPlugin", DeprecationWarning)
-
-from OCC.Core.NETGENPlugin import *
diff --git a/src/SWIG_files/deprecated_modules/NIS.py b/src/SWIG_files/deprecated_modules/NIS.py
deleted file mode 100644
index 2a7c09909..000000000
--- a/src/SWIG_files/deprecated_modules/NIS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.NIS is deprecated since pythonocc-0.18.2. Use OCC.Core.NIS", DeprecationWarning)
-
-from OCC.Core.NIS import *
diff --git a/src/SWIG_files/deprecated_modules/NLPlate.py b/src/SWIG_files/deprecated_modules/NLPlate.py
deleted file mode 100644
index f34f2daad..000000000
--- a/src/SWIG_files/deprecated_modules/NLPlate.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.NLPlate is deprecated since pythonocc-0.18.2. Use OCC.Core.NLPlate", DeprecationWarning)
-
-from OCC.Core.NLPlate import *
diff --git a/src/SWIG_files/deprecated_modules/OSD.py b/src/SWIG_files/deprecated_modules/OSD.py
deleted file mode 100644
index 1f8125e37..000000000
--- a/src/SWIG_files/deprecated_modules/OSD.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.OSD is deprecated since pythonocc-0.18.2. Use OCC.Core.OSD", DeprecationWarning)
-
-from OCC.Core.OSD import *
diff --git a/src/SWIG_files/deprecated_modules/PCDM.py b/src/SWIG_files/deprecated_modules/PCDM.py
deleted file mode 100644
index 9f051be05..000000000
--- a/src/SWIG_files/deprecated_modules/PCDM.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PCDM is deprecated since pythonocc-0.18.2. Use OCC.Core.PCDM", DeprecationWarning)
-
-from OCC.Core.PCDM import *
diff --git a/src/SWIG_files/deprecated_modules/PDF.py b/src/SWIG_files/deprecated_modules/PDF.py
deleted file mode 100644
index f084732e1..000000000
--- a/src/SWIG_files/deprecated_modules/PDF.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PDF is deprecated since pythonocc-0.18.2. Use OCC.Core.PDF", DeprecationWarning)
-
-from OCC.Core.PDF import *
diff --git a/src/SWIG_files/deprecated_modules/PDataStd.py b/src/SWIG_files/deprecated_modules/PDataStd.py
deleted file mode 100644
index 887163b65..000000000
--- a/src/SWIG_files/deprecated_modules/PDataStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PDataStd is deprecated since pythonocc-0.18.2. Use OCC.Core.PDataStd", DeprecationWarning)
-
-from OCC.Core.PDataStd import *
diff --git a/src/SWIG_files/deprecated_modules/PDataXtd.py b/src/SWIG_files/deprecated_modules/PDataXtd.py
deleted file mode 100644
index 7f5e384eb..000000000
--- a/src/SWIG_files/deprecated_modules/PDataXtd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PDataXtd is deprecated since pythonocc-0.18.2. Use OCC.Core.PDataXtd", DeprecationWarning)
-
-from OCC.Core.PDataXtd import *
diff --git a/src/SWIG_files/deprecated_modules/PDocStd.py b/src/SWIG_files/deprecated_modules/PDocStd.py
deleted file mode 100644
index 04ddf1300..000000000
--- a/src/SWIG_files/deprecated_modules/PDocStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PDocStd is deprecated since pythonocc-0.18.2. Use OCC.Core.PDocStd", DeprecationWarning)
-
-from OCC.Core.PDocStd import *
diff --git a/src/SWIG_files/deprecated_modules/PFunction.py b/src/SWIG_files/deprecated_modules/PFunction.py
deleted file mode 100644
index cab31f5dc..000000000
--- a/src/SWIG_files/deprecated_modules/PFunction.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PFunction is deprecated since pythonocc-0.18.2. Use OCC.Core.PFunction", DeprecationWarning)
-
-from OCC.Core.PFunction import *
diff --git a/src/SWIG_files/deprecated_modules/PLib.py b/src/SWIG_files/deprecated_modules/PLib.py
deleted file mode 100644
index c9264b6bd..000000000
--- a/src/SWIG_files/deprecated_modules/PLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PLib is deprecated since pythonocc-0.18.2. Use OCC.Core.PLib", DeprecationWarning)
-
-from OCC.Core.PLib import *
diff --git a/src/SWIG_files/deprecated_modules/PNaming.py b/src/SWIG_files/deprecated_modules/PNaming.py
deleted file mode 100644
index 73cc23853..000000000
--- a/src/SWIG_files/deprecated_modules/PNaming.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PNaming is deprecated since pythonocc-0.18.2. Use OCC.Core.PNaming", DeprecationWarning)
-
-from OCC.Core.PNaming import *
diff --git a/src/SWIG_files/deprecated_modules/PPrsStd.py b/src/SWIG_files/deprecated_modules/PPrsStd.py
deleted file mode 100644
index afc38be8b..000000000
--- a/src/SWIG_files/deprecated_modules/PPrsStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PPrsStd is deprecated since pythonocc-0.18.2. Use OCC.Core.PPrsStd", DeprecationWarning)
-
-from OCC.Core.PPrsStd import *
diff --git a/src/SWIG_files/deprecated_modules/Plate.py b/src/SWIG_files/deprecated_modules/Plate.py
deleted file mode 100644
index 50923729f..000000000
--- a/src/SWIG_files/deprecated_modules/Plate.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Plate is deprecated since pythonocc-0.18.2. Use OCC.Core.Plate", DeprecationWarning)
-
-from OCC.Core.Plate import *
diff --git a/src/SWIG_files/deprecated_modules/Plugin.py b/src/SWIG_files/deprecated_modules/Plugin.py
deleted file mode 100644
index 2bc1ac49c..000000000
--- a/src/SWIG_files/deprecated_modules/Plugin.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Plugin is deprecated since pythonocc-0.18.2. Use OCC.Core.Plugin", DeprecationWarning)
-
-from OCC.Core.Plugin import *
diff --git a/src/SWIG_files/deprecated_modules/Poly.py b/src/SWIG_files/deprecated_modules/Poly.py
deleted file mode 100644
index 2b5ca7d60..000000000
--- a/src/SWIG_files/deprecated_modules/Poly.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Poly is deprecated since pythonocc-0.18.2. Use OCC.Core.Poly", DeprecationWarning)
-
-from OCC.Core.Poly import *
diff --git a/src/SWIG_files/deprecated_modules/Precision.py b/src/SWIG_files/deprecated_modules/Precision.py
deleted file mode 100644
index ac08d26a6..000000000
--- a/src/SWIG_files/deprecated_modules/Precision.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Precision is deprecated since pythonocc-0.18.2. Use OCC.Core.Precision", DeprecationWarning)
-
-from OCC.Core.Precision import *
diff --git a/src/SWIG_files/deprecated_modules/Primitives.py b/src/SWIG_files/deprecated_modules/Primitives.py
deleted file mode 100644
index ba2f5a460..000000000
--- a/src/SWIG_files/deprecated_modules/Primitives.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Primitives is deprecated since pythonocc-0.18.2. Use OCC.Core.Primitives", DeprecationWarning)
-
-from OCC.Core.Primitives import *
diff --git a/src/SWIG_files/deprecated_modules/ProjLib.py b/src/SWIG_files/deprecated_modules/ProjLib.py
deleted file mode 100644
index 4c1eb33c7..000000000
--- a/src/SWIG_files/deprecated_modules/ProjLib.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ProjLib is deprecated since pythonocc-0.18.2. Use OCC.Core.ProjLib", DeprecationWarning)
-
-from OCC.Core.ProjLib import *
diff --git a/src/SWIG_files/deprecated_modules/Prs3d.py b/src/SWIG_files/deprecated_modules/Prs3d.py
deleted file mode 100644
index 30f715a47..000000000
--- a/src/SWIG_files/deprecated_modules/Prs3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Prs3d is deprecated since pythonocc-0.18.2. Use OCC.Core.Prs3d", DeprecationWarning)
-
-from OCC.Core.Prs3d import *
diff --git a/src/SWIG_files/deprecated_modules/PrsMgr.py b/src/SWIG_files/deprecated_modules/PrsMgr.py
deleted file mode 100644
index 836a2a694..000000000
--- a/src/SWIG_files/deprecated_modules/PrsMgr.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.PrsMgr is deprecated since pythonocc-0.18.2. Use OCC.Core.PrsMgr", DeprecationWarning)
-
-from OCC.Core.PrsMgr import *
diff --git a/src/SWIG_files/deprecated_modules/Quantity.py b/src/SWIG_files/deprecated_modules/Quantity.py
deleted file mode 100644
index 197b9a0ea..000000000
--- a/src/SWIG_files/deprecated_modules/Quantity.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Quantity is deprecated since pythonocc-0.18.2. Use OCC.Core.Quantity", DeprecationWarning)
-
-from OCC.Core.Quantity import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepAP203.py b/src/SWIG_files/deprecated_modules/RWStepAP203.py
deleted file mode 100644
index 0b506db83..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepAP203.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepAP203 is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepAP203", DeprecationWarning)
-
-from OCC.Core.RWStepAP203 import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepAP214.py b/src/SWIG_files/deprecated_modules/RWStepAP214.py
deleted file mode 100644
index 4a59408a6..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepAP214.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepAP214 is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepAP214", DeprecationWarning)
-
-from OCC.Core.RWStepAP214 import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepBasic.py b/src/SWIG_files/deprecated_modules/RWStepBasic.py
deleted file mode 100644
index cc1aaefd3..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepBasic.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepBasic is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepBasic", DeprecationWarning)
-
-from OCC.Core.RWStepBasic import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepDimTol.py b/src/SWIG_files/deprecated_modules/RWStepDimTol.py
deleted file mode 100644
index 889ba4dd4..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepDimTol.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepDimTol is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepDimTol", DeprecationWarning)
-
-from OCC.Core.RWStepDimTol import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepElement.py b/src/SWIG_files/deprecated_modules/RWStepElement.py
deleted file mode 100644
index db40f0450..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepElement.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepElement is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepElement", DeprecationWarning)
-
-from OCC.Core.RWStepElement import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepFEA.py b/src/SWIG_files/deprecated_modules/RWStepFEA.py
deleted file mode 100644
index bc0a6bb03..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepFEA.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepFEA is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepFEA", DeprecationWarning)
-
-from OCC.Core.RWStepFEA import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepGeom.py b/src/SWIG_files/deprecated_modules/RWStepGeom.py
deleted file mode 100644
index eb0441d20..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepGeom.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepGeom is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepGeom", DeprecationWarning)
-
-from OCC.Core.RWStepGeom import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepRepr.py b/src/SWIG_files/deprecated_modules/RWStepRepr.py
deleted file mode 100644
index acf4552d9..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepRepr.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepRepr is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepRepr", DeprecationWarning)
-
-from OCC.Core.RWStepRepr import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepShape.py b/src/SWIG_files/deprecated_modules/RWStepShape.py
deleted file mode 100644
index 8cbaad585..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepShape.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepShape is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepShape", DeprecationWarning)
-
-from OCC.Core.RWStepShape import *
diff --git a/src/SWIG_files/deprecated_modules/RWStepVisual.py b/src/SWIG_files/deprecated_modules/RWStepVisual.py
deleted file mode 100644
index 8617e5fcd..000000000
--- a/src/SWIG_files/deprecated_modules/RWStepVisual.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStepVisual is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStepVisual", DeprecationWarning)
-
-from OCC.Core.RWStepVisual import *
diff --git a/src/SWIG_files/deprecated_modules/RWStl.py b/src/SWIG_files/deprecated_modules/RWStl.py
deleted file mode 100644
index 6d1fe3502..000000000
--- a/src/SWIG_files/deprecated_modules/RWStl.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.RWStl is deprecated since pythonocc-0.18.2. Use OCC.Core.RWStl", DeprecationWarning)
-
-from OCC.Core.RWStl import *
diff --git a/src/SWIG_files/deprecated_modules/Resource.py b/src/SWIG_files/deprecated_modules/Resource.py
deleted file mode 100644
index 47f0c67a4..000000000
--- a/src/SWIG_files/deprecated_modules/Resource.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Resource is deprecated since pythonocc-0.18.2. Use OCC.Core.Resource", DeprecationWarning)
-
-from OCC.Core.Resource import *
diff --git a/src/SWIG_files/deprecated_modules/SMDS.py b/src/SWIG_files/deprecated_modules/SMDS.py
deleted file mode 100644
index 5d5cac3b6..000000000
--- a/src/SWIG_files/deprecated_modules/SMDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SMDS is deprecated since pythonocc-0.18.2. Use OCC.Core.SMDS", DeprecationWarning)
-
-from OCC.Core.SMDS import *
diff --git a/src/SWIG_files/deprecated_modules/SMDSAbs.py b/src/SWIG_files/deprecated_modules/SMDSAbs.py
deleted file mode 100644
index aa779d328..000000000
--- a/src/SWIG_files/deprecated_modules/SMDSAbs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SMDSAbs is deprecated since pythonocc-0.18.2. Use OCC.Core.SMDSAbs", DeprecationWarning)
-
-from OCC.Core.SMDSAbs import *
diff --git a/src/SWIG_files/deprecated_modules/SMESH.py b/src/SWIG_files/deprecated_modules/SMESH.py
deleted file mode 100644
index 222c48036..000000000
--- a/src/SWIG_files/deprecated_modules/SMESH.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SMESH is deprecated since pythonocc-0.18.2. Use OCC.Core.SMESH", DeprecationWarning)
-
-from OCC.Core.SMESH import *
diff --git a/src/SWIG_files/deprecated_modules/SMESHDS.py b/src/SWIG_files/deprecated_modules/SMESHDS.py
deleted file mode 100644
index c8db12358..000000000
--- a/src/SWIG_files/deprecated_modules/SMESHDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SMESHDS is deprecated since pythonocc-0.18.2. Use OCC.Core.SMESHDS", DeprecationWarning)
-
-from OCC.Core.SMESHDS import *
diff --git a/src/SWIG_files/deprecated_modules/STEPCAFControl.py b/src/SWIG_files/deprecated_modules/STEPCAFControl.py
deleted file mode 100644
index 178271b20..000000000
--- a/src/SWIG_files/deprecated_modules/STEPCAFControl.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.STEPCAFControl is deprecated since pythonocc-0.18.2. Use OCC.Core.STEPCAFControl", DeprecationWarning)
-
-from OCC.Core.STEPCAFControl import *
diff --git a/src/SWIG_files/deprecated_modules/STEPConstruct.py b/src/SWIG_files/deprecated_modules/STEPConstruct.py
deleted file mode 100644
index 1751e8f33..000000000
--- a/src/SWIG_files/deprecated_modules/STEPConstruct.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.STEPConstruct is deprecated since pythonocc-0.18.2. Use OCC.Core.STEPConstruct", DeprecationWarning)
-
-from OCC.Core.STEPConstruct import *
diff --git a/src/SWIG_files/deprecated_modules/STEPControl.py b/src/SWIG_files/deprecated_modules/STEPControl.py
deleted file mode 100644
index fb562a009..000000000
--- a/src/SWIG_files/deprecated_modules/STEPControl.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.STEPControl is deprecated since pythonocc-0.18.2. Use OCC.Core.STEPControl", DeprecationWarning)
-
-from OCC.Core.STEPControl import *
diff --git a/src/SWIG_files/deprecated_modules/STEPEdit.py b/src/SWIG_files/deprecated_modules/STEPEdit.py
deleted file mode 100644
index 09a89a341..000000000
--- a/src/SWIG_files/deprecated_modules/STEPEdit.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.STEPEdit is deprecated since pythonocc-0.18.2. Use OCC.Core.STEPEdit", DeprecationWarning)
-
-from OCC.Core.STEPEdit import *
diff --git a/src/SWIG_files/deprecated_modules/STEPSelections.py b/src/SWIG_files/deprecated_modules/STEPSelections.py
deleted file mode 100644
index dddfca60e..000000000
--- a/src/SWIG_files/deprecated_modules/STEPSelections.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.STEPSelections is deprecated since pythonocc-0.18.2. Use OCC.Core.STEPSelections", DeprecationWarning)
-
-from OCC.Core.STEPSelections import *
diff --git a/src/SWIG_files/deprecated_modules/Select3D.py b/src/SWIG_files/deprecated_modules/Select3D.py
deleted file mode 100644
index 19bfb2181..000000000
--- a/src/SWIG_files/deprecated_modules/Select3D.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Select3D is deprecated since pythonocc-0.18.2. Use OCC.Core.Select3D", DeprecationWarning)
-
-from OCC.Core.Select3D import *
diff --git a/src/SWIG_files/deprecated_modules/SelectBasics.py b/src/SWIG_files/deprecated_modules/SelectBasics.py
deleted file mode 100644
index 4d58b7836..000000000
--- a/src/SWIG_files/deprecated_modules/SelectBasics.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SelectBasics is deprecated since pythonocc-0.18.2. Use OCC.Core.SelectBasics", DeprecationWarning)
-
-from OCC.Core.SelectBasics import *
diff --git a/src/SWIG_files/deprecated_modules/SelectMgr.py b/src/SWIG_files/deprecated_modules/SelectMgr.py
deleted file mode 100644
index d13feabd6..000000000
--- a/src/SWIG_files/deprecated_modules/SelectMgr.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SelectMgr is deprecated since pythonocc-0.18.2. Use OCC.Core.SelectMgr", DeprecationWarning)
-
-from OCC.Core.SelectMgr import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeAlgo.py b/src/SWIG_files/deprecated_modules/ShapeAlgo.py
deleted file mode 100644
index 7915df9e3..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeAlgo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeAlgo is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeAlgo", DeprecationWarning)
-
-from OCC.Core.ShapeAlgo import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeAnalysis.py b/src/SWIG_files/deprecated_modules/ShapeAnalysis.py
deleted file mode 100644
index 1ca0e1119..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeAnalysis.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeAnalysis is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeAnalysis", DeprecationWarning)
-
-from OCC.Core.ShapeAnalysis import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeBuild.py b/src/SWIG_files/deprecated_modules/ShapeBuild.py
deleted file mode 100644
index 86b7efd31..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeBuild.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeBuild is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeBuild", DeprecationWarning)
-
-from OCC.Core.ShapeBuild import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeConstruct.py b/src/SWIG_files/deprecated_modules/ShapeConstruct.py
deleted file mode 100644
index 2e9e99116..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeConstruct.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeConstruct is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeConstruct", DeprecationWarning)
-
-from OCC.Core.ShapeConstruct import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeCustom.py b/src/SWIG_files/deprecated_modules/ShapeCustom.py
deleted file mode 100644
index 187853f5e..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeCustom.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeCustom is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeCustom", DeprecationWarning)
-
-from OCC.Core.ShapeCustom import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeExtend.py b/src/SWIG_files/deprecated_modules/ShapeExtend.py
deleted file mode 100644
index c72b89298..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeExtend.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeExtend is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeExtend", DeprecationWarning)
-
-from OCC.Core.ShapeExtend import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeFix.py b/src/SWIG_files/deprecated_modules/ShapeFix.py
deleted file mode 100644
index 39d962cf8..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeFix.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeFix is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeFix", DeprecationWarning)
-
-from OCC.Core.ShapeFix import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeProcess.py b/src/SWIG_files/deprecated_modules/ShapeProcess.py
deleted file mode 100644
index f8fdf7892..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeProcess.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeProcess is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeProcess", DeprecationWarning)
-
-from OCC.Core.ShapeProcess import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeProcessAPI.py b/src/SWIG_files/deprecated_modules/ShapeProcessAPI.py
deleted file mode 100644
index ba003b260..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeProcessAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeProcessAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeProcessAPI", DeprecationWarning)
-
-from OCC.Core.ShapeProcessAPI import *
diff --git a/src/SWIG_files/deprecated_modules/ShapeUpgrade.py b/src/SWIG_files/deprecated_modules/ShapeUpgrade.py
deleted file mode 100644
index b856c2ef0..000000000
--- a/src/SWIG_files/deprecated_modules/ShapeUpgrade.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.ShapeUpgrade is deprecated since pythonocc-0.18.2. Use OCC.Core.ShapeUpgrade", DeprecationWarning)
-
-from OCC.Core.ShapeUpgrade import *
diff --git a/src/SWIG_files/deprecated_modules/SortTools.py b/src/SWIG_files/deprecated_modules/SortTools.py
deleted file mode 100644
index 80d53d787..000000000
--- a/src/SWIG_files/deprecated_modules/SortTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.SortTools is deprecated since pythonocc-0.18.2. Use OCC.Core.SortTools", DeprecationWarning)
-
-from OCC.Core.SortTools import *
diff --git a/src/SWIG_files/deprecated_modules/Standard.py b/src/SWIG_files/deprecated_modules/Standard.py
deleted file mode 100644
index d8e63d5ad..000000000
--- a/src/SWIG_files/deprecated_modules/Standard.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Standard is deprecated since pythonocc-0.18.2. Use OCC.Core.Standard", DeprecationWarning)
-
-from OCC.Core.Standard import *
diff --git a/src/SWIG_files/deprecated_modules/StdFail.py b/src/SWIG_files/deprecated_modules/StdFail.py
deleted file mode 100644
index 9e3c904d4..000000000
--- a/src/SWIG_files/deprecated_modules/StdFail.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StdFail is deprecated since pythonocc-0.18.2. Use OCC.Core.StdFail", DeprecationWarning)
-
-from OCC.Core.StdFail import *
diff --git a/src/SWIG_files/deprecated_modules/StdMeshers.py b/src/SWIG_files/deprecated_modules/StdMeshers.py
deleted file mode 100644
index 8691a1d18..000000000
--- a/src/SWIG_files/deprecated_modules/StdMeshers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StdMeshers is deprecated since pythonocc-0.18.2. Use OCC.Core.StdMeshers", DeprecationWarning)
-
-from OCC.Core.StdMeshers import *
diff --git a/src/SWIG_files/deprecated_modules/StdPrs.py b/src/SWIG_files/deprecated_modules/StdPrs.py
deleted file mode 100644
index 01c13c392..000000000
--- a/src/SWIG_files/deprecated_modules/StdPrs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StdPrs is deprecated since pythonocc-0.18.2. Use OCC.Core.StdPrs", DeprecationWarning)
-
-from OCC.Core.StdPrs import *
diff --git a/src/SWIG_files/deprecated_modules/StdSelect.py b/src/SWIG_files/deprecated_modules/StdSelect.py
deleted file mode 100644
index fcd6598b8..000000000
--- a/src/SWIG_files/deprecated_modules/StdSelect.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StdSelect is deprecated since pythonocc-0.18.2. Use OCC.Core.StdSelect", DeprecationWarning)
-
-from OCC.Core.StdSelect import *
diff --git a/src/SWIG_files/deprecated_modules/StepAP203.py b/src/SWIG_files/deprecated_modules/StepAP203.py
deleted file mode 100644
index c7aca8e88..000000000
--- a/src/SWIG_files/deprecated_modules/StepAP203.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepAP203 is deprecated since pythonocc-0.18.2. Use OCC.Core.StepAP203", DeprecationWarning)
-
-from OCC.Core.StepAP203 import *
diff --git a/src/SWIG_files/deprecated_modules/StepAP209.py b/src/SWIG_files/deprecated_modules/StepAP209.py
deleted file mode 100644
index 3cbeec8fd..000000000
--- a/src/SWIG_files/deprecated_modules/StepAP209.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepAP209 is deprecated since pythonocc-0.18.2. Use OCC.Core.StepAP209", DeprecationWarning)
-
-from OCC.Core.StepAP209 import *
diff --git a/src/SWIG_files/deprecated_modules/StepAP214.py b/src/SWIG_files/deprecated_modules/StepAP214.py
deleted file mode 100644
index 31237da7f..000000000
--- a/src/SWIG_files/deprecated_modules/StepAP214.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepAP214 is deprecated since pythonocc-0.18.2. Use OCC.Core.StepAP214", DeprecationWarning)
-
-from OCC.Core.StepAP214 import *
diff --git a/src/SWIG_files/deprecated_modules/StepBasic.py b/src/SWIG_files/deprecated_modules/StepBasic.py
deleted file mode 100644
index f94e5b125..000000000
--- a/src/SWIG_files/deprecated_modules/StepBasic.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepBasic is deprecated since pythonocc-0.18.2. Use OCC.Core.StepBasic", DeprecationWarning)
-
-from OCC.Core.StepBasic import *
diff --git a/src/SWIG_files/deprecated_modules/StepDimTol.py b/src/SWIG_files/deprecated_modules/StepDimTol.py
deleted file mode 100644
index bc229da1c..000000000
--- a/src/SWIG_files/deprecated_modules/StepDimTol.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepDimTol is deprecated since pythonocc-0.18.2. Use OCC.Core.StepDimTol", DeprecationWarning)
-
-from OCC.Core.StepDimTol import *
diff --git a/src/SWIG_files/deprecated_modules/StepElement.py b/src/SWIG_files/deprecated_modules/StepElement.py
deleted file mode 100644
index a925b83c2..000000000
--- a/src/SWIG_files/deprecated_modules/StepElement.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepElement is deprecated since pythonocc-0.18.2. Use OCC.Core.StepElement", DeprecationWarning)
-
-from OCC.Core.StepElement import *
diff --git a/src/SWIG_files/deprecated_modules/StepFEA.py b/src/SWIG_files/deprecated_modules/StepFEA.py
deleted file mode 100644
index 740d0275e..000000000
--- a/src/SWIG_files/deprecated_modules/StepFEA.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepFEA is deprecated since pythonocc-0.18.2. Use OCC.Core.StepFEA", DeprecationWarning)
-
-from OCC.Core.StepFEA import *
diff --git a/src/SWIG_files/deprecated_modules/StepGeom.py b/src/SWIG_files/deprecated_modules/StepGeom.py
deleted file mode 100644
index 4272dd8df..000000000
--- a/src/SWIG_files/deprecated_modules/StepGeom.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepGeom is deprecated since pythonocc-0.18.2. Use OCC.Core.StepGeom", DeprecationWarning)
-
-from OCC.Core.StepGeom import *
diff --git a/src/SWIG_files/deprecated_modules/StepRepr.py b/src/SWIG_files/deprecated_modules/StepRepr.py
deleted file mode 100644
index d1748af84..000000000
--- a/src/SWIG_files/deprecated_modules/StepRepr.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepRepr is deprecated since pythonocc-0.18.2. Use OCC.Core.StepRepr", DeprecationWarning)
-
-from OCC.Core.StepRepr import *
diff --git a/src/SWIG_files/deprecated_modules/StepShape.py b/src/SWIG_files/deprecated_modules/StepShape.py
deleted file mode 100644
index b0c4ed88f..000000000
--- a/src/SWIG_files/deprecated_modules/StepShape.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepShape is deprecated since pythonocc-0.18.2. Use OCC.Core.StepShape", DeprecationWarning)
-
-from OCC.Core.StepShape import *
diff --git a/src/SWIG_files/deprecated_modules/StepToGeom.py b/src/SWIG_files/deprecated_modules/StepToGeom.py
deleted file mode 100644
index 40664ae19..000000000
--- a/src/SWIG_files/deprecated_modules/StepToGeom.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepToGeom is deprecated since pythonocc-0.18.2. Use OCC.Core.StepToGeom", DeprecationWarning)
-
-from OCC.Core.StepToGeom import *
diff --git a/src/SWIG_files/deprecated_modules/StepToTopoDS.py b/src/SWIG_files/deprecated_modules/StepToTopoDS.py
deleted file mode 100644
index 15a88e0f5..000000000
--- a/src/SWIG_files/deprecated_modules/StepToTopoDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepToTopoDS is deprecated since pythonocc-0.18.2. Use OCC.Core.StepToTopoDS", DeprecationWarning)
-
-from OCC.Core.StepToTopoDS import *
diff --git a/src/SWIG_files/deprecated_modules/StepVisual.py b/src/SWIG_files/deprecated_modules/StepVisual.py
deleted file mode 100644
index d202c0450..000000000
--- a/src/SWIG_files/deprecated_modules/StepVisual.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StepVisual is deprecated since pythonocc-0.18.2. Use OCC.Core.StepVisual", DeprecationWarning)
-
-from OCC.Core.StepVisual import *
diff --git a/src/SWIG_files/deprecated_modules/StlAPI.py b/src/SWIG_files/deprecated_modules/StlAPI.py
deleted file mode 100644
index bd88d1200..000000000
--- a/src/SWIG_files/deprecated_modules/StlAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StlAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.StlAPI", DeprecationWarning)
-
-from OCC.Core.StlAPI import *
diff --git a/src/SWIG_files/deprecated_modules/StlMesh.py b/src/SWIG_files/deprecated_modules/StlMesh.py
deleted file mode 100644
index 2e90a47c5..000000000
--- a/src/SWIG_files/deprecated_modules/StlMesh.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StlMesh is deprecated since pythonocc-0.18.2. Use OCC.Core.StlMesh", DeprecationWarning)
-
-from OCC.Core.StlMesh import *
diff --git a/src/SWIG_files/deprecated_modules/StlTransfer.py b/src/SWIG_files/deprecated_modules/StlTransfer.py
deleted file mode 100644
index 261541a2b..000000000
--- a/src/SWIG_files/deprecated_modules/StlTransfer.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.StlTransfer is deprecated since pythonocc-0.18.2. Use OCC.Core.StlTransfer", DeprecationWarning)
-
-from OCC.Core.StlTransfer import *
diff --git a/src/SWIG_files/deprecated_modules/Storage.py b/src/SWIG_files/deprecated_modules/Storage.py
deleted file mode 100644
index fec489cda..000000000
--- a/src/SWIG_files/deprecated_modules/Storage.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Storage is deprecated since pythonocc-0.18.2. Use OCC.Core.Storage", DeprecationWarning)
-
-from OCC.Core.Storage import *
diff --git a/src/SWIG_files/deprecated_modules/Sweep.py b/src/SWIG_files/deprecated_modules/Sweep.py
deleted file mode 100644
index d9043c937..000000000
--- a/src/SWIG_files/deprecated_modules/Sweep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Sweep is deprecated since pythonocc-0.18.2. Use OCC.Core.Sweep", DeprecationWarning)
-
-from OCC.Core.Sweep import *
diff --git a/src/SWIG_files/deprecated_modules/TColGeom.py b/src/SWIG_files/deprecated_modules/TColGeom.py
deleted file mode 100644
index dc1c6e44e..000000000
--- a/src/SWIG_files/deprecated_modules/TColGeom.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TColGeom is deprecated since pythonocc-0.18.2. Use OCC.Core.TColGeom", DeprecationWarning)
-
-from OCC.Core.TColGeom import *
diff --git a/src/SWIG_files/deprecated_modules/TColGeom2d.py b/src/SWIG_files/deprecated_modules/TColGeom2d.py
deleted file mode 100644
index d04e35bac..000000000
--- a/src/SWIG_files/deprecated_modules/TColGeom2d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TColGeom2d is deprecated since pythonocc-0.18.2. Use OCC.Core.TColGeom2d", DeprecationWarning)
-
-from OCC.Core.TColGeom2d import *
diff --git a/src/SWIG_files/deprecated_modules/TColQuantity.py b/src/SWIG_files/deprecated_modules/TColQuantity.py
deleted file mode 100644
index f9f7b343a..000000000
--- a/src/SWIG_files/deprecated_modules/TColQuantity.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TColQuantity is deprecated since pythonocc-0.18.2. Use OCC.Core.TColQuantity", DeprecationWarning)
-
-from OCC.Core.TColQuantity import *
diff --git a/src/SWIG_files/deprecated_modules/TColStd.py b/src/SWIG_files/deprecated_modules/TColStd.py
deleted file mode 100644
index dad4bb646..000000000
--- a/src/SWIG_files/deprecated_modules/TColStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TColStd is deprecated since pythonocc-0.18.2. Use OCC.Core.TColStd", DeprecationWarning)
-
-from OCC.Core.TColStd import *
diff --git a/src/SWIG_files/deprecated_modules/TColgp.py b/src/SWIG_files/deprecated_modules/TColgp.py
deleted file mode 100644
index 3c7916d85..000000000
--- a/src/SWIG_files/deprecated_modules/TColgp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TColgp is deprecated since pythonocc-0.18.2. Use OCC.Core.TColgp", DeprecationWarning)
-
-from OCC.Core.TColgp import *
diff --git a/src/SWIG_files/deprecated_modules/TCollection.py b/src/SWIG_files/deprecated_modules/TCollection.py
deleted file mode 100644
index 89e6d4909..000000000
--- a/src/SWIG_files/deprecated_modules/TCollection.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TCollection is deprecated since pythonocc-0.18.2. Use OCC.Core.TCollection", DeprecationWarning)
-
-from OCC.Core.TCollection import *
diff --git a/src/SWIG_files/deprecated_modules/TDF.py b/src/SWIG_files/deprecated_modules/TDF.py
deleted file mode 100644
index 9e0d7c65e..000000000
--- a/src/SWIG_files/deprecated_modules/TDF.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TDF is deprecated since pythonocc-0.18.2. Use OCC.Core.TDF", DeprecationWarning)
-
-from OCC.Core.TDF import *
diff --git a/src/SWIG_files/deprecated_modules/TDataStd.py b/src/SWIG_files/deprecated_modules/TDataStd.py
deleted file mode 100644
index ddd6149df..000000000
--- a/src/SWIG_files/deprecated_modules/TDataStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TDataStd is deprecated since pythonocc-0.18.2. Use OCC.Core.TDataStd", DeprecationWarning)
-
-from OCC.Core.TDataStd import *
diff --git a/src/SWIG_files/deprecated_modules/TDataXtd.py b/src/SWIG_files/deprecated_modules/TDataXtd.py
deleted file mode 100644
index 133317c5a..000000000
--- a/src/SWIG_files/deprecated_modules/TDataXtd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TDataXtd is deprecated since pythonocc-0.18.2. Use OCC.Core.TDataXtd", DeprecationWarning)
-
-from OCC.Core.TDataXtd import *
diff --git a/src/SWIG_files/deprecated_modules/TDocStd.py b/src/SWIG_files/deprecated_modules/TDocStd.py
deleted file mode 100644
index 18866f1db..000000000
--- a/src/SWIG_files/deprecated_modules/TDocStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TDocStd is deprecated since pythonocc-0.18.2. Use OCC.Core.TDocStd", DeprecationWarning)
-
-from OCC.Core.TDocStd import *
diff --git a/src/SWIG_files/deprecated_modules/TFunction.py b/src/SWIG_files/deprecated_modules/TFunction.py
deleted file mode 100644
index 35a823d63..000000000
--- a/src/SWIG_files/deprecated_modules/TFunction.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TFunction is deprecated since pythonocc-0.18.2. Use OCC.Core.TFunction", DeprecationWarning)
-
-from OCC.Core.TFunction import *
diff --git a/src/SWIG_files/deprecated_modules/TNaming.py b/src/SWIG_files/deprecated_modules/TNaming.py
deleted file mode 100644
index 995f1c92f..000000000
--- a/src/SWIG_files/deprecated_modules/TNaming.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TNaming is deprecated since pythonocc-0.18.2. Use OCC.Core.TNaming", DeprecationWarning)
-
-from OCC.Core.TNaming import *
diff --git a/src/SWIG_files/deprecated_modules/TPrsStd.py b/src/SWIG_files/deprecated_modules/TPrsStd.py
deleted file mode 100644
index 72aa46ece..000000000
--- a/src/SWIG_files/deprecated_modules/TPrsStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TPrsStd is deprecated since pythonocc-0.18.2. Use OCC.Core.TPrsStd", DeprecationWarning)
-
-from OCC.Core.TPrsStd import *
diff --git a/src/SWIG_files/deprecated_modules/TShort.py b/src/SWIG_files/deprecated_modules/TShort.py
deleted file mode 100644
index 831ca3b89..000000000
--- a/src/SWIG_files/deprecated_modules/TShort.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TShort is deprecated since pythonocc-0.18.2. Use OCC.Core.TShort", DeprecationWarning)
-
-from OCC.Core.TShort import *
diff --git a/src/SWIG_files/deprecated_modules/TopAbs.py b/src/SWIG_files/deprecated_modules/TopAbs.py
deleted file mode 100644
index 5e70a2af2..000000000
--- a/src/SWIG_files/deprecated_modules/TopAbs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopAbs is deprecated since pythonocc-0.18.2. Use OCC.Core.TopAbs", DeprecationWarning)
-
-from OCC.Core.TopAbs import *
diff --git a/src/SWIG_files/deprecated_modules/TopBas.py b/src/SWIG_files/deprecated_modules/TopBas.py
deleted file mode 100644
index e6f8166ea..000000000
--- a/src/SWIG_files/deprecated_modules/TopBas.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopBas is deprecated since pythonocc-0.18.2. Use OCC.Core.TopBas", DeprecationWarning)
-
-from OCC.Core.TopBas import *
diff --git a/src/SWIG_files/deprecated_modules/TopClass.py b/src/SWIG_files/deprecated_modules/TopClass.py
deleted file mode 100644
index 4900dcedb..000000000
--- a/src/SWIG_files/deprecated_modules/TopClass.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopClass is deprecated since pythonocc-0.18.2. Use OCC.Core.TopClass", DeprecationWarning)
-
-from OCC.Core.TopClass import *
diff --git a/src/SWIG_files/deprecated_modules/TopCnx.py b/src/SWIG_files/deprecated_modules/TopCnx.py
deleted file mode 100644
index e1359934d..000000000
--- a/src/SWIG_files/deprecated_modules/TopCnx.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopCnx is deprecated since pythonocc-0.18.2. Use OCC.Core.TopCnx", DeprecationWarning)
-
-from OCC.Core.TopCnx import *
diff --git a/src/SWIG_files/deprecated_modules/TopExp.py b/src/SWIG_files/deprecated_modules/TopExp.py
deleted file mode 100644
index 14fee05a1..000000000
--- a/src/SWIG_files/deprecated_modules/TopExp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopExp is deprecated since pythonocc-0.18.2. Use OCC.Core.TopExp", DeprecationWarning)
-
-from OCC.Core.TopExp import *
diff --git a/src/SWIG_files/deprecated_modules/TopLoc.py b/src/SWIG_files/deprecated_modules/TopLoc.py
deleted file mode 100644
index 39ff75239..000000000
--- a/src/SWIG_files/deprecated_modules/TopLoc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopLoc is deprecated since pythonocc-0.18.2. Use OCC.Core.TopLoc", DeprecationWarning)
-
-from OCC.Core.TopLoc import *
diff --git a/src/SWIG_files/deprecated_modules/TopOpeBRep.py b/src/SWIG_files/deprecated_modules/TopOpeBRep.py
deleted file mode 100644
index 0ce6428be..000000000
--- a/src/SWIG_files/deprecated_modules/TopOpeBRep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopOpeBRep is deprecated since pythonocc-0.18.2. Use OCC.Core.TopOpeBRep", DeprecationWarning)
-
-from OCC.Core.TopOpeBRep import *
diff --git a/src/SWIG_files/deprecated_modules/TopOpeBRepBuild.py b/src/SWIG_files/deprecated_modules/TopOpeBRepBuild.py
deleted file mode 100644
index e1cd303e0..000000000
--- a/src/SWIG_files/deprecated_modules/TopOpeBRepBuild.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopOpeBRepBuild is deprecated since pythonocc-0.18.2. Use OCC.Core.TopOpeBRepBuild", DeprecationWarning)
-
-from OCC.Core.TopOpeBRepBuild import *
diff --git a/src/SWIG_files/deprecated_modules/TopOpeBRepDS.py b/src/SWIG_files/deprecated_modules/TopOpeBRepDS.py
deleted file mode 100644
index 26b07824a..000000000
--- a/src/SWIG_files/deprecated_modules/TopOpeBRepDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopOpeBRepDS is deprecated since pythonocc-0.18.2. Use OCC.Core.TopOpeBRepDS", DeprecationWarning)
-
-from OCC.Core.TopOpeBRepDS import *
diff --git a/src/SWIG_files/deprecated_modules/TopOpeBRepTool.py b/src/SWIG_files/deprecated_modules/TopOpeBRepTool.py
deleted file mode 100644
index 25bb9cde2..000000000
--- a/src/SWIG_files/deprecated_modules/TopOpeBRepTool.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopOpeBRepTool is deprecated since pythonocc-0.18.2. Use OCC.Core.TopOpeBRepTool", DeprecationWarning)
-
-from OCC.Core.TopOpeBRepTool import *
diff --git a/src/SWIG_files/deprecated_modules/TopTools.py b/src/SWIG_files/deprecated_modules/TopTools.py
deleted file mode 100644
index b34019fce..000000000
--- a/src/SWIG_files/deprecated_modules/TopTools.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopTools is deprecated since pythonocc-0.18.2. Use OCC.Core.TopTools", DeprecationWarning)
-
-from OCC.Core.TopTools import *
diff --git a/src/SWIG_files/deprecated_modules/TopTrans.py b/src/SWIG_files/deprecated_modules/TopTrans.py
deleted file mode 100644
index d42f937e0..000000000
--- a/src/SWIG_files/deprecated_modules/TopTrans.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopTrans is deprecated since pythonocc-0.18.2. Use OCC.Core.TopTrans", DeprecationWarning)
-
-from OCC.Core.TopTrans import *
diff --git a/src/SWIG_files/deprecated_modules/TopoDS.py b/src/SWIG_files/deprecated_modules/TopoDS.py
deleted file mode 100644
index 3ac304b91..000000000
--- a/src/SWIG_files/deprecated_modules/TopoDS.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopoDS is deprecated since pythonocc-0.18.2. Use OCC.Core.TopoDS", DeprecationWarning)
-
-from OCC.Core.TopoDS import *
diff --git a/src/SWIG_files/deprecated_modules/TopoDSToStep.py b/src/SWIG_files/deprecated_modules/TopoDSToStep.py
deleted file mode 100644
index 65efea3ac..000000000
--- a/src/SWIG_files/deprecated_modules/TopoDSToStep.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.TopoDSToStep is deprecated since pythonocc-0.18.2. Use OCC.Core.TopoDSToStep", DeprecationWarning)
-
-from OCC.Core.TopoDSToStep import *
diff --git a/src/SWIG_files/deprecated_modules/UTL.py b/src/SWIG_files/deprecated_modules/UTL.py
deleted file mode 100644
index c15e3349a..000000000
--- a/src/SWIG_files/deprecated_modules/UTL.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.UTL is deprecated since pythonocc-0.18.2. Use OCC.Core.UTL", DeprecationWarning)
-
-from OCC.Core.UTL import *
diff --git a/src/SWIG_files/deprecated_modules/Units.py b/src/SWIG_files/deprecated_modules/Units.py
deleted file mode 100644
index 13d15faff..000000000
--- a/src/SWIG_files/deprecated_modules/Units.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Units is deprecated since pythonocc-0.18.2. Use OCC.Core.Units", DeprecationWarning)
-
-from OCC.Core.Units import *
diff --git a/src/SWIG_files/deprecated_modules/UnitsAPI.py b/src/SWIG_files/deprecated_modules/UnitsAPI.py
deleted file mode 100644
index 9e6880769..000000000
--- a/src/SWIG_files/deprecated_modules/UnitsAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.UnitsAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.UnitsAPI", DeprecationWarning)
-
-from OCC.Core.UnitsAPI import *
diff --git a/src/SWIG_files/deprecated_modules/V3d.py b/src/SWIG_files/deprecated_modules/V3d.py
deleted file mode 100644
index 014318621..000000000
--- a/src/SWIG_files/deprecated_modules/V3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.V3d is deprecated since pythonocc-0.18.2. Use OCC.Core.V3d", DeprecationWarning)
-
-from OCC.Core.V3d import *
diff --git a/src/SWIG_files/deprecated_modules/Visual3d.py b/src/SWIG_files/deprecated_modules/Visual3d.py
deleted file mode 100644
index b01db3db0..000000000
--- a/src/SWIG_files/deprecated_modules/Visual3d.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Visual3d is deprecated since pythonocc-0.18.2. Use OCC.Core.Visual3d", DeprecationWarning)
-
-from OCC.Core.Visual3d import *
diff --git a/src/SWIG_files/deprecated_modules/Voxel.py b/src/SWIG_files/deprecated_modules/Voxel.py
deleted file mode 100644
index e204b14bf..000000000
--- a/src/SWIG_files/deprecated_modules/Voxel.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Voxel is deprecated since pythonocc-0.18.2. Use OCC.Core.Voxel", DeprecationWarning)
-
-from OCC.Core.Voxel import *
diff --git a/src/SWIG_files/deprecated_modules/Vrml.py b/src/SWIG_files/deprecated_modules/Vrml.py
deleted file mode 100644
index 0f7ce4818..000000000
--- a/src/SWIG_files/deprecated_modules/Vrml.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.Vrml is deprecated since pythonocc-0.18.2. Use OCC.Core.Vrml", DeprecationWarning)
-
-from OCC.Core.Vrml import *
diff --git a/src/SWIG_files/deprecated_modules/VrmlAPI.py b/src/SWIG_files/deprecated_modules/VrmlAPI.py
deleted file mode 100644
index 9de57ee42..000000000
--- a/src/SWIG_files/deprecated_modules/VrmlAPI.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.VrmlAPI is deprecated since pythonocc-0.18.2. Use OCC.Core.VrmlAPI", DeprecationWarning)
-
-from OCC.Core.VrmlAPI import *
diff --git a/src/SWIG_files/deprecated_modules/VrmlConverter.py b/src/SWIG_files/deprecated_modules/VrmlConverter.py
deleted file mode 100644
index a4dd6a99c..000000000
--- a/src/SWIG_files/deprecated_modules/VrmlConverter.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.VrmlConverter is deprecated since pythonocc-0.18.2. Use OCC.Core.VrmlConverter", DeprecationWarning)
-
-from OCC.Core.VrmlConverter import *
diff --git a/src/SWIG_files/deprecated_modules/VrmlData.py b/src/SWIG_files/deprecated_modules/VrmlData.py
deleted file mode 100644
index 8016e0163..000000000
--- a/src/SWIG_files/deprecated_modules/VrmlData.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.VrmlData is deprecated since pythonocc-0.18.2. Use OCC.Core.VrmlData", DeprecationWarning)
-
-from OCC.Core.VrmlData import *
diff --git a/src/SWIG_files/deprecated_modules/XBRepMesh.py b/src/SWIG_files/deprecated_modules/XBRepMesh.py
deleted file mode 100644
index 51167f666..000000000
--- a/src/SWIG_files/deprecated_modules/XBRepMesh.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XBRepMesh is deprecated since pythonocc-0.18.2. Use OCC.Core.XBRepMesh", DeprecationWarning)
-
-from OCC.Core.XBRepMesh import *
diff --git a/src/SWIG_files/deprecated_modules/XCAFApp.py b/src/SWIG_files/deprecated_modules/XCAFApp.py
deleted file mode 100644
index 05edb9d25..000000000
--- a/src/SWIG_files/deprecated_modules/XCAFApp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XCAFApp is deprecated since pythonocc-0.18.2. Use OCC.Core.XCAFApp", DeprecationWarning)
-
-from OCC.Core.XCAFApp import *
diff --git a/src/SWIG_files/deprecated_modules/XCAFDoc.py b/src/SWIG_files/deprecated_modules/XCAFDoc.py
deleted file mode 100644
index c8ec4421f..000000000
--- a/src/SWIG_files/deprecated_modules/XCAFDoc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XCAFDoc is deprecated since pythonocc-0.18.2. Use OCC.Core.XCAFDoc", DeprecationWarning)
-
-from OCC.Core.XCAFDoc import *
diff --git a/src/SWIG_files/deprecated_modules/XCAFPrs.py b/src/SWIG_files/deprecated_modules/XCAFPrs.py
deleted file mode 100644
index 532a0a102..000000000
--- a/src/SWIG_files/deprecated_modules/XCAFPrs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XCAFPrs is deprecated since pythonocc-0.18.2. Use OCC.Core.XCAFPrs", DeprecationWarning)
-
-from OCC.Core.XCAFPrs import *
diff --git a/src/SWIG_files/deprecated_modules/XSControl.py b/src/SWIG_files/deprecated_modules/XSControl.py
deleted file mode 100644
index dea21d523..000000000
--- a/src/SWIG_files/deprecated_modules/XSControl.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XSControl is deprecated since pythonocc-0.18.2. Use OCC.Core.XSControl", DeprecationWarning)
-
-from OCC.Core.XSControl import *
diff --git a/src/SWIG_files/deprecated_modules/XmlDrivers.py b/src/SWIG_files/deprecated_modules/XmlDrivers.py
deleted file mode 100644
index bdff7e5d4..000000000
--- a/src/SWIG_files/deprecated_modules/XmlDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlDrivers", DeprecationWarning)
-
-from OCC.Core.XmlDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/XmlLDrivers.py b/src/SWIG_files/deprecated_modules/XmlLDrivers.py
deleted file mode 100644
index 65acb1426..000000000
--- a/src/SWIG_files/deprecated_modules/XmlLDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlLDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlLDrivers", DeprecationWarning)
-
-from OCC.Core.XmlLDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMDF.py b/src/SWIG_files/deprecated_modules/XmlMDF.py
deleted file mode 100644
index 1ed4fc5d0..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMDF.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMDF is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMDF", DeprecationWarning)
-
-from OCC.Core.XmlMDF import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMDataStd.py b/src/SWIG_files/deprecated_modules/XmlMDataStd.py
deleted file mode 100644
index 4017a450f..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMDataStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMDataStd is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMDataStd", DeprecationWarning)
-
-from OCC.Core.XmlMDataStd import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMDataXtd.py b/src/SWIG_files/deprecated_modules/XmlMDataXtd.py
deleted file mode 100644
index 8d6f0eb4b..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMDataXtd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMDataXtd is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMDataXtd", DeprecationWarning)
-
-from OCC.Core.XmlMDataXtd import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMDocStd.py b/src/SWIG_files/deprecated_modules/XmlMDocStd.py
deleted file mode 100644
index ce1b68996..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMDocStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMDocStd is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMDocStd", DeprecationWarning)
-
-from OCC.Core.XmlMDocStd import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMFunction.py b/src/SWIG_files/deprecated_modules/XmlMFunction.py
deleted file mode 100644
index 8e50ef64c..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMFunction.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMFunction is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMFunction", DeprecationWarning)
-
-from OCC.Core.XmlMFunction import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMNaming.py b/src/SWIG_files/deprecated_modules/XmlMNaming.py
deleted file mode 100644
index 580a22c81..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMNaming.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMNaming is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMNaming", DeprecationWarning)
-
-from OCC.Core.XmlMNaming import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMPrsStd.py b/src/SWIG_files/deprecated_modules/XmlMPrsStd.py
deleted file mode 100644
index 1caa4b8ac..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMPrsStd.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMPrsStd is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMPrsStd", DeprecationWarning)
-
-from OCC.Core.XmlMPrsStd import *
diff --git a/src/SWIG_files/deprecated_modules/XmlMXCAFDoc.py b/src/SWIG_files/deprecated_modules/XmlMXCAFDoc.py
deleted file mode 100644
index 77ae99615..000000000
--- a/src/SWIG_files/deprecated_modules/XmlMXCAFDoc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlMXCAFDoc is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlMXCAFDoc", DeprecationWarning)
-
-from OCC.Core.XmlMXCAFDoc import *
diff --git a/src/SWIG_files/deprecated_modules/XmlObjMgt.py b/src/SWIG_files/deprecated_modules/XmlObjMgt.py
deleted file mode 100644
index d0e42cc76..000000000
--- a/src/SWIG_files/deprecated_modules/XmlObjMgt.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlObjMgt is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlObjMgt", DeprecationWarning)
-
-from OCC.Core.XmlObjMgt import *
diff --git a/src/SWIG_files/deprecated_modules/XmlTObjDrivers.py b/src/SWIG_files/deprecated_modules/XmlTObjDrivers.py
deleted file mode 100644
index 4764d2d8c..000000000
--- a/src/SWIG_files/deprecated_modules/XmlTObjDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlTObjDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlTObjDrivers", DeprecationWarning)
-
-from OCC.Core.XmlTObjDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/XmlXCAFDrivers.py b/src/SWIG_files/deprecated_modules/XmlXCAFDrivers.py
deleted file mode 100644
index f63c7a94b..000000000
--- a/src/SWIG_files/deprecated_modules/XmlXCAFDrivers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.XmlXCAFDrivers is deprecated since pythonocc-0.18.2. Use OCC.Core.XmlXCAFDrivers", DeprecationWarning)
-
-from OCC.Core.XmlXCAFDrivers import *
diff --git a/src/SWIG_files/deprecated_modules/gce.py b/src/SWIG_files/deprecated_modules/gce.py
deleted file mode 100644
index bd2b990c4..000000000
--- a/src/SWIG_files/deprecated_modules/gce.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.gce is deprecated since pythonocc-0.18.2. Use OCC.Core.gce", DeprecationWarning)
-
-from OCC.Core.gce import *
diff --git a/src/SWIG_files/deprecated_modules/gp.py b/src/SWIG_files/deprecated_modules/gp.py
deleted file mode 100644
index 411112564..000000000
--- a/src/SWIG_files/deprecated_modules/gp.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.gp is deprecated since pythonocc-0.18.2. Use OCC.Core.gp", DeprecationWarning)
-
-from OCC.Core.gp import *
diff --git a/src/SWIG_files/deprecated_modules/math.py b/src/SWIG_files/deprecated_modules/math.py
deleted file mode 100644
index 31f078c87..000000000
--- a/src/SWIG_files/deprecated_modules/math.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-warnings.simplefilter('once', DeprecationWarning)
-warnings.warn("OCC.math is deprecated since pythonocc-0.18.2. Use OCC.Core.math", DeprecationWarning)
-
-from OCC.Core.math import *
diff --git a/src/SWIG_files/headers/AIS_module.hxx b/src/SWIG_files/headers/AIS_module.hxx
new file mode 100644
index 000000000..942d53616
--- /dev/null
+++ b/src/SWIG_files/headers/AIS_module.hxx
@@ -0,0 +1,130 @@
+#ifndef AIS_HXX
+#define AIS_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // AIS_HXX
diff --git a/src/SWIG_files/headers/Adaptor2d_module.hxx b/src/SWIG_files/headers/Adaptor2d_module.hxx
new file mode 100644
index 000000000..3fc526273
--- /dev/null
+++ b/src/SWIG_files/headers/Adaptor2d_module.hxx
@@ -0,0 +1,29 @@
+#ifndef ADAPTOR2D_HXX
+#define ADAPTOR2D_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // ADAPTOR2D_HXX
diff --git a/src/SWIG_files/headers/Adaptor3d_module.hxx b/src/SWIG_files/headers/Adaptor3d_module.hxx
new file mode 100644
index 000000000..feb5bade1
--- /dev/null
+++ b/src/SWIG_files/headers/Adaptor3d_module.hxx
@@ -0,0 +1,38 @@
+#ifndef ADAPTOR3D_HXX
+#define ADAPTOR3D_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // ADAPTOR3D_HXX
diff --git a/src/SWIG_files/headers/AdvApp2Var_module.hxx b/src/SWIG_files/headers/AdvApp2Var_module.hxx
new file mode 100644
index 000000000..2291317a7
--- /dev/null
+++ b/src/SWIG_files/headers/AdvApp2Var_module.hxx
@@ -0,0 +1,43 @@
+#ifndef ADVAPP2VAR_HXX
+#define ADVAPP2VAR_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // ADVAPP2VAR_HXX
diff --git a/src/SWIG_files/headers/AdvApprox_module.hxx b/src/SWIG_files/headers/AdvApprox_module.hxx
new file mode 100644
index 000000000..9d8b32684
--- /dev/null
+++ b/src/SWIG_files/headers/AdvApprox_module.hxx
@@ -0,0 +1,30 @@
+#ifndef ADVAPPROX_HXX
+#define ADVAPPROX_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // ADVAPPROX_HXX
diff --git a/src/SWIG_files/headers/AppBlend_module.hxx b/src/SWIG_files/headers/AppBlend_module.hxx
new file mode 100644
index 000000000..efc31dd41
--- /dev/null
+++ b/src/SWIG_files/headers/AppBlend_module.hxx
@@ -0,0 +1,24 @@
+#ifndef APPBLEND_HXX
+#define APPBLEND_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+
+#endif // APPBLEND_HXX
diff --git a/src/SWIG_files/headers/AppCont_module.hxx b/src/SWIG_files/headers/AppCont_module.hxx
new file mode 100644
index 000000000..effd78929
--- /dev/null
+++ b/src/SWIG_files/headers/AppCont_module.hxx
@@ -0,0 +1,26 @@
+#ifndef APPCONT_HXX
+#define APPCONT_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+
+#endif // APPCONT_HXX
diff --git a/src/SWIG_files/headers/AppDef_module.hxx b/src/SWIG_files/headers/AppDef_module.hxx
new file mode 100644
index 000000000..fc9aefd8c
--- /dev/null
+++ b/src/SWIG_files/headers/AppDef_module.hxx
@@ -0,0 +1,55 @@
+#ifndef APPDEF_HXX
+#define APPDEF_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // APPDEF_HXX
diff --git a/src/SWIG_files/headers/AppParCurves_module.hxx b/src/SWIG_files/headers/AppParCurves_module.hxx
new file mode 100644
index 000000000..9533887eb
--- /dev/null
+++ b/src/SWIG_files/headers/AppParCurves_module.hxx
@@ -0,0 +1,39 @@
+#ifndef APPPARCURVES_HXX
+#define APPPARCURVES_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#endif // APPPARCURVES_HXX
diff --git a/src/SWIG_files/headers/AppStdL_module.hxx b/src/SWIG_files/headers/AppStdL_module.hxx
new file mode 100644
index 000000000..d9eb033dd
--- /dev/null
+++ b/src/SWIG_files/headers/AppStdL_module.hxx
@@ -0,0 +1,24 @@
+#ifndef APPSTDL_HXX
+#define APPSTDL_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+
+#endif // APPSTDL_HXX
diff --git a/src/SWIG_files/headers/AppStd_module.hxx b/src/SWIG_files/headers/AppStd_module.hxx
new file mode 100644
index 000000000..fc77510a3
--- /dev/null
+++ b/src/SWIG_files/headers/AppStd_module.hxx
@@ -0,0 +1,24 @@
+#ifndef APPSTD_HXX
+#define APPSTD_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+
+#endif // APPSTD_HXX
diff --git a/src/SWIG_files/headers/ApproxInt_module.hxx b/src/SWIG_files/headers/ApproxInt_module.hxx
new file mode 100644
index 000000000..2ad8c44a1
--- /dev/null
+++ b/src/SWIG_files/headers/ApproxInt_module.hxx
@@ -0,0 +1,25 @@
+#ifndef APPROXINT_HXX
+#define APPROXINT_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see .
+*/
+
+#include
+#include
+
+#endif // APPROXINT_HXX
diff --git a/src/SWIG_files/headers/Approx_module.hxx b/src/SWIG_files/headers/Approx_module.hxx
new file mode 100644
index 000000000..6de3e0612
--- /dev/null
+++ b/src/SWIG_files/headers/Approx_module.hxx
@@ -0,0 +1,41 @@
+#ifndef APPROX_HXX
+#define APPROX_HXX
+
+/*
+Copyright 2008-2019 Thomas Paviot (tpaviot@gmail.com)
+
+This file is part of pythonOCC.
+pythonOCC is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+pythonOCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with pythonOCC. If not, see