mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-19 13:40:49 +03:00
Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
677a6d68cd |
@@ -1,40 +0,0 @@
|
||||
# This workflow will build OCCT on Ubuntu with Clang compiler
|
||||
# using the provided Docker image with Clang tools.
|
||||
#
|
||||
# Notes:
|
||||
# freetype is disabled
|
||||
# samples are not built
|
||||
|
||||
name: Build OCCT on Linux with Clang x64 dynamic
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '**'
|
||||
|
||||
jobs:
|
||||
build-linux-clang:
|
||||
name: Build on Ubuntu with Clang
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4.1.7
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y tcl-dev tk-dev cmake clang make libbtbb-dev libx11-dev libglu1-mesa-dev
|
||||
|
||||
- name: Configure OCCT
|
||||
run: |
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake -G "Unix Makefiles" \
|
||||
-D CMAKE_C_COMPILER=clang \
|
||||
-D CMAKE_CXX_COMPILER=clang++ \
|
||||
-D USE_FREETYPE=OFF \
|
||||
-D CMAKE_BUILD_TYPE=Release ..
|
||||
|
||||
- name: Build OCCT
|
||||
run: |
|
||||
cd build
|
||||
make -j$(nproc)
|
@@ -1,42 +0,0 @@
|
||||
# This workflow will build OCCT on Linux with GCC x64 dynamic
|
||||
# using the provided Docker image with GCC tools.
|
||||
#
|
||||
# Notes:
|
||||
# freetype is disabled
|
||||
# samples are not built
|
||||
|
||||
name: Build OCCT on Linux with GCC x64 dynamic
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '**'
|
||||
|
||||
jobs:
|
||||
build-linux-gcc:
|
||||
name: Build on Ubuntu with GCC
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4.1.7
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y tcl-dev tk-dev cmake gcc g++ make libbtbb-dev libx11-dev libglu1-mesa-dev
|
||||
|
||||
- name: Configure OCCT
|
||||
run: |
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake -G "Unix Makefiles" \
|
||||
-D CMAKE_C_COMPILER=gcc \
|
||||
-D CMAKE_CXX_COMPILER=g++ \
|
||||
-D USE_FREETYPE=OFF \
|
||||
-D CMAKE_BUILD_TYPE=Release \
|
||||
-D CMAKE_C_FLAGS="-Werror" \
|
||||
-D CMAKE_CXX_FLAGS="-Werror" ..
|
||||
|
||||
- name: Build OCCT
|
||||
run: |
|
||||
cd build
|
||||
make -j$(nproc)
|
@@ -1,43 +0,0 @@
|
||||
# This workflow builds OCCT on macOS with Clang x64 dynamic.
|
||||
#
|
||||
# Notes:
|
||||
# freetype is disabled
|
||||
# samples are not built
|
||||
|
||||
name: Build OCCT on macOS with Clang x64 dynamic
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '**'
|
||||
|
||||
jobs:
|
||||
build-macos-clang:
|
||||
name: Build on macOS with Clang
|
||||
runs-on: macos-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4.1.7
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew update
|
||||
brew install tcl-tk tbb gl2ps xerces-c \
|
||||
libxmu libxi libxft libxpm \
|
||||
glew
|
||||
|
||||
- name: Configure OCCT
|
||||
run: |
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake -G "Unix Makefiles" \
|
||||
-D CMAKE_C_COMPILER=clang \
|
||||
-D CMAKE_CXX_COMPILER=clang++ \
|
||||
-D USE_FREETYPE=OFF \
|
||||
-D CMAKE_BUILD_TYPE=Release ..
|
||||
|
||||
- name: Build OCCT
|
||||
run: |
|
||||
cd build
|
||||
make -j$(sysctl -n hw.logicalcpu)
|
@@ -1,44 +0,0 @@
|
||||
# This workflow will build OCCT on Windows with MSVC x64 in dynamic mode
|
||||
# using the provided Docker image with MSVC tools.
|
||||
#
|
||||
# Notes:
|
||||
# freetype is disabled
|
||||
# Draw module is disabled
|
||||
# samples are not built
|
||||
|
||||
name: Build OCCT on Windows with MSVC x64 dynamic
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '**'
|
||||
|
||||
jobs:
|
||||
build-windows-msvc:
|
||||
name: Build on Windows with MSVC
|
||||
runs-on: windows-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4.1.7
|
||||
|
||||
- name: Set up MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1.13.0
|
||||
with:
|
||||
arch: x64
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
|
||||
choco install magicsplat-tcl-tk -y
|
||||
|
||||
- name: Configure OCCT
|
||||
run: |
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -T host=x64 -D USE_FREETYPE=OFF -D BUILD_MODULE_Draw=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_C_FLAGS="/WX" -D CMAKE_CXX_FLAGS="/WX" ..
|
||||
|
||||
- name: Build OCCT
|
||||
run: |
|
||||
cd build
|
||||
cmake --build . --config Release -- /m
|
62
.github/workflows/codemsvc.yml
vendored
62
.github/workflows/codemsvc.yml
vendored
@@ -1,62 +0,0 @@
|
||||
# Security scanning with Microsoft C++ Code Analysis.
|
||||
# Checks any master integration and publish warnings into security GitHub tab.
|
||||
#
|
||||
# Find more information at:
|
||||
# https://github.com/microsoft/msvc-code-analysis-action
|
||||
|
||||
name: Microsoft C++ Code Analysis
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
|
||||
env:
|
||||
# Path to the CMake build directory.
|
||||
build: '${{ github.workspace }}/build'
|
||||
config: 'Debug'
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
permissions:
|
||||
contents: read # for actions/checkout to fetch code
|
||||
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
|
||||
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
|
||||
name: Analyze
|
||||
runs-on: windows-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4.1.7
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
|
||||
choco install magicsplat-tcl-tk -y
|
||||
|
||||
- name: Configure CMake
|
||||
run: |
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -D USE_FREETYPE=OFF -DCMAKE_BUILD_TYPE=${{ env.config }} ..
|
||||
|
||||
- name: Run MSVC Code Analysis
|
||||
uses: microsoft/msvc-code-analysis-action@v0.1.1
|
||||
# Provide a unique ID to access the sarif output path
|
||||
id: run-analysis
|
||||
with:
|
||||
cmakeBuildDirectory: ${{ env.build }}
|
||||
buildConfiguration: ${{ env.config }}
|
||||
# Ruleset file that will determine what checks will be run
|
||||
ruleset: NativeRecommendedRules.ruleset
|
||||
# Paths to ignore analysis of CMake targets and includes
|
||||
# ignoredPaths: ${{ github.workspace }}/dependencies;${{ github.workspace }}/test
|
||||
|
||||
# Upload SARIF file to GitHub Code Scanning Alerts
|
||||
- name: Upload SARIF to GitHub
|
||||
uses: github/codeql-action/upload-sarif@v3.26.5
|
||||
with:
|
||||
sarif_file: ${{ steps.run-analysis.outputs.sarif }}
|
60
.github/workflows/codeql.yml
vendored
60
.github/workflows/codeql.yml
vendored
@@ -1,60 +0,0 @@
|
||||
# Security scanning with CodeQL.
|
||||
# Checks any master integration and publish warnings into security GitHub tab.
|
||||
#
|
||||
# Find more information at:
|
||||
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/about-code-scanning
|
||||
|
||||
name: CodeQL Code Analysis
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze (${{ matrix.language }})
|
||||
runs-on: ${{ 'ubuntu-latest' }}
|
||||
permissions:
|
||||
# required for all workflows
|
||||
security-events: write
|
||||
|
||||
# required to fetch internal or private CodeQL packs
|
||||
packages: read
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- language: c-cpp
|
||||
build-mode: manual
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4.1.7
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y tcl-dev tk-dev cmake gcc g++ make libbtbb-dev libx11-dev libglu1-mesa-dev
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v3.26.5
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
build-mode: ${{ matrix.build-mode }}
|
||||
|
||||
- if: matrix.build-mode == 'manual'
|
||||
shell: bash
|
||||
run: |
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake -G "Unix Makefiles" \
|
||||
-D CMAKE_C_COMPILER=gcc \
|
||||
-D CMAKE_CXX_COMPILER=g++ \
|
||||
-D USE_FREETYPE=OFF \
|
||||
-D CMAKE_BUILD_TYPE=Release ..
|
||||
make -j$(nproc)
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v3.26.5
|
||||
with:
|
||||
category: "/language:${{matrix.language}}"
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,7 +1,6 @@
|
||||
|
||||
# standard directories for derived files in CASROOT
|
||||
/.adm
|
||||
/.vscode
|
||||
/lin
|
||||
/mac
|
||||
/wnt
|
||||
|
@@ -19,7 +19,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
||||
# include occt macros. compiler_bitness, os_wiht_bit, compiler
|
||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
|
||||
|
||||
# specify product folder in connection with 3RDPARTY_DIR
|
||||
# specify product folder in connectin with 3RDPARTY_DIR
|
||||
if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
|
||||
#CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_${PRODUCT_NAME}_DIR PATH "The directory containing ${PRODUCT_NAME}")
|
||||
|
||||
|
@@ -12,7 +12,7 @@ if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
|
||||
endif()
|
||||
|
||||
# Add paths to 3rdparty subfolders containing name "bison" to CMAKE_PROGRAM_PATH variable to make
|
||||
# these paths searched by find_package
|
||||
# these paths searhed by find_package
|
||||
if (3RDPARTY_DIR)
|
||||
file (GLOB BISON_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*bison*/")
|
||||
foreach (candidate_path ${BISON_PATHS})
|
||||
|
@@ -2580,7 +2580,7 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
|
||||
message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
|
||||
endif()
|
||||
# because CMake PRE_BUILD command does not support dependencies,
|
||||
# we check dependencies explicitly in cotire script mode when the pre-build action is run
|
||||
# we check dependencies explicity in cotire script mode when the pre-build action is run
|
||||
add_custom_command(
|
||||
TARGET "${_target}"
|
||||
PRE_BUILD ${_cmds}
|
||||
@@ -2637,7 +2637,7 @@ function (cotire_setup_unity_generation_commands _language _target _targetScript
|
||||
endif()
|
||||
if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
|
||||
# unity file compilation results in potentially huge object file,
|
||||
# thus use /bigobj by default under cl.exe and Windows Intel
|
||||
# thus use /bigobj by default unter cl.exe and Windows Intel
|
||||
set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
|
||||
endif()
|
||||
cotire_set_cmd_to_prologue(_unityCmd)
|
||||
|
@@ -15,7 +15,7 @@ if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
|
||||
endif()
|
||||
|
||||
# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and
|
||||
# CMAKE_INCLUDE_PATH variables to make these paths searched by find_package
|
||||
# CMAKE_INCLUDE_PATH variables to make these paths searhed by find_package
|
||||
if (3RDPARTY_DIR)
|
||||
file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
|
||||
foreach (candidate_path ${FLEX_PATHS})
|
||||
|
@@ -14,7 +14,7 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
|
||||
OCCT_MAKE_COMPILER_SHORT_NAME()
|
||||
OCCT_MAKE_COMPILER_BITNESS()
|
||||
|
||||
# specify freetype folder in connection with 3RDPARTY_DIR
|
||||
# specify freetype folder in connectin with 3RDPARTY_DIR
|
||||
if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
|
||||
#CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_FREETYPE_DIR PATH "The directory containing freetype")
|
||||
|
||||
|
@@ -168,7 +168,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
|
||||
set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
|
||||
endif()
|
||||
# Optimize size of binaries
|
||||
set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
|
||||
set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
|
||||
elseif(MINGW)
|
||||
add_definitions(-D_WIN32_WINNT=0x0601)
|
||||
# _WIN32_WINNT=0x0601 (use Windows 7 SDK)
|
||||
|
@@ -479,8 +479,8 @@ if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
|
||||
if(IS_VTK_9XX)
|
||||
string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
|
||||
endif()
|
||||
target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
||||
endif()
|
||||
target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
||||
|
||||
if (USE_QT)
|
||||
foreach (PROJECT_LIBRARY_DEBUG ${PROJECT_LIBRARIES_DEBUG})
|
||||
|
@@ -27,7 +27,7 @@ if (WIN32)
|
||||
|
||||
# Below, we have correct 3RDPARTY_DIR.
|
||||
|
||||
# Initialize TBB folder in connection with 3RDPARTY_DIR.
|
||||
# Initialize TBB folder in connectin with 3RDPARTY_DIR.
|
||||
if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
|
||||
FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
|
||||
if (TBB_DIR_NAME)
|
||||
@@ -44,7 +44,7 @@ if (WIN32)
|
||||
REQUIRED
|
||||
CONFIG)
|
||||
|
||||
# Archive include directory
|
||||
# Achive include directory
|
||||
get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
|
||||
if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
|
||||
set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
|
||||
@@ -56,17 +56,13 @@ if (WIN32)
|
||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
|
||||
endif()
|
||||
|
||||
# Get installed configuration of tbb
|
||||
get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
|
||||
list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
|
||||
|
||||
separate_arguments (CSF_TBB)
|
||||
foreach (LIB IN LISTS CSF_TBB)
|
||||
string(TOLOWER "${LIB}" LIB_LOWER)
|
||||
string(TOUPPER "${LIB}" LIB_UPPER)
|
||||
|
||||
# Archive *.lib files and directory containing it.
|
||||
get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
|
||||
# Achive *.lib files and directory containing it.
|
||||
get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
|
||||
# Reserve cache variable for *.lib.
|
||||
if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
|
||||
set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
|
||||
@@ -92,8 +88,8 @@ if (WIN32)
|
||||
list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
|
||||
endif()
|
||||
|
||||
# Archive *.dll files and directory containing it.
|
||||
get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
|
||||
# Achive *.dll files and directory containing it.
|
||||
get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
|
||||
# Reserve cache variable for *.dll.
|
||||
if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
|
||||
set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
|
||||
@@ -175,9 +171,9 @@ else ()
|
||||
REQUIRED
|
||||
CONFIG)
|
||||
endif()
|
||||
# TBB has been configured (in other case FATAL_ERROR occurs).
|
||||
# TBB has been configured (in other case FATAL_ERROR occures).
|
||||
|
||||
# Archive include directory.
|
||||
# Achive include directory.
|
||||
get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
|
||||
if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
|
||||
set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
|
||||
@@ -189,17 +185,13 @@ else ()
|
||||
list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
|
||||
endif()
|
||||
|
||||
# Get installed configuration of tbb
|
||||
get_target_property (TARGET_TBB_IMPORT_CONFS TBB::tbb IMPORTED_CONFIGURATIONS)
|
||||
list (GET TARGET_TBB_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
|
||||
|
||||
separate_arguments (CSF_TBB)
|
||||
foreach (LIB IN LISTS CSF_TBB)
|
||||
string(TOLOWER "${LIB}" LIB_LOWER)
|
||||
string(TOUPPER "${LIB}" LIB_UPPER)
|
||||
|
||||
# Archive *.so files and directory containing it.
|
||||
get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
|
||||
# Achive *.so files and directory containing it.
|
||||
get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
|
||||
# Reserve cache variable for *.so.
|
||||
if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
|
||||
set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
|
||||
|
@@ -405,7 +405,7 @@ proc Rename {thePath theExtensions theNewNames theCheckMode} {
|
||||
}
|
||||
}
|
||||
|
||||
# @thePackagePath either file or folder. If it is a folder,
|
||||
# @thePackagePath eather file or folder. If it is a folder,
|
||||
# all files with @theHeaderExtensions are processed.
|
||||
# "fwd.tcollection" section from upgrade.ini file is used to find out what
|
||||
# classes have been converted and, thus, what forward declarations can be replaced
|
||||
|
@@ -370,7 +370,7 @@ https://dev.opencascade.org/resources/download/3rd-party-components
|
||||
| Flex 2.6.4+ and Bison 3.7.1+ | https://sourceforge.net/projects/winflexbison/ | Data Exchange | Updating STEP and ExprIntrp parsers |
|
||||
| RapidJSON 1.1+ | https://rapidjson.org/ | Data Exchange | Reading glTF files |
|
||||
| Draco 1.4.1+ | https://github.com/google/draco | Data Exchange | Reading compressed glTF files |
|
||||
| Tcl/Tk 8.6.3+ | https://www.tcl.tk/software/tcltk/download.html | DRAW Test Harness | Tcl interpreter in Draw module |
|
||||
| Tcl/Tk 8.6.3+ | https://www.tcl.tk/software/tcltk/download.html | DRAW Test Harness | Tcl interpretor in Draw module |
|
||||
| Qt 5.3.2+ | https://www.qt.io/download/ | Inspector and Samples | Inspector Qt samples and |
|
||||
| Doxygen 1.8.5+ | https://www.doxygen.nl/download.html | Documentation | (Re)generating documentation |
|
||||
| Graphviz 2.38+ | https://graphviz.org/ | Documentation | Generating dependency graphs |
|
||||
|
@@ -763,7 +763,7 @@ filter2->AddSkipped("TDataStd_Integer");
|
||||
app->Open("example.cbf", doc, filter2);
|
||||
~~~~
|
||||
|
||||
*PCDM_ReaderFilter::AppendMode_Protect* means that if the loading algorithm finds already existing attribute in the document, it will not be overwritten by attribute from the loading file. If it is needed to
|
||||
*PCDM_ReaderFilter::AppendMode_Protect* means that if the loading algorithm finds already existing attribute in the document, it will not be overwritten by attibute from the loading file. If it is needed to
|
||||
substitute the existing attributes, the reading mode *PCDM_ReaderFilter::AppendMode_Overwrite* must be used instead.
|
||||
|
||||
*AddRead* and *AddSkipped* methods for attributes should not be used in one filter. If it is so, *AddSkipped* attributes are ignored during the read.
|
||||
@@ -971,7 +971,7 @@ The "correct" history of a used modeling operation serves the basis of naming me
|
||||
| Closed wire | Edges | All edges |
|
||||
| Opened wire | Edges and ending vertexes | All edges plus ending vertexes of the wire |
|
||||
| Edge | Vertexes | Two vertexes are expected |
|
||||
| Compound or CompSolid | To be used consequently the above declared rule applied to all sub-shapes of the first level | Compound/CompSolid to be explored level by level until any the mentioned above types will be met |
|
||||
| Compound or CompSolid | To be used consequentially the above declared rule applied to all sub-shapes of the first level | Compound/CompSolid to be explored level by level until any the mentioned above types will be met |
|
||||
|
||||
The history should return (and track) only elementary types of sub-shapes, i.e. Faces, Edges and Vertexes, while other so-called aggregation types: Compounds, Shells, Wires, are calculated by Selection mechanism automatically.
|
||||
|
||||
|
@@ -119,7 +119,7 @@ if (OpenCASCADE_INCLUDE_DIR_FOUND AND OpenCASCADE_LIBRARY_DIR_FOUND)
|
||||
set (OpenCASCADE_INSTALL_PREFIX ${OpenCASCADE_DIR})
|
||||
|
||||
# Define OCCT toolkits so that CMake can put absolute paths to linker;
|
||||
# the library existence is not checked here, since modules can be disabled.
|
||||
# the library existance is not checked here, since modules can be disabled.
|
||||
foreach (aLibIter ${OpenCASCADE_TKLIST})
|
||||
add_library (${aLibIter} SHARED IMPORTED)
|
||||
|
||||
|
@@ -11,7 +11,7 @@ project (ImportExport)
|
||||
add_definitions (-DWINVER=0x0501 -DUNICODE -D_UNICODE)
|
||||
set (CMAKE_MFC_FLAG 2)
|
||||
|
||||
set (ImportExport_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/03_ImportExport/src)
|
||||
set (ImportExport_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport/src)
|
||||
set (ImportExport_HEADER_FILES ${ImportExport_SRC_DIR}/ColoredShapes.h
|
||||
${ImportExport_SRC_DIR}/ImportExportApp.h
|
||||
${ImportExport_SRC_DIR}/ImportExportDoc.h
|
||||
@@ -21,7 +21,7 @@ set (ImportExport_SOURCE_FILES ${ImportExport_SRC_DIR}/ColoredShapes.cpp
|
||||
${ImportExport_SRC_DIR}/ImportExportDoc.cpp
|
||||
${ImportExport_SRC_DIR}/StdAfx.cpp)
|
||||
|
||||
set (ImportExport_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/03_ImportExport/res)
|
||||
set (ImportExport_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport/res)
|
||||
set (ImportExport_RESOURCE_HEADER ${ImportExport_RESOURCE_DIR}/resource.h)
|
||||
set (ImportExport_RESOURCE_FILES ${ImportExport_RESOURCE_DIR}/Toolbar.bmp
|
||||
${ImportExport_RESOURCE_DIR}/ImportExport.rc)
|
||||
@@ -55,7 +55,7 @@ else()
|
||||
endif()
|
||||
|
||||
include_directories (${CMAKE_BINARY_DIR}/inc
|
||||
${MFC_STANDARD_SAMPLES_DIR}/03_ImportExport
|
||||
${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport
|
||||
${ImportExport_SRC_DIR}
|
||||
${MFC_STANDARD_SAMPLES_DIR}/Common)
|
||||
|
||||
|
@@ -11,7 +11,7 @@ project (HLR)
|
||||
add_definitions(-DWINVER=0x0501 -DUNICODE -D_UNICODE)
|
||||
set (CMAKE_MFC_FLAG 2)
|
||||
|
||||
set (HLR_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_HLR/src)
|
||||
set (HLR_SRC_DIR ${MFC_STANDARD_SAMPLES_DIR}/08_HLR/src)
|
||||
set (HLR_HEADER_FILES ${HLR_SRC_DIR}/HLRApp.h
|
||||
${HLR_SRC_DIR}/HLRDoc.h
|
||||
${HLR_SRC_DIR}/HLRView2D.h
|
||||
@@ -23,7 +23,7 @@ set (HLR_SOURCE_FILES ${HLR_SRC_DIR}/HLRApp.cpp
|
||||
${HLR_SRC_DIR}/SelectionDialog.cpp
|
||||
${HLR_SRC_DIR}/StdAfx.cpp )
|
||||
|
||||
set (HLR_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/04_HLR/res)
|
||||
set (HLR_RESOURCE_DIR ${MFC_STANDARD_SAMPLES_DIR}/08_HLR/res)
|
||||
set (HLR_RESOURCE_HEADER ${HLR_RESOURCE_DIR}/resource.h)
|
||||
set (HLR_RESOURCE_FILES ${HLR_RESOURCE_DIR}/axoviewd.bmp
|
||||
${HLR_RESOURCE_DIR}/axoviewf.bmp
|
||||
|
@@ -82,6 +82,7 @@ set (COMMON_HEADER_FILES ${MFC_STANDARD_COMMON_SAMPLES_DIR}/AISDialogs.h
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/OCC_StereoConfigDlg.h
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/ParamsFacesPage.h
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/ResultDialog.h
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/User_Cylinder.hxx
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/ColoredMeshDlg.h
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/DimensionDlg.h
|
||||
${MFC_STANDARD_COMMON_SAMPLES_DIR}/LengthParamsEdgePage.h
|
||||
|
@@ -293,7 +293,7 @@ Aspect_SequenceOfColor AIS_ColorScale::MakeUniformColors (Standard_Integer theNb
|
||||
|
||||
// adjust range to be within (0, 360], with sign according to theHueFrom and theHueTo
|
||||
Standard_Real aHueRange = std::fmod (theHueTo - theHueFrom, 360.);
|
||||
constexpr Standard_Real aHueEps = Precision::Angular() * 180. / M_PI;
|
||||
const Standard_Real aHueEps = Precision::Angular() * 180. / M_PI;
|
||||
if (Abs (aHueRange) <= aHueEps)
|
||||
{
|
||||
aHueRange = (aHueRange < 0 ? -360. : 360.);
|
||||
|
@@ -31,7 +31,7 @@
|
||||
#include <TCollection_HAsciiString.hxx>
|
||||
|
||||
#include <stdio.h>
|
||||
// This is a generic header for any STEP scheme
|
||||
// This is a generic header for any STEP sheme
|
||||
static Handle(TCollection_HAsciiString) nulstr;
|
||||
static Handle(Interface_HArray1OfHAsciiString) nularr;
|
||||
|
||||
|
@@ -146,8 +146,8 @@ static void Hunt(const TColStd_Array1OfReal& Arr,
|
||||
const Standard_Real Coord,
|
||||
Standard_Integer& Iloc)
|
||||
{//Warning: Hunt is used to find number of knot which equals coordinate component,
|
||||
// when coordinate component definitely equals a knot only.
|
||||
constexpr Standard_Real Tol=Precision::PConfusion()/10;
|
||||
// when coordinate component definitly equals a knot only.
|
||||
Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Standard_Integer i=1;
|
||||
while((i <= Arr.Upper()) && (Abs(Coord - Arr(i)) > Tol)){
|
||||
i++;}
|
||||
@@ -204,7 +204,7 @@ static void FindBounds(const TColStd_Array1OfReal& Arr,
|
||||
|
||||
{
|
||||
Standard_Integer N=0;
|
||||
constexpr Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Hunt(Arr,Coord,N);
|
||||
DerNull=Standard_False;
|
||||
|
||||
@@ -243,7 +243,7 @@ static void Locate1Coord(const Standard_Integer Index,
|
||||
gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop)
|
||||
{
|
||||
Standard_Real Comp1=0, DComp1=0, cur, f = 0.0, l = 0.0;
|
||||
constexpr Standard_Real Tol = Precision::PConfusion()/10;
|
||||
Standard_Real Tol = Precision::PConfusion()/10;
|
||||
Standard_Integer i = 1, Bnd1, Bnd2;
|
||||
Standard_Boolean DIsNull= Standard_False;
|
||||
TColStd_Array1OfReal Arr(1,BSplC->NbKnots()); BSplC->Knots(Arr);
|
||||
@@ -345,7 +345,7 @@ static void Locate1Coord(const Standard_Integer Index,
|
||||
gp_Pnt2d& RightTop)
|
||||
{
|
||||
Standard_Real Comp1=0,DComp1=0;
|
||||
constexpr Standard_Real Tol = Precision::PConfusion()/10;
|
||||
Standard_Real Tol = Precision::PConfusion()/10;
|
||||
Standard_Integer i=1, Up=0, Up1, Up2, Down=0, Down1, Down2;
|
||||
Standard_Real cur = 0.;
|
||||
|
||||
@@ -556,7 +556,7 @@ static void Locate2Coord(const Standard_Integer Index,
|
||||
const Standard_Real I2,
|
||||
gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop)
|
||||
{
|
||||
constexpr Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Standard_Real Comp1=0,DComp1=0;
|
||||
if(Index==1) { Comp1=UV.X();
|
||||
DComp1=DUV.X();}
|
||||
@@ -620,7 +620,7 @@ static void Locate2Coord(const Standard_Integer Index,
|
||||
gp_Pnt2d& LeftBot, gp_Pnt2d& RightTop)
|
||||
{
|
||||
Standard_Real Comp=0,DComp=0,Tmp1=0.0,Tmp2=0.0;
|
||||
constexpr Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Standard_Real Tol=Precision::PConfusion()/10;
|
||||
Standard_Integer N=0, NUp=0, NLo=0;
|
||||
if(Index==1)
|
||||
{ Comp=UV.X();
|
||||
@@ -638,7 +638,7 @@ static void Locate2Coord(const Standard_Integer Index,
|
||||
if((DComp > 0)&&(Abs(DComp)>Tol)) {
|
||||
Hunt(Arr,Comp,N);
|
||||
if (N >= NUp){
|
||||
//limit case: Hunt() caught upper knot. Take the last span.
|
||||
//limit case: Hunt() cought upper knot. Take the last span.
|
||||
N = NUp - 1;
|
||||
}
|
||||
if(Index==1) { Tmp1=BSplS->UKnot(N);
|
||||
@@ -659,7 +659,7 @@ static void Locate2Coord(const Standard_Integer Index,
|
||||
if((DComp < 0)&&(Abs(DComp)>Tol)){
|
||||
Hunt(Arr,Comp,N);
|
||||
if (N <= NLo) {
|
||||
//limit case: Hunt() caught lower knot. Take the first span.
|
||||
//limit case: Hunt() cought lower knot. Take the first span.
|
||||
N = NLo + 1;
|
||||
}
|
||||
if(Index==1) { Tmp1=BSplS->UKnot(N-1);
|
||||
@@ -893,7 +893,7 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals (const GeomAbs_Shape S) c
|
||||
|
||||
myCurve->Intervals(TabC,S);
|
||||
|
||||
constexpr Standard_Real Tol= Precision::PConfusion()/10;
|
||||
Standard_Real Tol= Precision::PConfusion()/10;
|
||||
|
||||
// sorted sequence of parameters defining continuity intervals;
|
||||
// started with own intervals of curve and completed by
|
||||
@@ -1063,7 +1063,7 @@ void Adaptor3d_CurveOnSurface::D1(const Standard_Real U ,
|
||||
Standard_Real FP = myCurve->FirstParameter();
|
||||
Standard_Real LP = myCurve->LastParameter();
|
||||
|
||||
constexpr Standard_Real Tol= Precision::PConfusion()/10;
|
||||
Standard_Real Tol= Precision::PConfusion()/10;
|
||||
if( ( Abs(U-FP)<Tol)&&(!myFirstSurf.IsNull()) )
|
||||
{
|
||||
myCurve->D1(U,Puv,Duv);
|
||||
@@ -1103,7 +1103,7 @@ void Adaptor3d_CurveOnSurface::D2(const Standard_Real U,
|
||||
Standard_Real FP = myCurve->FirstParameter();
|
||||
Standard_Real LP = myCurve->LastParameter();
|
||||
|
||||
constexpr Standard_Real Tol= Precision::PConfusion()/10;
|
||||
Standard_Real Tol= Precision::PConfusion()/10;
|
||||
if( (Abs(U-FP)<Tol)&&(!myFirstSurf.IsNull()) )
|
||||
{
|
||||
myCurve->D2(U,UV,DW,D2W);
|
||||
@@ -1152,7 +1152,7 @@ void Adaptor3d_CurveOnSurface::D3
|
||||
gp_Vec& V3) const
|
||||
{
|
||||
|
||||
constexpr Standard_Real Tol= Precision::PConfusion()/10;
|
||||
Standard_Real Tol= Precision::PConfusion()/10;
|
||||
gp_Pnt2d UV;
|
||||
gp_Vec2d DW,D2W,D3W;
|
||||
gp_Vec D1U,D1V,D2U,D2V,D2UV,D3U,D3V,D3UUV,D3UVV;
|
||||
@@ -1651,7 +1651,7 @@ void Adaptor3d_CurveOnSurface::EvalFirstLastSurf()
|
||||
Standard_Real FirstPar,LastPar;
|
||||
gp_Pnt2d UV, LeftBot, RightTop;
|
||||
gp_Vec2d DUV;
|
||||
constexpr Standard_Real Tol= Precision::PConfusion()/10;
|
||||
Standard_Real Tol= Precision::PConfusion()/10;
|
||||
Standard_Boolean Ok = Standard_True;
|
||||
|
||||
|
||||
|
@@ -559,7 +559,7 @@ Standard_Boolean Adaptor3d_TopolTool::Identical
|
||||
#include <gp_Dir.hxx>
|
||||
#include <gp_Vec.hxx>
|
||||
|
||||
#define myMinPnts 4 //Absolute possible minimum of sample points
|
||||
#define myMinPnts 4 //Absolut possible minimum of sample points
|
||||
//Restriction of IntPolyh
|
||||
|
||||
|
||||
|
@@ -27,7 +27,7 @@ Standard_Boolean AdvApprox_DichoCutting::Value(const Standard_Real a,
|
||||
Standard_Real& cuttingvalue) const
|
||||
{
|
||||
// longueur minimum d'un intervalle pour F(U,V) : EPS1=1.e-9 (cf.MEPS1)
|
||||
constexpr Standard_Real lgmin = 10*Precision::PConfusion();
|
||||
Standard_Real lgmin = 10*Precision::PConfusion();
|
||||
cuttingvalue = (a+b) / 2;
|
||||
return (Abs(b-a)>=2*lgmin);
|
||||
}
|
||||
|
@@ -36,7 +36,7 @@ Standard_Boolean AdvApprox_PrefAndRec::Value(const Standard_Real a,
|
||||
Standard_Real& cuttingvalue) const
|
||||
{
|
||||
// longueur minimum d'un intervalle parametrique : 10*PConfusion()
|
||||
constexpr Standard_Real lgmin = 10 * Precision::PConfusion();
|
||||
Standard_Real lgmin = 10 * Precision::PConfusion();
|
||||
Standard_Integer i;
|
||||
Standard_Real cut, mil=(a+b)/2, dist;
|
||||
Standard_Boolean isfound = Standard_False;
|
||||
|
@@ -30,7 +30,7 @@ Standard_Boolean AdvApprox_PrefCutting::Value(const Standard_Real a,
|
||||
{
|
||||
// longueur minimum d'un intervalle parametrique : PConfusion()
|
||||
// pour F(U,V) : EPS1=1.e-9 (cf.MMEPS1)
|
||||
constexpr Standard_Real lgmin = 10 * Precision::PConfusion();
|
||||
Standard_Real lgmin = 10 * Precision::PConfusion();
|
||||
Standard_Integer i;
|
||||
Standard_Real cut, mil=(a+b)/2,
|
||||
dist = Abs((a-b)/2);
|
||||
|
@@ -2004,7 +2004,7 @@ void AppDef_Variational::InitSmoothCriterion()
|
||||
void AppDef_Variational::InitParameters(Standard_Real& Length)
|
||||
{
|
||||
|
||||
constexpr Standard_Real Eps1 = Precision::Confusion() * .01;
|
||||
const Standard_Real Eps1 = Precision::Confusion() * .01;
|
||||
|
||||
Standard_Real aux, dist;
|
||||
Standard_Integer i, i0, i1 = 0, ipoint;
|
||||
@@ -2052,7 +2052,7 @@ void AppDef_Variational::InitCriterionEstimations(const Standard_Real Length,
|
||||
{
|
||||
E1 = Length * Length;
|
||||
|
||||
constexpr Standard_Real Eps1 = Precision::Confusion() * .01;
|
||||
const Standard_Real Eps1 = Precision::Confusion() * .01;
|
||||
|
||||
math_Vector VTang1(1, myDimension), VTang2(1, myDimension), VTang3(1, myDimension),
|
||||
VScnd1(1, myDimension), VScnd2(1, myDimension), VScnd3(1, myDimension);
|
||||
@@ -2180,7 +2180,7 @@ void AppDef_Variational::EstTangent(const Standard_Integer ipnt,
|
||||
|
||||
{
|
||||
Standard_Integer i ;
|
||||
constexpr Standard_Real Eps1 = Precision::Confusion() * .01;
|
||||
const Standard_Real Eps1 = Precision::Confusion() * .01;
|
||||
const Standard_Real EpsNorm = 1.e-9;
|
||||
|
||||
Standard_Real Wpnt = 1.;
|
||||
|
@@ -139,7 +139,7 @@ static Standard_Boolean CheckMultiCurve(const AppParCurves_MultiCurve& theMultiC
|
||||
return Standard_True;
|
||||
|
||||
const Standard_Real MinScalProd = -0.9;
|
||||
constexpr Standard_Real SqTol3d = Precision::SquareConfusion();
|
||||
const Standard_Real SqTol3d = Precision::SquareConfusion();
|
||||
|
||||
theIndbad = 0;
|
||||
Standard_Integer indbads [4];
|
||||
|
@@ -68,7 +68,7 @@ public:
|
||||
//! get the Multplicities of the section
|
||||
Standard_EXPORT virtual void Mults (TColStd_Array1OfInteger& TMults) const = 0;
|
||||
|
||||
//! Returns if the sections are rational or not
|
||||
//! Returns if the sections are rationnal or not
|
||||
Standard_EXPORT virtual Standard_Boolean IsRational() const = 0;
|
||||
|
||||
//! Returns the number of intervals for continuity
|
||||
|
@@ -438,7 +438,7 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
|
||||
gp_Vec2d& aPrmTg = MyImplicitFirst ? Tguv2 : Tguv1;
|
||||
|
||||
//for square
|
||||
constexpr Standard_Real aNullValue = Precision::Approximation()*
|
||||
const Standard_Real aNullValue = Precision::Approximation()*
|
||||
Precision::Approximation(),
|
||||
anAngTol = Precision::Angular();
|
||||
|
||||
|
@@ -621,7 +621,7 @@ Standard_Boolean
|
||||
((TheSvSurfaces *)PtrOnmySvSurfaces)->SetUseSolver(Standard_True);
|
||||
}
|
||||
|
||||
constexpr Standard_Real SqTol3d = Precision::SquareConfusion();
|
||||
const Standard_Real SqTol3d = Precision::SquareConfusion();
|
||||
math_Vector tolerance(1,2);
|
||||
tolerance(1) = tolerance(2) = 1.e-8;
|
||||
|
||||
|
@@ -27,7 +27,7 @@ struct Aspect_XVisualInfo;
|
||||
//! This class creates and provides connection with X server.
|
||||
//! Raises exception if can not connect to X server.
|
||||
//! On Windows and Mac OS X (in case when Cocoa used) platforms this class does nothing.
|
||||
//! WARNING: Do not close display connection manually!
|
||||
//! WARRNING: Do not close display connection manually!
|
||||
class Aspect_DisplayConnection : public Standard_Transient
|
||||
{
|
||||
DEFINE_STANDARD_RTTIEXT(Aspect_DisplayConnection, Standard_Transient)
|
||||
|
@@ -341,8 +341,12 @@ void BOPAlgo_PaveFiller::PerformEE(const Message_ProgressRange& theRange)
|
||||
GeomAbs_CurveType aType1 = aBAC1.GetType();
|
||||
GeomAbs_CurveType aType2 = aBAC2.GetType();
|
||||
//
|
||||
bAnalytical = (aType1 == GeomAbs_Line && aType2 == GeomAbs_Circle) ||
|
||||
(aType1 == GeomAbs_Circle && aType2 == GeomAbs_Line);
|
||||
bAnalytical = (((aType1 == GeomAbs_Line) &&
|
||||
(aType2 == GeomAbs_Line ||
|
||||
aType2 == GeomAbs_Circle)) ||
|
||||
((aType2 == GeomAbs_Line) &&
|
||||
(aType1 == GeomAbs_Line ||
|
||||
aType1 == GeomAbs_Circle)));
|
||||
}
|
||||
//
|
||||
for (i=1; i<=aNbCPrts; ++i) {
|
||||
@@ -439,7 +443,7 @@ void BOPAlgo_PaveFiller::PerformEE(const Message_ProgressRange& theRange)
|
||||
|
||||
Standard_Real aTolVnew = BRep_Tool::Tolerance(aVnew);
|
||||
if (bAnalytical) {
|
||||
// increase tolerance for Line/Circle intersection, but do not update
|
||||
// increase tolerance for Line/Line intersection, but do not update
|
||||
// the vertex till its intersection with some other shape
|
||||
Standard_Real aTolMin = (BRepAdaptor_Curve(aE1).GetType() == GeomAbs_Line) ?
|
||||
(aCR1.Last() - aCR1.First()) / 2. : (aCR2.Last() - aCR2.First()) / 2.;
|
||||
|
@@ -229,6 +229,7 @@ Standard_Integer bopsmt(Draw_Interpretor& di,
|
||||
return 0;
|
||||
}
|
||||
//
|
||||
char buf[64];
|
||||
Standard_Boolean bRunParallel;
|
||||
Standard_Integer aNb;
|
||||
BOPAlgo_BOP aBOP;
|
||||
@@ -236,7 +237,8 @@ Standard_Integer bopsmt(Draw_Interpretor& di,
|
||||
const TopTools_ListOfShape& aLC=pPF->Arguments();
|
||||
aNb=aLC.Extent();
|
||||
if (aNb!=2) {
|
||||
di << " wrong number of arguments " << aNb << '\n';
|
||||
Sprintf (buf, " wrong number of arguments %s\n", aNb);
|
||||
di << buf;
|
||||
return 0;
|
||||
}
|
||||
//
|
||||
@@ -296,6 +298,7 @@ Standard_Integer bopsection(Draw_Interpretor& di,
|
||||
return 0;
|
||||
}
|
||||
//
|
||||
char buf[64];
|
||||
Standard_Boolean bRunParallel;
|
||||
Standard_Integer aNb;
|
||||
BOPAlgo_Section aBOP;
|
||||
@@ -303,7 +306,8 @@ Standard_Integer bopsection(Draw_Interpretor& di,
|
||||
const TopTools_ListOfShape& aLC=pPF->Arguments();
|
||||
aNb=aLC.Extent();
|
||||
if (aNb!=2) {
|
||||
di << " wrong number of arguments " << aNb << '\n';
|
||||
Sprintf (buf, " wrong number of arguments %s\n", aNb);
|
||||
di << buf;
|
||||
return 0;
|
||||
}
|
||||
//
|
||||
|
@@ -989,7 +989,7 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
|
||||
//
|
||||
// The difference between faces should be obvious enough
|
||||
// to guarantee the correctness of the classification
|
||||
constexpr Standard_Real anAngleCriteria = Precision::Confusion();
|
||||
Standard_Real anAngleCriteria = Precision::Confusion();
|
||||
|
||||
bRet=Standard_True;
|
||||
aIt.Initialize(theLCSOff);
|
||||
@@ -2181,7 +2181,7 @@ Standard_Real MinStep3D(const TopoDS_Edge& theE1,
|
||||
}
|
||||
//
|
||||
if (aR > 100.) {
|
||||
constexpr Standard_Real d = 10*Precision::PConfusion();
|
||||
Standard_Real d = 10*Precision::PConfusion();
|
||||
aDtMin = Max(aDtMin, sqrt(d*d + 2*d*aR));
|
||||
}
|
||||
}
|
||||
|
@@ -698,7 +698,7 @@ void BOPTools_AlgoTools2D::IsEdgeIsoline( const TopoDS_Edge& theE,
|
||||
aT /= sqrt(aSqMagn);
|
||||
|
||||
//sin(da) ~ da, when da->0.
|
||||
constexpr Standard_Real aTol = Precision::Angular();
|
||||
const Standard_Real aTol = Precision::Angular();
|
||||
const gp_Vec2d aRefVDir(0.0, 1.0), aRefUDir(1.0, 0.0);
|
||||
|
||||
const Standard_Real aDPv = aT.CrossMagnitude(aRefVDir),
|
||||
|
@@ -138,7 +138,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Face& F)
|
||||
{
|
||||
const BRep_TFace* TF = static_cast<const BRep_TFace*>(F.TShape().get());
|
||||
Standard_Real p = TF->Tolerance();
|
||||
constexpr Standard_Real pMin = Precision::Confusion();
|
||||
Standard_Real pMin = Precision::Confusion();
|
||||
if (p > pMin) return p;
|
||||
else return pMin;
|
||||
}
|
||||
@@ -812,7 +812,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Edge& E)
|
||||
{
|
||||
const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
|
||||
Standard_Real p = TE->Tolerance();
|
||||
constexpr Standard_Real pMin = Precision::Confusion();
|
||||
Standard_Real pMin = Precision::Confusion();
|
||||
if (p > pMin) return p;
|
||||
else return pMin;
|
||||
}
|
||||
@@ -1258,7 +1258,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Vertex& V)
|
||||
}
|
||||
|
||||
Standard_Real p = aTVert->Tolerance();
|
||||
constexpr Standard_Real pMin = Precision::Confusion();
|
||||
Standard_Real pMin = Precision::Confusion();
|
||||
if (p > pMin) return p;
|
||||
else return pMin;
|
||||
}
|
||||
|
@@ -51,12 +51,12 @@ public:
|
||||
//! Warning:
|
||||
//! The Wires must be closed.
|
||||
//!
|
||||
//! The edges of <W> can be modified if they don't have
|
||||
//! pcurves on the surface <S> of <F>. In this case
|
||||
//! if <Proj> is false the first pcurve of the edge
|
||||
//! is positioned on <S>.
|
||||
//! if <Proj> is True, the Pcurve On <S> is the
|
||||
//! projection of the curve 3d on <F>.
|
||||
//! The edges of <W> can be modified if they have not pcurves
|
||||
//! on the surface <S> of <F>. In this case
|
||||
//! if <Proj> is false the first pcurve of the edge
|
||||
//! is positionned on <S>.
|
||||
//! if <Proj> is True ,the Pcurve On <S> is the
|
||||
//! projection of the curve 3d on <F>.
|
||||
Standard_EXPORT void Add (TopoDS_Wire& W);
|
||||
|
||||
//! Removes all the Wires
|
||||
|
@@ -86,13 +86,13 @@ public:
|
||||
|
||||
Standard_EXPORT void VerticesForSubstitute (TopTools_DataMapOfShapeShape& VerVerMap);
|
||||
|
||||
//! Set maximal tolerance used for comparing distances between vertices.
|
||||
//! Set maximal tolerance used for comparing distaces between vertices.
|
||||
void SetTolConf(const Standard_Real theTolConf)
|
||||
{
|
||||
myTolConf = theTolConf;
|
||||
}
|
||||
|
||||
//! Get maximal tolerance used for comparing distances between vertices.
|
||||
//! Get maximal tolerance used for comparing distaces between vertices.
|
||||
Standard_Real GetTolConf() const
|
||||
{
|
||||
return myTolConf;
|
||||
|
@@ -49,7 +49,7 @@ BRepBlend_AppFuncRoot::BRepBlend_AppFuncRoot(Handle(BRepBlend_Line)& Line,
|
||||
// Tables
|
||||
Func.GetShape( NbPoles, NbKnots, Degree, NbPoles2d);
|
||||
|
||||
// Calculation of BaryCentre (rational case).
|
||||
// Calculation of BaryCentre (rationnal case).
|
||||
if (Func.IsRational()) {
|
||||
Standard_Real Xmax =-1.e100, Xmin = 1.e100,
|
||||
Ymax =-1.e100, Ymin = 1.e100,
|
||||
|
@@ -69,7 +69,7 @@ public:
|
||||
//! get the Multplicities of the section
|
||||
Standard_EXPORT virtual void Mults (TColStd_Array1OfInteger& TMults) const Standard_OVERRIDE;
|
||||
|
||||
//! Returns if the section is rational or not
|
||||
//! Returns if the section is rationnal or not
|
||||
Standard_EXPORT virtual Standard_Boolean IsRational() const Standard_OVERRIDE;
|
||||
|
||||
//! Returns the number of intervals for continuity
|
||||
@@ -95,7 +95,7 @@ public:
|
||||
Standard_EXPORT virtual void Resolution (const Standard_Integer Index, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const Standard_OVERRIDE;
|
||||
|
||||
//! Returns the tolerance to reach in approximation
|
||||
//! to respect
|
||||
//! to respecte
|
||||
//! BoundTol error at the Boundary
|
||||
//! AngleTol tangent error at the Boundary (in radian)
|
||||
//! SurfTol error inside the surface.
|
||||
|
@@ -139,7 +139,7 @@ public:
|
||||
|
||||
Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C);
|
||||
|
||||
//! Returns if the section is rational
|
||||
//! Returns if the section is rationnal
|
||||
Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE;
|
||||
|
||||
//! Returns the length of the maximum section
|
||||
@@ -162,7 +162,7 @@ public:
|
||||
Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE;
|
||||
|
||||
//! Returns the tolerance to reach in approximation
|
||||
//! to respect
|
||||
//! to respecte
|
||||
//! BoundTol error at the Boundary
|
||||
//! AngleTol tangent error at the Boundary
|
||||
//! SurfTol error inside the surface.
|
||||
|
@@ -140,7 +140,7 @@ public:
|
||||
|
||||
Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C);
|
||||
|
||||
//! Returns if the section is rational
|
||||
//! Returns if the section is rationnal
|
||||
Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE;
|
||||
|
||||
//! Returns the length of the maximum section
|
||||
@@ -163,7 +163,7 @@ public:
|
||||
Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE;
|
||||
|
||||
//! Returns the tolerance to reach in approximation
|
||||
//! to respect
|
||||
//! to respecte
|
||||
//! BoundTol error at the Boundary
|
||||
//! AngleTol tangent error at the Boundary
|
||||
//! SurfTol error inside the surface.
|
||||
|
@@ -133,7 +133,7 @@ public:
|
||||
|
||||
Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, const Standard_Real W, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C);
|
||||
|
||||
//! Returns if the section is rational
|
||||
//! Returns if the section is rationnal
|
||||
Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE;
|
||||
|
||||
//! Returns the length of the maximum section
|
||||
@@ -156,7 +156,7 @@ public:
|
||||
Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE;
|
||||
|
||||
//! Returns the tolerance to reach in approximation
|
||||
//! to respect
|
||||
//! to respecte
|
||||
//! BoundTol error at the Boundary
|
||||
//! AngleTol tangent error at the Boundary
|
||||
//! SurfTol error inside the surface.
|
||||
|
@@ -132,7 +132,7 @@ public:
|
||||
|
||||
Standard_EXPORT void Section (const Standard_Real Param, const Standard_Real U, const Standard_Real V, const Standard_Real W, Standard_Real& Pdeb, Standard_Real& Pfin, gp_Circ& C);
|
||||
|
||||
//! Returns if the section is rational
|
||||
//! Returns if the section is rationnal
|
||||
Standard_EXPORT Standard_Boolean IsRational() const Standard_OVERRIDE;
|
||||
|
||||
//! Returns the length of the maximum section
|
||||
@@ -155,7 +155,7 @@ public:
|
||||
Standard_EXPORT void GetShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree, Standard_Integer& NbPoles2d) Standard_OVERRIDE;
|
||||
|
||||
//! Returns the tolerance to reach in approximation
|
||||
//! to respect
|
||||
//! to respecte
|
||||
//! BoundTol error at the Boundary
|
||||
//! AngleTol tangent error at the Boundary
|
||||
//! SurfTol error inside the surface.
|
||||
|
@@ -256,7 +256,7 @@ static Standard_Integer PointsForOBB(const TopoDS_Shape& theS,
|
||||
//=======================================================================
|
||||
static Standard_Integer IsWCS(const gp_Dir& theDir)
|
||||
{
|
||||
constexpr Standard_Real aToler = Precision::Angular()*Precision::Angular();
|
||||
const Standard_Real aToler = Precision::Angular()*Precision::Angular();
|
||||
|
||||
const Standard_Real aX = theDir.X(),
|
||||
aY = theDir.Y(),
|
||||
|
@@ -43,7 +43,7 @@ static Standard_Integer
|
||||
IntersectionOfSets( const NCollection_List<Standard_Integer>& theSet1,
|
||||
const NCollection_List<Standard_Integer>& theSet2)
|
||||
{
|
||||
constexpr Standard_Integer anIntMax = IntegerLast();
|
||||
const Standard_Integer anIntMax = IntegerLast();
|
||||
Standard_Integer aRetVal = anIntMax;
|
||||
for(NCollection_List<Standard_Integer>::Iterator
|
||||
anIt1 = theSet1.begin().Iterator();
|
||||
|
@@ -140,7 +140,7 @@ void BRepCheck_Edge::Minimum()
|
||||
|
||||
if (!myCref.IsNull()) {
|
||||
Handle(BRep_GCurve) GCref (Handle(BRep_GCurve)::DownCast (myCref));
|
||||
constexpr Standard_Real eps = Precision::PConfusion();
|
||||
Standard_Real eps = Precision::PConfusion();
|
||||
Standard_Real First,Last;
|
||||
GCref->Range(First,Last);
|
||||
if (Last<=First) {
|
||||
@@ -314,7 +314,7 @@ void BRepCheck_Edge::InContext(const TopoDS_Shape& S)
|
||||
Standard_Boolean pcurvefound = Standard_False;
|
||||
|
||||
BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
|
||||
constexpr Standard_Real eps = Precision::PConfusion();
|
||||
Standard_Real eps = Precision::PConfusion();
|
||||
Standard_Boolean toRunParallel = !myMutex.IsNull();
|
||||
while (itcr.More()) {
|
||||
const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
|
||||
|
@@ -147,7 +147,7 @@ Standard_Boolean BRepClass_FaceExplorer::OtherSegment(const gp_Pnt2d& P,
|
||||
Standard_Real aFPar;
|
||||
Standard_Real aLPar;
|
||||
Handle(Geom2d_Curve) aC2d;
|
||||
constexpr Standard_Real aTolParConf2 = Precision::PConfusion() * Precision::PConfusion();
|
||||
Standard_Real aTolParConf2 = Precision::PConfusion() * Precision::PConfusion();
|
||||
gp_Pnt2d aPOnC;
|
||||
Standard_Real aParamIn;
|
||||
|
||||
@@ -202,7 +202,7 @@ Standard_Boolean BRepClass_FaceExplorer::OtherSegment(const gp_Pnt2d& P,
|
||||
// is tangent to the edge curve. This condition is bad for classification.
|
||||
// Therefore try to go to another point in the hope that there will be
|
||||
// no tangent. If there tangent is preserved then leave the last point in
|
||||
// order to get this edge chance to participate in classification.
|
||||
// order to get this edge chanse to participate in classification.
|
||||
if (myCurEdgePar + Probing_Step < Probing_End)
|
||||
continue;
|
||||
}
|
||||
|
@@ -441,7 +441,7 @@ Standard_Integer BRepClass3d_SolidExplorer::OtherSegment(const gp_Pnt& P,
|
||||
gp_Lin& L,
|
||||
Standard_Real& _Par)
|
||||
{
|
||||
constexpr Standard_Real TolU = Precision::PConfusion();
|
||||
const Standard_Real TolU = Precision::PConfusion();
|
||||
const Standard_Real TolV = TolU;
|
||||
|
||||
TopoDS_Face face;
|
||||
@@ -500,7 +500,7 @@ Standard_Integer BRepClass3d_SolidExplorer::OtherSegment(const gp_Pnt& P,
|
||||
face.Orientation(TopAbs_FORWARD);
|
||||
//
|
||||
//avoid process faces from uncorrected shells
|
||||
constexpr Standard_Real eps = Precision::PConfusion();
|
||||
const Standard_Real eps = Precision::PConfusion();
|
||||
Standard_Real epsU = Max(eps * Max(Abs(U2), Abs(U1)), eps);
|
||||
Standard_Real epsV = Max(eps * Max(Abs(V2), Abs(V1)), eps);
|
||||
if( Abs (U2 - U1) < epsU || Abs(V2 - V1) < epsV) {
|
||||
|
@@ -423,7 +423,7 @@ static void PERFORM_C0(const TopoDS_Edge& S1, const TopoDS_Edge& S2,
|
||||
|
||||
if (pCurv->Continuity() == GeomAbs_C0)
|
||||
{
|
||||
constexpr Standard_Real epsP = Precision::PConfusion();
|
||||
const Standard_Real epsP = Precision::PConfusion();
|
||||
|
||||
GeomAdaptor_Curve aAdaptorCurve(pCurv, aFirst, aLast);
|
||||
const Standard_Integer nbIntervals = aAdaptorCurve.NbIntervals(GeomAbs_C1);
|
||||
@@ -716,7 +716,7 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Vertex& theS1,
|
||||
if ((Dstmin < myDstRef - myEps) || (fabs(Dstmin - myDstRef) < myEps))
|
||||
{
|
||||
gp_Pnt Pt, P1 = BRep_Tool::Pnt(theS1);
|
||||
constexpr Standard_Real epsP = Precision::PConfusion();
|
||||
const Standard_Real epsP = Precision::PConfusion();
|
||||
|
||||
for (i = 1; i <= NbExtrema; i++)
|
||||
{
|
||||
@@ -833,7 +833,7 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Edge& theS1,
|
||||
if ((Dstmin < myDstRef - myEps) || (fabs(Dstmin - myDstRef) < myEps))
|
||||
{
|
||||
gp_Pnt Pt1, Pt2;
|
||||
constexpr Standard_Real epsP = Precision::PConfusion();
|
||||
const Standard_Real epsP = Precision::PConfusion();
|
||||
|
||||
for (i = 1; i <= NbExtrema; i++)
|
||||
{
|
||||
@@ -925,7 +925,7 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Edge& theS1, const TopoDS_Fac
|
||||
const Standard_Real tol = BRep_Tool::Tolerance(theS2);
|
||||
|
||||
gp_Pnt Pt1, Pt2;
|
||||
constexpr Standard_Real epsP = Precision::PConfusion();
|
||||
const Standard_Real epsP = Precision::PConfusion();
|
||||
|
||||
for (i = 1; i <= NbExtrema; i++)
|
||||
{
|
||||
|
@@ -400,7 +400,7 @@ Standard_Boolean BRepExtrema_ProximityValueTool::getFaceAdditionalVertices (
|
||||
BVH_Array3d& theAddVertices,
|
||||
NCollection_Vector<ProxPnt_Status>& theAddStatuses)
|
||||
{
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
|
||||
TopLoc_Location aLocation;
|
||||
Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (theFace, aLocation);
|
||||
|
@@ -314,7 +314,7 @@ void BRepFeat::ParametricMinMax(const TopoDS_Shape& S,
|
||||
static Standard_Boolean IsIn (BRepTopAdaptor_FClass2d& FC,
|
||||
const Geom2dAdaptor_Curve& AC)
|
||||
{
|
||||
constexpr Standard_Real Def = 100*Precision::Confusion();
|
||||
Standard_Real Def = 100*Precision::Confusion();
|
||||
GCPnts_QuasiUniformDeflection QU(AC,Def);
|
||||
|
||||
for (Standard_Integer i = 1; i <= QU.NbPoints(); i++) {
|
||||
|
@@ -755,7 +755,7 @@ static void Descendants(const TopoDS_Shape&,
|
||||
// intersects Shapes From and Until
|
||||
// case of several intersections (keep PartsOfTool according to the selection)
|
||||
// position of the face of intersection in PartsOfTool (before or after)
|
||||
constexpr Standard_Real delta = Precision::Confusion();
|
||||
Standard_Real delta = Precision::Confusion();
|
||||
|
||||
if (myPerfSelection != BRepFeat_NoSelection) {
|
||||
// modif of the test for cts21181 : (prbmax2 and prnmin2) -> (prbmin1 and prbmax1)
|
||||
|
@@ -1078,8 +1078,8 @@ static Standard_Boolean ToFuse (const TopoDS_Face& F1, const TopoDS_Face& F2)
|
||||
Handle(Geom_Surface) S1,S2;
|
||||
TopLoc_Location loc1, loc2;
|
||||
Handle(Standard_Type) typS1,typS2;
|
||||
constexpr Standard_Real tollin = Precision::Confusion();
|
||||
constexpr Standard_Real tolang = Precision::Angular();
|
||||
const Standard_Real tollin = Precision::Confusion();
|
||||
const Standard_Real tolang = Precision::Angular();
|
||||
|
||||
S1 = BRep_Tool::Surface(F1,loc1);
|
||||
S2 = BRep_Tool::Surface(F2,loc2);
|
||||
|
@@ -834,8 +834,8 @@ Standard_Boolean ToFuse(const TopoDS_Face& F1,
|
||||
Handle(Geom_Surface) S1,S2;
|
||||
TopLoc_Location loc1, loc2;
|
||||
Handle(Standard_Type) typS1,typS2;
|
||||
constexpr Standard_Real tollin = Precision::Confusion();
|
||||
constexpr Standard_Real tolang = Precision::Angular();
|
||||
const Standard_Real tollin = Precision::Confusion();
|
||||
const Standard_Real tolang = Precision::Angular();
|
||||
|
||||
S1 = BRep_Tool::Surface(F1,loc1);
|
||||
S2 = BRep_Tool::Surface(F2,loc2);
|
||||
|
@@ -541,7 +541,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
|
||||
|
||||
if (!Surf.IsNull()) { // Add the face at end
|
||||
|
||||
// Waiting the use of traces & restriction in BRepFill_Sweep
|
||||
// Waiting the use of traces & retriction in BRepFill_Sweep
|
||||
// Make Fuse.
|
||||
BRepLib_MakeFace MkF;
|
||||
MkF.Init(Surf, Standard_True, Precision::Confusion());
|
||||
|
@@ -3071,7 +3071,7 @@ void CutEdgeProf (const TopoDS_Edge& E,
|
||||
|
||||
// On calcule les intersection avec Oy.
|
||||
Geom2dAdaptor_Curve ALine(Line);
|
||||
constexpr Standard_Real Tol = Precision::Intersection();
|
||||
Standard_Real Tol = Precision::Intersection();
|
||||
Standard_Real TolC = 0.;
|
||||
|
||||
Geom2dInt_GInter Intersector(ALine,AC2d,TolC,Tol);
|
||||
@@ -3144,7 +3144,7 @@ void CutEdgeProf (const TopoDS_Edge& E,
|
||||
|
||||
//=======================================================================
|
||||
//function : CutEdge
|
||||
//purpose : Cut an edge at the extrema of curves and at points of inflexion.
|
||||
//purpose : Cut an edge at thw extrema of curves and at points of inflexion.
|
||||
// Closed circles are also cut in two.
|
||||
// If <Cuts> are empty the edge is not modified.
|
||||
// The first and the last vertex of the original edge
|
||||
|
@@ -907,7 +907,7 @@ void BRepFill_Generator::Perform()
|
||||
}
|
||||
|
||||
// set the pcurves
|
||||
constexpr Standard_Real T = Precision::Confusion();
|
||||
Standard_Real T = Precision::Confusion();
|
||||
|
||||
if (IType != 4) //not plane
|
||||
{
|
||||
|
@@ -122,18 +122,18 @@ public:
|
||||
protected:
|
||||
|
||||
|
||||
//! Initialize all the fields, this methode has to
|
||||
//! Initialize all the fields, this methode have to
|
||||
//! be called by the constructors of Inherited class.
|
||||
Standard_EXPORT void Init (const TopoDS_Wire& Path);
|
||||
|
||||
//! To preserve if possible the Tangent in transformations
|
||||
//! To preseve if possible the Tangent in transformations
|
||||
//! It is the default mode.
|
||||
Standard_EXPORT void TangentIsMain();
|
||||
|
||||
//! To preserve if possible the Normal in transformations
|
||||
//! To preseve if possible the Normal in transformations
|
||||
Standard_EXPORT void NormalIsMain();
|
||||
|
||||
//! To preserve if possible the BiNormal in transformations
|
||||
//! To preseve if possible the BiNormal in transformations
|
||||
Standard_EXPORT void BiNormalIsMain();
|
||||
|
||||
TopoDS_Wire myPath;
|
||||
|
@@ -109,8 +109,8 @@ BRepFill_MultiLine::BRepFill_MultiLine(const TopoDS_Face& Face1,
|
||||
myKPart(0)
|
||||
{
|
||||
//
|
||||
constexpr Standard_Real mult = 5.;
|
||||
constexpr Standard_Real eps = mult * Precision::Confusion();
|
||||
const Standard_Real mult = 5.;
|
||||
const Standard_Real eps = mult * Precision::Confusion();
|
||||
//
|
||||
myNbPnt2d = 2;
|
||||
myNbPnt = 1;
|
||||
@@ -585,8 +585,8 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
|
||||
}
|
||||
#endif
|
||||
//
|
||||
constexpr Standard_Real mult = 5.;
|
||||
constexpr Standard_Real eps = mult * Precision::Confusion();
|
||||
const Standard_Real mult = 5.;
|
||||
const Standard_Real eps = mult * Precision::Confusion();
|
||||
//
|
||||
Standard_Real UU =0., Dist = Precision::Infinite(), D1, D2;
|
||||
|
||||
@@ -627,7 +627,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U,
|
||||
}
|
||||
}
|
||||
|
||||
constexpr Standard_Real Tol = Precision::Confusion();
|
||||
const Standard_Real Tol = Precision::Confusion();
|
||||
Standard_Real VV;
|
||||
|
||||
gp_Pnt2d PF = TheV.Value(TheV.FirstParameter());
|
||||
|
@@ -516,7 +516,7 @@ void BRepFill_NSections::Init(const TColStd_SequenceOfReal & P,
|
||||
|
||||
myLaws = new (GeomFill_HArray1OfSectionLaw) (1, NbEdge);
|
||||
|
||||
constexpr Standard_Real tol = Precision::Confusion();
|
||||
Standard_Real tol = Precision::Confusion();
|
||||
mySurface = totalsurf(myEdges->Array2(),myShapes.Length(),NbEdge,
|
||||
myParams,w1Point,w2Point,uclosed,vclosed,tol);
|
||||
|
||||
|
@@ -1913,8 +1913,8 @@ void CutCurve (const Handle(Geom2d_TrimmedCurve)& C,
|
||||
Standard_Real UF,UL,UC;
|
||||
Standard_Real Step;
|
||||
gp_Pnt2d PF,PL,PC;
|
||||
constexpr Standard_Real PTol = Precision::PConfusion()*10;
|
||||
constexpr Standard_Real Tol = Precision::Confusion()*10;
|
||||
Standard_Real PTol = Precision::PConfusion()*10;
|
||||
Standard_Real Tol = Precision::Confusion()*10;
|
||||
Standard_Boolean YaCut = Standard_False;
|
||||
|
||||
UF = C->FirstParameter();
|
||||
@@ -2141,7 +2141,7 @@ Standard_Boolean VertexFromNode (const Handle(MAT_Node)& aNode,
|
||||
TopoDS_Vertex& VN)
|
||||
{
|
||||
Standard_Boolean Status;
|
||||
constexpr Standard_Real Tol = Precision::Confusion();
|
||||
Standard_Real Tol = Precision::Confusion();
|
||||
BRep_Builder B;
|
||||
|
||||
if (!aNode->Infinite() && Abs(aNode->Distance()-Offset) < Tol) {
|
||||
@@ -2243,7 +2243,7 @@ void TrimEdge (const TopoDS_Edge& E,
|
||||
// otherwise preserve only one of its representations.
|
||||
//----------------------------------------------------------
|
||||
if (!BRep_Tool::Degenerated(E)) {
|
||||
constexpr Standard_Real aParTol = 2.0 * Precision::PConfusion();
|
||||
Standard_Real aParTol = 2.0 * Precision::PConfusion();
|
||||
for (Standard_Integer k = 1; k < TheVer.Length(); k ++) {
|
||||
if (TheVer.Value(k).IsSame(TheVer.Value(k+1)) ||
|
||||
Abs(ThePar.Value(k)-ThePar.Value(k+1)) <= aParTol) {
|
||||
@@ -2487,7 +2487,7 @@ static void CheckBadEdges(const TopoDS_Face& Spine, const Standard_Real Offset,
|
||||
{
|
||||
|
||||
TopoDS_Face F = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
|
||||
constexpr Standard_Real eps = Precision::Confusion();
|
||||
Standard_Real eps = Precision::Confusion();
|
||||
Standard_Real LimCurv = 1./Offset;
|
||||
|
||||
TopTools_MapOfShape aMap;
|
||||
|
@@ -501,7 +501,7 @@ TopoDS_Shape BRepFill_Pipe::Section(const TopoDS_Vertex& VSpine) const
|
||||
|
||||
TopoDS_Wire BRepFill_Pipe::PipeLine(const gp_Pnt& Point)
|
||||
{
|
||||
// Positioning
|
||||
// Postioning
|
||||
gp_Pnt P;
|
||||
P = Point;
|
||||
P.Transform(myTrsf);
|
||||
|
@@ -1155,7 +1155,7 @@ void BRepFill_PipeShell::Generated(const TopoDS_Shape& theShape,
|
||||
|
||||
//=======================================================================
|
||||
//function : Place
|
||||
//purpose : Implement a Section in the local reference frame
|
||||
//purpose : Implement a Section in the local refernce frame
|
||||
// and return its parameter on the trajectory
|
||||
//=======================================================================
|
||||
void BRepFill_PipeShell::Place(const BRepFill_Section& Sec,
|
||||
|
@@ -48,7 +48,7 @@ class BRepFill_PipeShell;
|
||||
DEFINE_STANDARD_HANDLE(BRepFill_PipeShell, Standard_Transient)
|
||||
|
||||
//! Computes a topological shell using some wires
|
||||
//! (spines and profiles) and displacement option
|
||||
//! (spines and profiles) and diplacement option
|
||||
//! Perform general sweeping construction
|
||||
class BRepFill_PipeShell : public Standard_Transient
|
||||
{
|
||||
@@ -116,7 +116,7 @@ public:
|
||||
//! to be C0.
|
||||
//! Give section to sweep.
|
||||
//! Possibilities are :
|
||||
//! - Give one or several profile
|
||||
//! - Give one or sevral profile
|
||||
//! - Give one profile and an homotetic law.
|
||||
//! - Automatic compute of correspondence between profile, and section on the sweeped shape
|
||||
//! - correspondence between profile, and section on the sweeped shape defined by a vertex of the spine
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
Standard_EXPORT void SetTransition (const BRepFill_TransitionStyle Mode = BRepFill_Modified, const Standard_Real Angmin = 1.0e-2, const Standard_Real Angmax = 6.0);
|
||||
|
||||
//! Perform simulation of the sweep :
|
||||
//! Some Section are returned.
|
||||
//! Somes Section are returned.
|
||||
Standard_EXPORT void Simulate (const Standard_Integer NumberOfSection, TopTools_ListOfShape& Sections);
|
||||
|
||||
//! Builds the resulting shape (redefined from MakeShape).
|
||||
|
@@ -125,8 +125,7 @@ BRepFill_SectionPlacement(const Handle(BRepFill_LocationLaw)& Law,
|
||||
Ex.Next();
|
||||
|
||||
if( Ex.More() ) {
|
||||
Standard_Real tolrac, epsV;
|
||||
constexpr Standard_Real tol = Precision::Confusion();
|
||||
Standard_Real tolrac, epsV, tol = Precision::Confusion();
|
||||
GeomConvert_CompCurveToBSplineCurve Conv(TC);
|
||||
for (; Ex.More(); Ex.Next()) {
|
||||
E = TopoDS::Edge(Ex.Current());
|
||||
@@ -290,8 +289,8 @@ BRepFill_SectionPlacement(const Handle(BRepFill_LocationLaw)& Law,
|
||||
|
||||
Place.Perform(adpPath, Precision::Confusion());
|
||||
|
||||
Standard_Real theParam = Place.ParameterOnPath();
|
||||
constexpr Standard_Real eps = Precision::PConfusion();
|
||||
Standard_Real theParam = Place.ParameterOnPath(),
|
||||
eps = Precision::PConfusion();
|
||||
|
||||
#ifdef OCCT_DEBUG
|
||||
if (myDebug) {
|
||||
|
@@ -2890,7 +2890,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
|
||||
|
||||
//=======================================================================
|
||||
//function : Build
|
||||
//purpose : Construct the result of sweeping
|
||||
//purpose : Construt the result of sweeping
|
||||
//======================================================================
|
||||
void BRepFill_Sweep::Build(TopTools_MapOfShape& ReversedEdges,
|
||||
BRepFill_DataMapOfShapeHArray2OfShape& Tapes,
|
||||
|
@@ -64,7 +64,7 @@ public:
|
||||
//! Tolerance To controle Corner management.
|
||||
//!
|
||||
//! If the discontinuity is lesser than <AngleMin> in radian The
|
||||
//! Transition Performed will be always "Modified"
|
||||
//! Transition Performed will be alway "Modified"
|
||||
Standard_EXPORT void SetAngularControl (const Standard_Real AngleMin = 0.01, const Standard_Real AngleMax = 6.0);
|
||||
|
||||
//! Set the flag that indicates attempt to approximate
|
||||
@@ -72,13 +72,13 @@ public:
|
||||
//! to be C0.
|
||||
Standard_EXPORT void SetForceApproxC1 (const Standard_Boolean ForceApproxC1);
|
||||
|
||||
//! Build the Sweep Surface
|
||||
//! Build the Sweep Surface
|
||||
//! Transition define Transition strategy
|
||||
//! Approx define Approximation Strategy
|
||||
//! - GeomFill_Section : The composed Function Location X Section
|
||||
//! is directly approximated.
|
||||
//! - GeomFill_Location : The location law is approximated, and the
|
||||
//! SweepSurface builds an algebraic composition
|
||||
//! SweepSurface is bulid algebric composition
|
||||
//! of approximated location law and section law
|
||||
//! This option is Ok, if Section.Surface() methode
|
||||
//! is effective.
|
||||
|
@@ -177,7 +177,7 @@ static void EvalParameters(const Geom2dAdaptor_Curve& Bis,
|
||||
TColgp_SequenceOfPnt& Params)
|
||||
{
|
||||
Geom2dInt_GInter Intersector;
|
||||
constexpr Standard_Real Tol = Precision::Confusion();
|
||||
Standard_Real Tol = Precision::Confusion();
|
||||
// Standard_Real TolC = 1.e-9;
|
||||
|
||||
const Geom2dAdaptor_Curve& CBis(Bis);
|
||||
@@ -519,7 +519,7 @@ void BRepFill_TrimEdgeTool::IntersectWith(const TopoDS_Edge& Edge1,
|
||||
// The tolerance can be eventually changed.
|
||||
|
||||
gp_Pnt P1,P2;
|
||||
constexpr Standard_Real Tol = 4 * 100 * Precision::PConfusion();
|
||||
Standard_Real Tol = 4 * 100 * Precision::PConfusion();
|
||||
Standard_Integer i = 1;
|
||||
Standard_Integer NbPoints = Params.Length();
|
||||
|
||||
@@ -660,7 +660,7 @@ void BRepFill_TrimEdgeTool::AddOrConfuse(const Standard_Boolean Start,
|
||||
{
|
||||
Standard_Boolean ToProj = Standard_True;
|
||||
gp_Pnt2d PBis;
|
||||
constexpr Standard_Real Tol = 10*Precision::Confusion();
|
||||
Standard_Real Tol = 10*Precision::Confusion();
|
||||
|
||||
// return curves associated to edges.
|
||||
TopLoc_Location L;
|
||||
|
@@ -548,7 +548,7 @@ static void GetRealKnots(const Standard_Real theMin,
|
||||
Standard_Integer iU = theKnots->Upper();
|
||||
Standard_Integer aStartI = 0;
|
||||
Standard_Integer aEndI = 0;
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
|
||||
while (++i < iU) {
|
||||
if (aStartI == 0 && theKnots->Value(i) > theMin + aTol)
|
||||
|
@@ -2940,7 +2940,7 @@ void BRepLib::ExtendFace(const TopoDS_Face& theF,
|
||||
|
||||
// Check if the periodic surface should become closed.
|
||||
// In this case, use the basis surface with basis bounds.
|
||||
constexpr Standard_Real anEps = Precision::PConfusion();
|
||||
const Standard_Real anEps = Precision::PConfusion();
|
||||
if (isUPeriodic && Abs(aFUMax - aFUMin - anUPeriod) < anEps)
|
||||
{
|
||||
aFUMin = aSUMin;
|
||||
|
@@ -778,8 +778,8 @@ Standard_Boolean BRepLib_FuseEdges::SameSupport(const TopoDS_Edge& E1,
|
||||
}
|
||||
|
||||
// On a presomption de confusion
|
||||
constexpr Standard_Real tollin = Precision::Confusion();
|
||||
constexpr Standard_Real tolang = Precision::Angular();
|
||||
const Standard_Real tollin = Precision::Confusion();
|
||||
const Standard_Real tolang = Precision::Angular();
|
||||
if (typC1 == STANDARD_TYPE(Geom_Line)) {
|
||||
gp_Lin li1( Handle(Geom_Line)::DownCast (C1)->Lin());
|
||||
gp_Lin li2( Handle(Geom_Line)::DownCast (C2)->Lin());
|
||||
|
@@ -781,7 +781,7 @@ void BRepLib_MakeEdge::Init(const Handle(Geom_Curve)& CC,
|
||||
Standard_Real p2 = pp2;
|
||||
Standard_Real cf = C->FirstParameter();
|
||||
Standard_Real cl = C->LastParameter();
|
||||
constexpr Standard_Real epsilon = Precision::PConfusion();
|
||||
Standard_Real epsilon = Precision::PConfusion();
|
||||
Standard_Boolean periodic = C->IsPeriodic();
|
||||
GeomAdaptor_Curve aCA(C);
|
||||
|
||||
@@ -1058,7 +1058,7 @@ void BRepLib_MakeEdge::Init(const Handle(Geom2d_Curve)& CC,
|
||||
Standard_Real p2 = pp2;
|
||||
Standard_Real cf = C->FirstParameter();
|
||||
Standard_Real cl = C->LastParameter();
|
||||
constexpr Standard_Real epsilon = Precision::PConfusion();
|
||||
Standard_Real epsilon = Precision::PConfusion();
|
||||
Standard_Boolean periodic = C->IsPeriodic();
|
||||
|
||||
|
||||
|
@@ -593,7 +593,7 @@ void BRepLib_MakeEdge2d::Init(const Handle(Geom2d_Curve)& CC,
|
||||
Standard_Real p2 = pp2;
|
||||
Standard_Real cf = C->FirstParameter();
|
||||
Standard_Real cl = C->LastParameter();
|
||||
constexpr Standard_Real epsilon = Precision::Confusion();
|
||||
Standard_Real epsilon = Precision::Confusion();
|
||||
Standard_Boolean periodic = C->IsPeriodic();
|
||||
|
||||
|
||||
@@ -632,7 +632,7 @@ void BRepLib_MakeEdge2d::Init(const Handle(Geom2d_Curve)& CC,
|
||||
if (!p1inf) P1 = C->Value(p1);
|
||||
if (!p2inf) P2 = C->Value(p2);
|
||||
|
||||
constexpr Standard_Real preci = Precision::Confusion();
|
||||
Standard_Real preci = Precision::Confusion();
|
||||
BRep_Builder B;
|
||||
|
||||
// check for closed curve
|
||||
|
@@ -559,7 +559,7 @@ void BRepLib_MakeFace::Init(const Handle(Geom_Surface)& SS,
|
||||
|
||||
// adjust periodical surface or reordonate
|
||||
// check if the values are in the natural range
|
||||
constexpr Standard_Real epsilon = Precision::PConfusion();
|
||||
Standard_Real epsilon = Precision::PConfusion();
|
||||
|
||||
BS->Bounds(umin,umax,vmin,vmax);
|
||||
|
||||
|
@@ -96,7 +96,7 @@ void BRepLib_MakeShell::Init(const Handle(Geom_Surface)& S,
|
||||
BS = RTS->BasisSurface();
|
||||
}
|
||||
myError = BRepLib_EmptyShell;
|
||||
constexpr Standard_Real tol = Precision::Confusion();
|
||||
Standard_Real tol = Precision::Confusion();
|
||||
|
||||
// Make a shell from a surface
|
||||
GeomAdaptor_Surface GS(BS,UMin,UMax,VMin,VMax);
|
||||
@@ -358,7 +358,7 @@ void BRepLib_MakeShell::Init(const Handle(Geom_Surface)& S,
|
||||
// Additional checking for degenerated edges
|
||||
Standard_Boolean isDegenerated;
|
||||
Standard_Real aFirst, aLast;
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real anActTol;
|
||||
TopExp_Explorer anExp(myShape, TopAbs_EDGE);
|
||||
for ( ; anExp.More(); anExp.Next())
|
||||
|
@@ -46,7 +46,7 @@ void BRepLib_ToolTriangulatedShape::ComputeNormals (const TopoDS_Face& theFace,
|
||||
return;
|
||||
}
|
||||
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
const Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Integer aTri[3];
|
||||
gp_Dir aNorm;
|
||||
theTris->AddNormals();
|
||||
|
@@ -541,7 +541,7 @@ TopoDS_Edge MakeEdge(const Handle(Geom2d_Curve) &theCurve,
|
||||
{
|
||||
TopoDS_Edge aNewEdge;
|
||||
BRep_Builder aBuilder;
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aFPar = theCurve->FirstParameter();
|
||||
Standard_Real aLPar = theCurve->LastParameter();
|
||||
|
||||
|
@@ -92,8 +92,8 @@ void BRepMesh_Classifier::RegisterWire(
|
||||
aPClass(1) = *p1;
|
||||
aPClass(2) = *p2;
|
||||
|
||||
constexpr Standard_Real aAngTol = Precision::Angular();
|
||||
constexpr Standard_Real aSqConfusion =
|
||||
const Standard_Real aAngTol = Precision::Angular();
|
||||
const Standard_Real aSqConfusion =
|
||||
Precision::PConfusion() * Precision::PConfusion();
|
||||
|
||||
for (Standard_Integer i = 1; i <= aNbPnts; i++)
|
||||
|
@@ -126,7 +126,7 @@ void BRepMesh_CurveTessellator::init()
|
||||
const Adaptor3d_CurveOnSurface& aCurve = myCurve.CurveOnSurface();
|
||||
const Handle(Adaptor3d_Surface)& aSurface = aCurve.GetSurface();
|
||||
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
const Standard_Real aTol = Precision::Confusion();
|
||||
const Standard_Real aDu = aSurface->UResolution(aTol);
|
||||
const Standard_Real aDv = aSurface->VResolution(aTol);
|
||||
|
||||
|
@@ -419,7 +419,7 @@ BRepMesh_GeomTool::IntFlag BRepMesh_GeomTool::IntSegSeg(
|
||||
|
||||
// Cross
|
||||
// Intersection is out of segments ranges
|
||||
constexpr Standard_Real aPrec = Precision::PConfusion();
|
||||
const Standard_Real aPrec = Precision::PConfusion();
|
||||
const Standard_Real aEndPrec = 1 - aPrec;
|
||||
for (Standard_Integer i = 0; i < 2; ++i)
|
||||
{
|
||||
@@ -492,7 +492,7 @@ Standard_Integer BRepMesh_GeomTool::classifyPoint(
|
||||
gp_XY aP1 = thePoint2 - thePoint1;
|
||||
gp_XY aP2 = thePointToCheck - thePoint1;
|
||||
|
||||
constexpr Standard_Real aPrec = Precision::PConfusion();
|
||||
const Standard_Real aPrec = Precision::PConfusion();
|
||||
const Standard_Real aSqPrec = aPrec * aPrec;
|
||||
Standard_Real aDist = Abs(aP1 ^ aP2);
|
||||
if (aDist > aPrec)
|
||||
|
@@ -67,7 +67,7 @@ BRepMesh_VertexTool::BRepMesh_VertexTool(
|
||||
myCellFilter(0., myAllocator),
|
||||
mySelector (myAllocator)
|
||||
{
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
const Standard_Real aTol = Precision::Confusion();
|
||||
SetCellSize ( aTol + 0.05 * aTol );
|
||||
SetTolerance( aTol, aTol );
|
||||
}
|
||||
|
@@ -49,7 +49,7 @@ Handle(Geom_Surface) BRepOffset::Surface(const Handle(Geom_Surface)& Surface,
|
||||
BRepOffset_Status& theStatus,
|
||||
Standard_Boolean allowC0)
|
||||
{
|
||||
constexpr Standard_Real Tol = Precision::Confusion();
|
||||
Standard_Real Tol = Precision::Confusion();
|
||||
|
||||
theStatus = BRepOffset_Good;
|
||||
Handle(Geom_Surface) Result;
|
||||
|
@@ -1044,7 +1044,7 @@ static Standard_Boolean ExtendPCurve(const Handle(Geom2d_Curve)& aPCurve,
|
||||
Handle(Geom2d_Line) aLin;
|
||||
Handle(Geom2d_TrimmedCurve) aSegment;
|
||||
Geom2dConvert_CompCurveToBSplineCurve aCompCurve(aTrCurve, Convert_RationalC1);
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aDelta = Max(a2Offset, 1.);
|
||||
|
||||
if (FirstPar > anEf - a2Offset) {
|
||||
@@ -1462,7 +1462,7 @@ Standard_Boolean BRepOffset_Inter2d::ExtentEdge(const TopoDS_Edge& E,TopoDS_Edge
|
||||
Handle(Geom_Line) aLin;
|
||||
Handle(Geom_TrimmedCurve) aSegment;
|
||||
GeomConvert_CompCurveToBSplineCurve aCompCurve(aTrCurve, Convert_RationalC1);
|
||||
constexpr Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
Standard_Real aDelta = Max(a2Offset, 1.);
|
||||
|
||||
if (FirstPar > anEf - a2Offset) {
|
||||
@@ -1523,7 +1523,7 @@ static Standard_Boolean UpdateVertex(const TopoDS_Vertex& V,
|
||||
Standard_Real Of = OC.FirstParameter(); Standard_Real Ol = OC.LastParameter();
|
||||
Standard_Real Nf = NC.FirstParameter(); Standard_Real Nl = NC.LastParameter();
|
||||
Standard_Real U = 0.;
|
||||
constexpr Standard_Real ParTol = Precision::PConfusion();
|
||||
Standard_Real ParTol = Precision::PConfusion();
|
||||
gp_Pnt P = BRep_Tool::Pnt(V);
|
||||
Standard_Boolean OK = Standard_False;
|
||||
|
||||
|
@@ -4573,7 +4573,7 @@ Standard_Boolean TrimEdge(TopoDS_Edge& NE,
|
||||
BOPTools_AlgoTools::MakeSplitEdge(NE, V1, aT1, V2, aT2, aSourceEdge);
|
||||
//
|
||||
//
|
||||
constexpr Standard_Real aSameParTol = Precision::Confusion();
|
||||
Standard_Real aSameParTol = Precision::Confusion();
|
||||
|
||||
Standard_Real U = 0.;
|
||||
Standard_Real UMin = Precision::Infinite();
|
||||
|
@@ -1252,7 +1252,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
|
||||
if ( IsClosed)
|
||||
Edge4 = Edge3;
|
||||
|
||||
constexpr Standard_Real TolApp = Precision::Approximation();
|
||||
Standard_Real TolApp = Precision::Approximation();
|
||||
|
||||
Handle(Geom2d_Line) L1,L2;
|
||||
if ( IsClosed) {
|
||||
|
@@ -326,7 +326,7 @@ static void BuildPCurves (const TopoDS_Edge& E,
|
||||
if (!C2d.IsNull()) return;
|
||||
|
||||
//Standard_Real Tolerance = Max(Precision::Confusion(),BRep_Tool::Tolerance(E));
|
||||
constexpr Standard_Real Tolerance = Precision::Confusion();
|
||||
Standard_Real Tolerance = Precision::Confusion();
|
||||
|
||||
BRepAdaptor_Surface AS(F,0);
|
||||
BRepAdaptor_Curve AC(E);
|
||||
@@ -586,7 +586,7 @@ Standard_Boolean BRepOffset_Tool::FindCommonShapes(const TopoDS_Shape& theS1,
|
||||
|
||||
static Standard_Boolean ToSmall (const Handle(Geom_Curve)& C)
|
||||
{
|
||||
constexpr Standard_Real Tol = 10*Precision::Confusion();
|
||||
Standard_Real Tol = 10*Precision::Confusion();
|
||||
Standard_Real m = (C->FirstParameter()*0.668 + C->LastParameter()*0.332);
|
||||
gp_Pnt P1 = C->Value(C->FirstParameter());
|
||||
gp_Pnt P2 = C->Value(C->LastParameter());
|
||||
@@ -1530,7 +1530,7 @@ void BRepOffset_Tool::Inter3D(const TopoDS_Face& F1,
|
||||
}
|
||||
}
|
||||
|
||||
constexpr Standard_Real aSameParTol = Precision::Confusion();
|
||||
Standard_Real aSameParTol = Precision::Confusion();
|
||||
Standard_Boolean isEl1 = Standard_False, isEl2 = Standard_False;
|
||||
|
||||
Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F1);
|
||||
@@ -2519,7 +2519,7 @@ static void MakeFace(const Handle(Geom_Surface)& S,
|
||||
|
||||
// compute vertices
|
||||
BRep_Builder B;
|
||||
constexpr Standard_Real tol = Precision::Confusion();
|
||||
Standard_Real tol = Precision::Confusion();
|
||||
|
||||
TopoDS_Vertex V00,V10,V11,V01;
|
||||
|
||||
@@ -3716,7 +3716,7 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F,
|
||||
TopoDS_Vertex NV1,NV2;
|
||||
TopAbs_Orientation Or;
|
||||
Standard_Real U1,U2;
|
||||
constexpr Standard_Real eps = Precision::Confusion();
|
||||
Standard_Real eps = Precision::Confusion();
|
||||
|
||||
#ifdef OCCT_DEBUG
|
||||
TopLoc_Location L;
|
||||
@@ -3969,7 +3969,7 @@ static Standard_Boolean IsInOut (BRepTopAdaptor_FClass2d& FC,
|
||||
const Geom2dAdaptor_Curve& AC,
|
||||
const TopAbs_State& S )
|
||||
{
|
||||
constexpr Standard_Real Def = 100*Precision::Confusion();
|
||||
Standard_Real Def = 100*Precision::Confusion();
|
||||
GCPnts_QuasiUniformDeflection QU(AC,Def);
|
||||
|
||||
for (Standard_Integer i = 1; i <= QU.NbPoints(); i++) {
|
||||
|
@@ -37,7 +37,7 @@ class TopoDS_Edge;
|
||||
//! - define if necessary a new tolerance
|
||||
//! - set if necessary analysis of degenerated shapes off
|
||||
//! - add shapes to be controlled -> Add
|
||||
//! - compute -> Perform
|
||||
//! - compute -> Perfom
|
||||
//! - output couples of connected edges for control
|
||||
//! - output the problems if any
|
||||
class BRepOffsetAPI_FindContigousEdges
|
||||
|
@@ -166,7 +166,7 @@ void BRepOffsetAPI_MakeOffset::Init(const GeomAbs_JoinType Join,
|
||||
//=======================================================================
|
||||
//function : SetApprox
|
||||
//purpose : Set approximation flag
|
||||
// for conversion input contours into ones consisting of
|
||||
// for convertion input contours into ones consisting of
|
||||
// 2D circular arcs and 2D linear segments only
|
||||
//=======================================================================
|
||||
|
||||
|
@@ -64,7 +64,7 @@ public:
|
||||
Standard_EXPORT void Init (const GeomAbs_JoinType Join = GeomAbs_Arc, const Standard_Boolean IsOpenResult = Standard_False);
|
||||
|
||||
//! Set approximation flag
|
||||
//! for conversion input contours into ones consisting of
|
||||
//! for convertion input contours into ones consisting of
|
||||
//! 2D circular arcs and 2D linear segments only.
|
||||
Standard_EXPORT void SetApprox (const Standard_Boolean ToApprox);
|
||||
|
||||
|
@@ -114,7 +114,7 @@ public:
|
||||
const Standard_Boolean RemoveIntEdges = Standard_False,
|
||||
const Message_ProgressRange& theRange = Message_ProgressRange());
|
||||
|
||||
//! Returns instance of the underlying intersection / arc algorithm.
|
||||
//! Returns instance of the unrelying intersection / arc algorithm.
|
||||
Standard_EXPORT virtual const BRepOffset_MakeOffset& MakeOffset() const;
|
||||
|
||||
//! Does nothing.
|
||||
|
@@ -112,7 +112,7 @@ public:
|
||||
//! along the path.
|
||||
//! Give section to sweep.
|
||||
//! Possibilities are :
|
||||
//! - Give one or several section
|
||||
//! - Give one or sevral section
|
||||
//! - Give one profile and an homotetic law.
|
||||
//! - Automatic compute of correspondence between spine, and section
|
||||
//! on the sweeped shape
|
||||
|
@@ -138,7 +138,7 @@ static Standard_Boolean IsValidEdge(const TopoDS_Edge& theEdge,
|
||||
TopoDS_Vertex V1, V2;
|
||||
TopExp::Vertices(theEdge, V1, V2);
|
||||
|
||||
constexpr Standard_Real Tol = Precision::Confusion();
|
||||
Standard_Real Tol = Precision::Confusion();
|
||||
Standard_Integer i;
|
||||
|
||||
TopExp_Explorer Explo(theFace, TopAbs_EDGE);
|
||||
|
@@ -99,7 +99,7 @@
|
||||
static Standard_Real PreciseUpar(const Standard_Real anUpar,
|
||||
const Handle(Geom_BSplineSurface)& aSurface)
|
||||
{
|
||||
constexpr Standard_Real Tol = Precision::PConfusion();
|
||||
Standard_Real Tol = Precision::PConfusion();
|
||||
Standard_Integer i1, i2;
|
||||
|
||||
aSurface->LocateU(anUpar, Tol, i1, i2);
|
||||
|
@@ -89,7 +89,7 @@ Standard_Boolean BRepSweep_Trsf::Process(const TopoDS_Shape& aGenS,
|
||||
void BRepSweep_Trsf::SetContinuity(const TopoDS_Shape& aGenS,
|
||||
const Sweep_NumShape& aDirS)
|
||||
{
|
||||
constexpr Standard_Real tl = Precision::Confusion();
|
||||
Standard_Real tl = Precision::Confusion(), tol3d;
|
||||
//angular etant un peu severe pour les contours sketches.
|
||||
Standard_Real ta = 0.00175;//environ 0.1 degre
|
||||
GeomAbs_Shape cont;
|
||||
@@ -103,7 +103,7 @@ void BRepSweep_Trsf::SetContinuity(const TopoDS_Shape& aGenS,
|
||||
TopExp::Vertices(E,d,f);
|
||||
if(d.IsSame(f)){
|
||||
// tol3d = Max(tl,BRep_Tool::Tolerance(d));
|
||||
const Standard_Real tol3d = Max(tl,2.*BRep_Tool::Tolerance(d));//IFV 24.05.00 buc60684
|
||||
tol3d = Max(tl,2.*BRep_Tool::Tolerance(d));//IFV 24.05.00 buc60684
|
||||
e.Initialize(E);
|
||||
ud = BRep_Tool::Parameter(d,TopoDS::Edge(aGenS));
|
||||
uf = BRep_Tool::Parameter(f,TopoDS::Edge(aGenS));
|
||||
@@ -155,7 +155,7 @@ void BRepSweep_Trsf::SetContinuity(const TopoDS_Shape& aGenS,
|
||||
u1 = BRep_Tool::Parameter(V,E1);
|
||||
u2 = BRep_Tool::Parameter(V,E2);
|
||||
// tol3d = Max(tl,BRep_Tool::Tolerance(V));
|
||||
const Standard_Real tol3d = Max(tl,2.*BRep_Tool::Tolerance(V)); //IFV 24.05.00 buc60684
|
||||
tol3d = Max(tl,2.*BRep_Tool::Tolerance(V)); //IFV 24.05.00 buc60684
|
||||
e1.Initialize(E1);
|
||||
e2.Initialize(E2);
|
||||
cont = BRepLProp::Continuity(e1,e2,u1,u2,tol3d,ta);
|
||||
|
@@ -1743,7 +1743,7 @@ Standard_Integer edgeintersector(Draw_Interpretor& di,
|
||||
BRep_Builder B;
|
||||
|
||||
Standard_Integer NbV = 0;
|
||||
constexpr Standard_Real Tol = Precision::PConfusion();
|
||||
Standard_Real Tol = Precision::PConfusion();
|
||||
|
||||
Standard_Boolean rejectreducedsegmentpoints = Standard_True;
|
||||
EInter.InitPoint(rejectreducedsegmentpoints);
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user