From c5a2419e147a06519573c96cbd4137965bd54386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= Date: Thu, 26 May 2016 21:42:12 +0200 Subject: [PATCH] Extensions: Introduce classes and port App groups --- src/3rdParty/salomesmesh/CMakeLists.txt.orig | 409 + .../inc/Handle_SMESH_MeshVSLink.hxx.orig | 164 + .../inc/SMDSAbs_ElementType.hxx.orig | 105 + .../salomesmesh/inc/SMDS_MeshInfo.hxx.orig | 393 + .../salomesmesh/inc/SMESH_Gen.hxx.orig | 175 + .../salomesmesh/inc/SMESH_Mesh.hxx.orig | 400 + .../salomesmesh/inc/SMESH_MeshVSLink.hxx.orig | 329 + .../salomesmesh/inc/SMESH_MeshVSLink.ixx.orig | 154 + .../inc/StdMeshers_Hexa_3D.hxx.orig | 75 + .../inc/StdMeshers_ProjectionUtils.hxx.orig | 227 + .../src/Controls/SMESH_Controls.cpp.orig | 3333 +++++++ .../salomesmesh/src/SMESH/SMESH_Gen.cpp.orig | 785 ++ .../src/SMESH/SMESH_MeshEditor.cpp.orig | 8319 +++++++++++++++++ .../src/SMESH/SMESH_MeshVSLink.cpp.orig | 683 ++ src/App/Application.cpp | 10 +- src/App/CMakeLists.txt | 14 +- src/App/Document.cpp | 13 +- src/App/Document.h | 1 + src/App/DocumentObject.cpp | 2 +- src/App/DocumentObject.h.orig | 271 + src/App/DocumentObjectGroup.cpp | 82 +- src/App/DocumentObjectGroup.h | 40 +- src/App/Extension.cpp | 111 + src/App/Extension.h | 113 + src/App/GeoFeatureGroup.cpp | 61 +- src/App/GeoFeatureGroup.h | 22 +- src/App/ObjectIdentifier.cpp | 6 +- src/App/OriginGroup.cpp | 36 +- src/App/OriginGroup.h | 18 +- src/App/Part.cpp | 3 +- src/App/Part.h | 2 +- src/App/PartPy.xml | 4 +- src/App/PropertyLinks.cpp | 8 +- src/App/TransactionalObject.cpp | 2 +- src/App/TransactionalObject.h | 4 +- src/Base/BaseClass.h | 4 +- src/Gui/Icons/ClassBrowser/.directory | 4 + src/Gui/ViewProviderDocumentObjectGroup.cpp | 2 +- src/Gui/ViewProviderGeoFeatureGroup.cpp | 4 +- src/Gui/ViewProviderOriginGroup.cpp | 11 +- src/Gui/ViewProviderPart.cpp | 2 +- src/Gui/propertyeditor/PropertyItem.cpp | 6 +- src/Mod/Fem/App/PropertyPostDataObject.cpp | 4 +- .../Fem/App/PropertyPostDataObject.cpp.orig | 376 + src/Mod/Fem/Init.py.orig | 79 + src/Mod/Mesh/Gui/Command.cpp | 2 +- src/Mod/Part/App/PartFeaturePy.xml | 7 +- src/Mod/Part/App/PartFeaturePyImp.cpp | 6 +- src/Mod/Part/App/PropertyTopoShape.cpp | 4 +- src/Mod/PartDesign/App/FeatureGroove.cpp.orig | 208 + .../PartDesign/App/FeatureRevolution.cpp.orig | 202 + src/Mod/PartDesign/Gui/Command.cpp | 7 +- src/Mod/PartDesign/Gui/ReferenceSelection.cpp | 16 +- src/Mod/PartDesign/Gui/Utils.cpp | 4 +- src/Mod/PartDesign/Gui/ViewProviderDatum.cpp | 4 +- 55 files changed, 17135 insertions(+), 191 deletions(-) create mode 100644 src/3rdParty/salomesmesh/CMakeLists.txt.orig create mode 100644 src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/SMESH_Mesh.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.ixx.orig create mode 100644 src/3rdParty/salomesmesh/inc/StdMeshers_Hexa_3D.hxx.orig create mode 100644 src/3rdParty/salomesmesh/inc/StdMeshers_ProjectionUtils.hxx.orig create mode 100644 src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp.orig create mode 100644 src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp.orig create mode 100644 src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp.orig create mode 100644 src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshVSLink.cpp.orig create mode 100644 src/App/DocumentObject.h.orig create mode 100644 src/App/Extension.cpp create mode 100644 src/App/Extension.h create mode 100644 src/Gui/Icons/ClassBrowser/.directory create mode 100644 src/Mod/Fem/App/PropertyPostDataObject.cpp.orig create mode 100644 src/Mod/Fem/Init.py.orig create mode 100644 src/Mod/PartDesign/App/FeatureGroove.cpp.orig create mode 100644 src/Mod/PartDesign/App/FeatureRevolution.cpp.orig diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt.orig b/src/3rdParty/salomesmesh/CMakeLists.txt.orig new file mode 100644 index 000000000000..491e9f169c7e --- /dev/null +++ b/src/3rdParty/salomesmesh/CMakeLists.txt.orig @@ -0,0 +1,409 @@ +# SGEOM cmake build file +#PROJECT(SMESH Fortran CXX) + +SET(SMESH_VERSION_MAJOR 5) +SET(SMESH_VERSION_MINOR 1) +SET(SMESH_VERSION_PATCH 2) +SET(SMESH_VERSION_TWEAK 2) + +if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment") +elseif(CMAKE_COMPILER_IS_CLANGXX) + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-private-field -Wno-unused-function -Wno-sometimes-uninitialized -Wno-overloaded-virtual -Wno-dynamic-class-memaccess -Wno-comment") +endif() + +if(CMAKE_COMPILER_IS_CLANGXX) + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-self-assign -Wno-reorder -Wno-switch-enum -Wno-unknown-pragmas -Wno-logical-op-parentheses -Wno-unused-variable -Wno-unused-function -Wno-overloaded-virtual") +endif() + +<<<<<<< HEAD +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +======= +include(${VTK_USE_FILE}) +>>>>>>> 901e260... FEM: Make SMESH7 compile with occ6 +include_directories( + src/SMDS + src/Driver + src/DriverUNV + src/DriverDAT + src/DriverSTL + src/StdMeshers + inc + ${CMAKE_BINARY_DIR}/src + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR} + ${Boost_INCLUDE_DIRS} + ${OCC_INCLUDE_DIR} + ${NGLIB_INCLUDE_DIR} + ${NETGEN_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} +) +link_directories(${OCC_LIBRARY_DIR}) + +if(MSVC) + if(BUILD_FEM_NETGEN) + set(SMESH_LIBS + debug MSVCRTD.LIB + debug MSVCPRTD.LIB + optimized MSVCRT.LIB + optimized MSVCPRT.LIB + Rpcrt4.lib + ${NGLIB_LIBRARIES} + ${NGLIB_DEBUG_LIBRARIES} + ${OCC_LIBRARIES} + ${OCC_DEBUG_LIBRARIES} + ${OCC_OCAF_DEBUG_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) + ADD_DEFINITIONS(${NETGEN_DEFINITIONS}) + else(BUILD_FEM_NETGEN) + set(SMESH_LIBS + debug MSVCRTD.LIB + debug MSVCPRTD.LIB + optimized MSVCRT.LIB + optimized MSVCPRT.LIB + Rpcrt4.lib + ${OCC_LIBRARIES} + ${OCC_DEBUG_LIBRARIES} + ${OCC_OCAF_DEBUG_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) + endif(BUILD_FEM_NETGEN) +else(MSVC) + if(BUILD_FEM_NETGEN) + set(SMESH_LIBS + ${NGLIB_LIBRARIES} + ${OCC_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) + ADD_DEFINITIONS(${NETGEN_DEFINITIONS}) + else(BUILD_FEM_NETGEN) + set(SMESH_LIBS + ${OCC_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) + endif(BUILD_FEM_NETGEN) +endif(MSVC) + + +#SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode +#SET(BUILD_SHARED_LIBS ON) +#SET(LIBRARY_OUTPUT_PATH cmake-build) +SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +#INCLUDE_DIRECTORIES(inc) + +############# +# FindBoost # +############# +#FIND_PACKAGE(Boost REQUIRED) +#MESSAGE("-- Boost found: ${Boost_FOUND}") +#INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) +#MESSAGE("Popo: ${Boost_INCLUDE_DIR}") + + +######################################## +# OpenCASCADE include and lib location # +######################################## +# Find OpenCASCADE library, set include and lib path +#SET(OCC_INCLUDE_PATH ${OCC_INCLUDE_DIR}) +#SET(OCC_LIB_PATH ${OCC_LIBRARY_DIR}) + +# Tells CMake where are the required headers +#INCLUDE_DIRECTORIES(${OCC_INCLUDE_PATH}) +#LINK_DIRECTORIES(${OCC_LIB_PATH}) + + +############################ +# Check 32/64 bit platform # +############################ +IF (${CMAKE_SIZEOF_VOID_P} MATCHES "8") # It is 64bit, 32 bit systems returns 4 + ADD_DEFINITIONS(-D_OCC64) + IF(CMAKE_COMPILER_IS_GNUCXX) + # 0001715: Mefisto Mesh Fails since translated by f2c + # ADD_DEFINITIONS(-DPCLINUX64) + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + #MESSAGE("-- Build 64bit") +ELSE (${CMAKE_SIZEOF_VOID_P} MATCHES "8") + #MESSAGE("-- Build 32bit") +ENDIF(${CMAKE_SIZEOF_VOID_P} MATCHES "8") + +###################################################### +# Configure Build settings according to the platform # +###################################################### +IF(UNIX) + # Same settings are used for both MacOSX and Unix/Linux + ADD_DEFINITIONS(-DHAVE_CONFIG_H -DHAVE_LIMITS_H -DCSFDB -DLIN -DOCC_CONVERT_SIGNALS) +ELSE(UNIX) + IF(WIN32) + ######### Windows ########### + #MESSAGE("-- Windows system detected") + IF(MSVC) + ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4267 /wd4390) + ELSE(MSVC) + ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB) + ENDIF(MSVC) + ELSE(WIN32) + MESSAGE("Unknown platform") + ENDIF(WIN32) +ENDIF(UNIX) + +######### +# SMDS # +######### +FILE(GLOB SMDS_source_files src/SMDS/*.cpp inc/SMDS*.hxx) +ADD_LIBRARY(SMDS SHARED ${SMDS_source_files}) +TARGET_LINK_LIBRARIES(SMDS ${SMESH_LIBS}) + +SET_BIN_DIR(SMDS SMDS) +if(WIN32) + set_target_properties(SMDS PROPERTIES COMPILE_FLAGS "-DSMDS_EXPORTS") +endif(WIN32) + + +########## +# Driver # +########## +FILE(GLOB Driver_source_files src/Driver/*.cpp inc/Driver_*.hxx) +ADD_LIBRARY(Driver SHARED ${Driver_source_files}) +TARGET_LINK_LIBRARIES(Driver ${SMESH_LIBS}) + +SET_BIN_DIR(Driver Driver) +if(WIN32) + set_target_properties(Driver PROPERTIES COMPILE_FLAGS "-DMESHDRIVER_EXPORTS") +endif(WIN32) + + +#IF(WIN32) +# SET_TARGET_PROPERTIES(Driver PROPERTIES COMPILE_FLAGS "-DMESHDRIVER_EXPORTS") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(Driver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + +############# +# DriverSTL # +############# +FILE(GLOB DriverSTL_source_files src/DriverSTL/*.cpp inc/DriverSTL*.h*) +ADD_LIBRARY(DriverSTL SHARED ${DriverSTL_source_files}) +TARGET_LINK_LIBRARIES(DriverSTL ${SMESH_LIBS} Driver SMDS) + +SET_BIN_DIR(DriverSTL DriverSTL) +if(WIN32) + set_target_properties(DriverSTL PROPERTIES COMPILE_FLAGS "-DMESHDRIVERSTL_EXPORTS") +endif(WIN32) + + +#TARGET_LINK_LIBRARIES(DriverSTL TKernel TKMath Driver SMDS) +#IF(WIN32) +# SET_TARGET_PROPERTIES(DriverSTL PROPERTIES COMPILE_FLAGS "-DMESHDRIVERSTL_EXPORTS") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(DriverSTL PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + +############# +# DriverDAT # +############# +FILE(GLOB DriverDAT_source_files src/DriverDAT/*.cpp inc/DriverDAT*.h*) +ADD_LIBRARY(DriverDAT SHARED ${DriverDAT_source_files}) +TARGET_LINK_LIBRARIES(DriverDAT ${SMESH_LIBS} SMDS Driver) + +SET_BIN_DIR(DriverDAT DriverDAT) +if(WIN32) + set_target_properties(DriverDAT PROPERTIES COMPILE_FLAGS "-DMESHDRIVERDAT_EXPORTS") +endif(WIN32) + + +#IF(WIN32) +# SET_TARGET_PROPERTIES(DriverDAT PROPERTIES COMPILE_FLAGS "-DMESHDRIVERDAT_EXPORTS") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(DriverDAT PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + +############# +# DriverUNV # +############# +FILE(GLOB DriverUNV_source_files src/DriverUNV/*.cpp inc/DriverUNV*.h*) +ADD_LIBRARY(DriverUNV SHARED ${DriverUNV_source_files}) +TARGET_LINK_LIBRARIES(DriverUNV ${SMESH_LIBS} SMESHDS SMDS Driver) + +SET_BIN_DIR(DriverUNV DriverUNV) +if(WIN32) + set_target_properties(DriverUNV PROPERTIES COMPILE_FLAGS "-DMESHDRIVERUNV_EXPORTS") +endif(WIN32) + + +#IF(WIN32) +# SET_TARGET_PROPERTIES(DriverUNV PROPERTIES COMPILE_FLAGS "-DMESHDRIVERUNV_EXPORTS") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(DriverUNV PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + +########### +# SMESHDS # +########### +FILE(GLOB SMESHDS_source_files src/SMESHDS/*.cpp inc/SMESHDS_*.h*) +ADD_LIBRARY(SMESHDS SHARED ${SMESHDS_source_files}) +TARGET_LINK_LIBRARIES(SMESHDS ${SMESH_LIBS} SMDS ) + +SET_BIN_DIR(SMESHDS SMESHDS) + + +#IF(MINGW) +# SET_TARGET_PROPERTIES(SMESHDS PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + +######### +# SMESH # +######### +FILE(GLOB SMESH_source_files src/SMESH/*.cpp src/Controls/*.cpp inc/SMESH_*.h*) +ADD_LIBRARY(SMESH SHARED ${SMESH_source_files}) +TARGET_LINK_LIBRARIES(SMESH SMDS SMESHDS Driver DriverSTL DriverDAT DriverUNV ${SMESH_LIBS}) + +SET_BIN_DIR(SMESH SMESH) +if(WIN32) + set_target_properties(SMESH PROPERTIES COMPILE_FLAGS "-DSMESH_EXPORTS -DSMESHCONTROLS_EXPORTS -DSMESHimpl_EXPORTS") +endif(WIN32) + + + #IF(WIN32) +# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DSMESHimpl_EXPORTS -DSMESHCONTROLS_EXPORTS") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(SMESH PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + + +############## +# MEFISTO2 # +############## +#if (MSVC) + #IF(CMAKE_SIZEOF_VOID_P EQUAL 8) + # # Mefisto2f.lib was built using f2c which created + # # all function names with an '_' at the end. + # FILE(GLOB MEFISTO2_source_files + # src/MEFISTO2/*.cpp + # inc/Rn.h + # inc/aptrte.h + # ) + #ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) + # FILE(GLOB MEFISTO2_source_files + # src/MEFISTO2/*.cpp + # src/MEFISTO2/MEFISTO2F.def + # inc/Rn.h + # inc/aptrte.h + # ) + #ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8) + + set(MEFISTO2_source_files + src/MEFISTO2/aptrte.cpp + src/MEFISTO2/trte.c + inc/Rn.h + inc/aptrte.h + ) + +#else(MSVC) +# FILE(GLOB MEFISTO2_source_files +# src/MEFISTO2/*.cpp +# src/MEFISTO2/trte.f +# inc/Rn.h +# inc/aptrte.h +# ) +#endif(MSVC) + +ADD_LIBRARY(MEFISTO2 SHARED ${MEFISTO2_source_files}) + +SET_BIN_DIR(MEFISTO2 MEFISTO2) +#if(MSVC) + TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS}) # in case of Windows link the prebuild Fortran lib + set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") +# if(CMAKE_SIZEOF_VOID_P EQUAL 8) +# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") +# else(CMAKE_SIZEOF_VOID_P EQUAL 8) +# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS -D__WATCOM__") +# endif(CMAKE_SIZEOF_VOID_P EQUAL 8) +#elseif(MINGW) +# TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran) +# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS") +#else(MSVC) +# TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran) +# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "${MEFISTO2_CFLAGS}") +#endif(MSVC) + + +############## +# StdMeshers # +############## +FILE(GLOB StdMeshers_source_files src/StdMeshers/*.cpp inc/StdMeshers_*.h*) +ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files}) +TARGET_LINK_LIBRARIES(StdMeshers SMESH ${SMESH_LIBS} MEFISTO2) + +SET_BIN_DIR(StdMeshers StdMeshers) +if(WIN32) + set_target_properties(StdMeshers PROPERTIES COMPILE_FLAGS "-DSTDMESHERS_EXPORTS") +else(WIN32) + set_target_properties(StdMeshers PROPERTIES COMPILE_FLAGS "${StdMeshers_CFLAGS}") +endif(WIN32) + + +#SET(StdMeshers_CFLAGS "") +#IF(WIN32) +# SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(StdMeshers PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + +# Disable for all other compilers but MSVC +if (BUILD_FEM_NETGEN) + +################ +# NETGENPlugin # +################ +FILE(GLOB NETGENPlugin_source_files src/NETGENPlugin/*.cpp inc/NETGENPlugin_*.h* ) +ADD_LIBRARY(NETGENPlugin SHARED ${NETGENPlugin_source_files}) +TARGET_LINK_LIBRARIES(NETGENPlugin SMDS SMESHDS SMESH StdMeshers ${SMESH_LIBS} ) + +SET_BIN_DIR(NETGENPlugin NETGENPlugin) +if(WIN32) + set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "-DNETGENPLUGIN_EXPORTS -DNO_PARALLEL_THREADS -DOCCGEOMETRY -DNETGEN_V5") +endif(WIN32) + +endif (BUILD_FEM_NETGEN) + +#IF(WIN32) +# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DNETGENPluginimpl_EXPORTS ") +#ENDIF(WIN32) +#IF(MINGW) +# SET_TARGET_PROPERTIES(SMESH PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#ENDIF(MINGW) + + +if(WIN32) + INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) +else(WIN32) + INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +endif(WIN32) + +if (BUILD_FEM_NETGEN) + if(WIN32) + INSTALL(TARGETS NETGENPlugin + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) + else(WIN32) + INSTALL(TARGETS NETGENPlugin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + endif(WIN32) +endif (BUILD_FEM_NETGEN) + diff --git a/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx.orig b/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx.orig new file mode 100644 index 000000000000..aa38d377595b --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx.orig @@ -0,0 +1,164 @@ +<<<<<<< bca7a1866e596ad2e318809f35b6d08776226a69 +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +#ifndef _Handle_SMESH_MeshVSLink_HeaderFile +#define _Handle_SMESH_MeshVSLink_HeaderFile + +#ifndef _Standard_Macro_HeaderFile +#include +#endif +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _Standard_Version_HeaderFile +#include +#endif + +#if OCC_VERSION_HEX < 0x070000 +#ifndef _Handle_MeshVS_DataSource3D_HeaderFile +#include +#endif + +class Standard_Transient; +class Handle_Standard_Type; +class Handle(MeshVS_DataSource3D); +class SMESH_MeshVSLink; + +Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SMESH_MeshVSLink); + +class Handle(SMESH_MeshVSLink) : public Handle(MeshVS_DataSource3D) { + public: + Handle(SMESH_MeshVSLink)():Handle(MeshVS_DataSource3D)() {} + Handle(SMESH_MeshVSLink)(const Handle(SMESH_MeshVSLink)& aHandle) : Handle(MeshVS_DataSource3D)(aHandle) + { + } + + Handle(SMESH_MeshVSLink)(const SMESH_MeshVSLink* anItem) : Handle(MeshVS_DataSource3D)((MeshVS_DataSource3D *)anItem) + { + } + + Handle(SMESH_MeshVSLink)& operator=(const Handle(SMESH_MeshVSLink)& aHandle) + { + Assign(aHandle.Access()); + return *this; + } + + Handle(SMESH_MeshVSLink)& operator=(const SMESH_MeshVSLink* anItem) + { + Assign((Standard_Transient *)anItem); + return *this; + } + + SMESH_MeshVSLink* operator->() const + { + return (SMESH_MeshVSLink *)ControlAccess(); + } + + Standard_EXPORT static const Handle(SMESH_MeshVSLink) DownCast(const Handle(Standard_Transient)& AnObject); +}; +#endif // OCC_VERSION_HEX < 0x070000 +#endif +======= +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +#ifndef _Handle_SMESH_MeshVSLink_HeaderFile +#define _Handle_SMESH_MeshVSLink_HeaderFile + +#ifndef _Standard_Macro_HeaderFile +#include +#endif +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _Handle_MeshVS_DataSource3D_HeaderFile +//#include +#include +#endif + +class Standard_Transient; +class Handle_Standard_Type; +class Handle(MeshVS_DataSource3D); +class SMESH_MeshVSLink; + +Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SMESH_MeshVSLink); + +class Handle(SMESH_MeshVSLink) : public Handle(MeshVS_DataSource3D) { + public: + Handle(SMESH_MeshVSLink)():Handle(MeshVS_DataSource3D)() {} + Handle(SMESH_MeshVSLink)(const Handle(SMESH_MeshVSLink)& aHandle) : Handle(MeshVS_DataSource3D)(aHandle) + { + } + + Handle(SMESH_MeshVSLink)(const SMESH_MeshVSLink* anItem) : Handle(MeshVS_DataSource3D)((MeshVS_DataSource3D *)anItem) + { + } + + Handle(SMESH_MeshVSLink)& operator=(const Handle(SMESH_MeshVSLink)& aHandle) + { + Assign(aHandle.Access()); + return *this; + } + + Handle(SMESH_MeshVSLink)& operator=(const SMESH_MeshVSLink* anItem) + { + Assign((Standard_Transient *)anItem); + return *this; + } + + SMESH_MeshVSLink* operator->() const + { + return (SMESH_MeshVSLink *)ControlAccess(); + } + + Standard_EXPORT static const Handle(SMESH_MeshVSLink) DownCast(const Handle(Standard_Transient)& AnObject); +}; +#endif +>>>>>>> upgrade to SMESH7.7.1 diff --git a/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx.orig b/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx.orig new file mode 100644 index 000000000000..d13e6b0c48d8 --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx.orig @@ -0,0 +1,105 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMDS : implementaion of Salome mesh data structure +// File : SMDSAbs_ElementType.hxx +// Module : SMESH +// +#ifndef _SMDSAbs_ElementType_HeaderFile +#define _SMDSAbs_ElementType_HeaderFile + +/////////////////////////////////////////////////////////////////////////////// +/// Type (node, edge, face or volume) of elements +/////////////////////////////////////////////////////////////////////////////// +enum SMDSAbs_ElementType +{ + SMDSAbs_All, + SMDSAbs_Node, + SMDSAbs_Edge, + SMDSAbs_Face, + SMDSAbs_Volume, + SMDSAbs_NbElementTypes +}; + +/*! enumeration for element geometry type */ +enum SMDSAbs_GeometryType +{ + // 0D element + SMDSGeom_POINT, + // 1D element + SMDSGeom_EDGE, + // 2D element + SMDSGeom_TRIANGLE, + SMDSGeom_QUADRANGLE, + SMDSGeom_POLYGON, + // 3D element + SMDSGeom_TETRA, + SMDSGeom_PYRAMID, + SMDSGeom_HEXA, + SMDSGeom_PENTA, + SMDSGeom_POLYHEDRA, +}; + + +enum SMDSAbs_ElementOrder { + ORDER_ANY, /*! entities of any order */ + ORDER_LINEAR, /*! entities of 1st order */ + ORDER_QUADRATIC /*! entities of 2nd order */ +}; + +<<<<<<< HEAD +======= +/*! + * Enumeration of entity type used in mesh info array + */ +enum SMDSAbs_EntityType { + SMDSEntity_Node, + SMDSEntity_0D, + SMDSEntity_Edge, + SMDSEntity_Quad_Edge, + SMDSEntity_Triangle, + SMDSEntity_Quad_Triangle, + SMDSEntity_BiQuad_Triangle, + SMDSEntity_Quadrangle, + SMDSEntity_Quad_Quadrangle, + SMDSEntity_BiQuad_Quadrangle, + SMDSEntity_Polygon, +#ifndef VTK_NO_QUAD_POLY + SMDSEntity_Quad_Polygon, +#endif + SMDSEntity_Tetra, + SMDSEntity_Quad_Tetra, + SMDSEntity_Pyramid, + SMDSEntity_Quad_Pyramid, + SMDSEntity_Hexa, + SMDSEntity_Quad_Hexa, + SMDSEntity_TriQuad_Hexa, + SMDSEntity_Penta, + SMDSEntity_Quad_Penta, + SMDSEntity_Hexagonal_Prism, + SMDSEntity_Polyhedra, + SMDSEntity_Quad_Polyhedra, + SMDSEntity_Ball, + SMDSEntity_Last +}; + +>>>>>>> c5d257d... SMESH: Make it compatibel to VTK 6.0 +#endif diff --git a/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx.orig b/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx.orig new file mode 100644 index 000000000000..8d90cf3ad3da --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/SMDS_MeshInfo.hxx.orig @@ -0,0 +1,393 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMDS_MeshInfo.hxx +// Created : Mon Sep 24 18:32:41 2007 +// Author : Edward AGAPOV (eap) +// +#ifndef SMDS_MeshInfo_HeaderFile +#define SMDS_MeshInfo_HeaderFile + +using namespace std; + +#include "SMESH_SMDS.hxx" + +#include "SMDS_MeshElement.hxx" + +class SMDS_EXPORT SMDS_MeshInfo +{ +public: + + inline SMDS_MeshInfo(); + inline void Clear(); + + int NbNodes() const { return myNbNodes; } + + inline int NbEdges (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbFaces (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbTriangles (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbPolygons() const { return myNbPolygons; } + + inline int NbVolumes (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbTetras (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbHexas (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline int NbPrisms (SMDSAbs_ElementOrder order = ORDER_ANY) const; + int NbPolyhedrons() const { return myNbPolyhedrons; } + +private: + friend class SMDS_Mesh; + + // methods to count NOT POLY elements + inline void remove(const SMDS_MeshElement* el); + inline void add (const SMDS_MeshElement* el); + inline int index(SMDSAbs_ElementType type, int nbNodes); + // methods to remove elements of ANY kind + inline void RemoveEdge(const SMDS_MeshElement* el); + inline void RemoveFace(const SMDS_MeshElement* el); + inline void RemoveVolume(const SMDS_MeshElement* el); + + int myNbNodes; + + int myNbEdges , myNbQuadEdges ; + int myNbTriangles , myNbQuadTriangles ; + int myNbQuadrangles, myNbQuadQuadrangles; + int myNbPolygons; + + int myNbTetras , myNbQuadTetras ; + int myNbHexas , myNbQuadHexas ; + int myNbPyramids, myNbQuadPyramids; + int myNbPrisms , myNbQuadPrisms ; + int myNbPolyhedrons; + + std::vector myNb; // pointers to myNb... fields + std::vector myShift; // shift to get an index in myNb by elem->NbNodes() +}; + +inline SMDS_MeshInfo::SMDS_MeshInfo(): + myNbNodes(0), + myNbEdges (0), myNbQuadEdges (0), + myNbTriangles (0), myNbQuadTriangles (0), + myNbQuadrangles(0), myNbQuadQuadrangles(0), + myNbPolygons(0), + myNbTetras (0), myNbQuadTetras (0), + myNbHexas (0), myNbQuadHexas (0), + myNbPyramids(0), myNbQuadPyramids(0), + myNbPrisms (0), myNbQuadPrisms (0), + myNbPolyhedrons(0) +{ + // Number of nodes in standard element types + // n v f e + // o o a d + // d l c g + // e e e + // ----------- + // 1 + // 2 * + // 3 * + // 4 * * * + // 5 * + // 6 * * + // 7 + // 8 * * + // 9 + // 10 * + // 11 + // 12 + // 13 * + // 14 + // 15 * + // 16 + // 17 + // 18 + // 19 + // 20 * + // + // So to have a unique index for each type basing on nb of nodes, we use a shift: + myShift.resize(SMDSAbs_Volume + 1, 0); + myShift[ SMDSAbs_Face ] = +8; // 3->11, 4->12, 6->14, 8->16 + myShift[ SMDSAbs_Edge ] = -2; // 2->0, 4->2 + + myNb.resize( index( SMDSAbs_Volume,20 ) + 1, NULL); + myNb[ index( SMDSAbs_Node,1 )] = & myNbNodes; + + myNb[ index( SMDSAbs_Edge,2 )] = & myNbEdges; + myNb[ index( SMDSAbs_Edge,4 )] = & myNbQuadEdges; + + myNb[ index( SMDSAbs_Face,3 )] = & myNbTriangles; + myNb[ index( SMDSAbs_Face,4 )] = & myNbQuadrangles; + myNb[ index( SMDSAbs_Face,6 )] = & myNbQuadTriangles; + myNb[ index( SMDSAbs_Face,8 )] = & myNbQuadQuadrangles; + + myNb[ index( SMDSAbs_Volume, 4)] = & myNbTetras; + myNb[ index( SMDSAbs_Volume, 5)] = & myNbPyramids; + myNb[ index( SMDSAbs_Volume, 6)] = & myNbPrisms; + myNb[ index( SMDSAbs_Volume, 8)] = & myNbHexas; + myNb[ index( SMDSAbs_Volume, 10)] = & myNbQuadTetras; + myNb[ index( SMDSAbs_Volume, 13)] = & myNbQuadPyramids; + myNb[ index( SMDSAbs_Volume, 15)] = & myNbQuadPrisms; + myNb[ index( SMDSAbs_Volume, 20)] = & myNbQuadHexas; +} +inline void // Clear +SMDS_MeshInfo::Clear() +{ for ( std::size_t i=0; iGetType(), el->NbNodes()) ]); } + +inline void // add +SMDS_MeshInfo::add(const SMDS_MeshElement* el) +{ ++(*myNb[ index(el->GetType(), el->NbNodes()) ]); } + +<<<<<<< HEAD +======= +inline void // addWithPoly +SMDS_MeshInfo::addWithPoly(const SMDS_MeshElement* el) { + switch ( el->GetEntityType() ) { + case SMDSEntity_Polygon: ++myNbPolygons; break; +#ifndef VTK_NO_QUAD_POLY + case SMDSEntity_Quad_Polygon: ++myNbQuadPolygons; break; +#endif + case SMDSEntity_Polyhedra: ++myNbPolyhedrons; break; + default: add(el); + } +} +>>>>>>> c5d257d... SMESH: Make it compatibel to VTK 6.0 +inline void // RemoveEdge +SMDS_MeshInfo::RemoveEdge(const SMDS_MeshElement* el) +{ if ( el->IsQuadratic() ) --myNbQuadEdges; else --myNbEdges; } + +inline void // RemoveFace +<<<<<<< HEAD +SMDS_MeshInfo::RemoveFace(const SMDS_MeshElement* el) +{ if ( el->IsPoly() ) --myNbPolygons; else remove( el ); } +======= +SMDS_MeshInfo::RemoveFace(const SMDS_MeshElement* el) { + switch ( el->GetEntityType() ) { + case SMDSEntity_Polygon: --myNbPolygons; break; +#ifndef VTK_NO_QUAD_POLY + case SMDSEntity_Quad_Polygon: --myNbQuadPolygons; break; +#endif + default: remove(el); + } +} +>>>>>>> c5d257d... SMESH: Make it compatibel to VTK 6.0 + +inline void // RemoveVolume +SMDS_MeshInfo::RemoveVolume(const SMDS_MeshElement* el) +{ if ( el->IsPoly() ) --myNbPolyhedrons; else remove( el ); } + +inline int // NbEdges +SMDS_MeshInfo::NbEdges (SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbEdges+myNbQuadEdges : order == ORDER_LINEAR ? myNbEdges : myNbQuadEdges; } + +inline int // NbFaces +SMDS_MeshInfo::NbFaces (SMDSAbs_ElementOrder order) const +{ return NbTriangles(order)+NbQuadrangles(order)+(order == ORDER_QUADRATIC ? 0 : myNbPolygons); } + +inline int // NbTriangles +SMDS_MeshInfo::NbTriangles (SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbTriangles+myNbQuadTriangles : order == ORDER_LINEAR ? myNbTriangles : myNbQuadTriangles; } + +inline int // NbQuadrangles +SMDS_MeshInfo::NbQuadrangles(SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbQuadrangles+myNbQuadQuadrangles : order == ORDER_LINEAR ? myNbQuadrangles : myNbQuadQuadrangles; } + +inline int // NbVolumes +SMDS_MeshInfo::NbVolumes (SMDSAbs_ElementOrder order) const +{ return NbTetras(order) + NbHexas(order) + NbPyramids(order) + NbPrisms(order) + (order == ORDER_QUADRATIC ? 0 : myNbPolyhedrons); } + +inline int // NbTetras +SMDS_MeshInfo::NbTetras (SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbTetras+myNbQuadTetras : order == ORDER_LINEAR ? myNbTetras : myNbQuadTetras; } + +inline int // NbHexas +SMDS_MeshInfo::NbHexas (SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbHexas+myNbQuadHexas : order == ORDER_LINEAR ? myNbHexas : myNbQuadHexas; } + +inline int // NbPyramids +SMDS_MeshInfo::NbPyramids(SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbPyramids+myNbQuadPyramids : order == ORDER_LINEAR ? myNbPyramids : myNbQuadPyramids; } + +inline int // NbPrisms +SMDS_MeshInfo::NbPrisms (SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbPrisms+myNbQuadPrisms : order == ORDER_LINEAR ? myNbPrisms : myNbQuadPrisms; } + +<<<<<<< HEAD +======= +inline int // NbHexPrisms +SMDS_MeshInfo::NbHexPrisms (SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbHexPrism : order == ORDER_LINEAR ? myNbHexPrism : 0; } + +inline int // NbElements +SMDS_MeshInfo::NbElements(SMDSAbs_ElementType type) const +{ + int nb = 0; + switch (type) { + case SMDSAbs_All: + for ( int i=1+index( SMDSAbs_Node,1 ); i>>>>>> c5d257d... SMESH: Make it compatibel to VTK 6.0 +#endif diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx.orig b/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx.orig new file mode 100644 index 000000000000..ea2784a52ab5 --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/SMESH_Gen.hxx.orig @@ -0,0 +1,175 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESH : implementaion of SMESH idl descriptions +// File : SMESH_Gen.hxx +// Author : Paul RASCLE, EDF +// Module : SMESH +// + +#ifndef _SMESH_GEN_HXX_ +#define _SMESH_GEN_HXX_ + +#include "SMESH_SMESH.hxx" + +#include "SMESH_Exception.hxx" + +#include "SMESH_Hypothesis.hxx" +#include "SMESH_ComputeError.hxx" +#include "SMESH_Algo.hxx" +#include "SMESH_0D_Algo.hxx" +#include "SMESH_1D_Algo.hxx" +#include "SMESH_2D_Algo.hxx" +#include "SMESH_3D_Algo.hxx" +#include "SMESH_Mesh.hxx" + +#include + +#include +#include + +class SMESHDS_Document; + +typedef SMESH_Hypothesis::Hypothesis_Status TAlgoStateErrorName; + +typedef struct studyContextStruct +{ + std::map < int, SMESH_Hypothesis * >mapHypothesis; + std::map < int, SMESH_Mesh * >mapMesh; + SMESHDS_Document * myDocument; +} StudyContextStruct; + +typedef std::set TSetOfInt; + +class SMESH_EXPORT SMESH_Gen +{ +<<<<<<< HEAD + public: + SMESH_Gen(); +======= +public: +>>>>>>> 9778eb1... FEM: Use single smesh mesh generator throughout FreeCAD + ~SMESH_Gen(); + + static SMESH_Gen* get(); + + SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode) + throw(SMESH_Exception); + + /*! + * \brief Computes aMesh on aShape + * \param anUpward - compute from vertices up to more complex shape (internal usage) + * \param aDim - upper level dimension of the mesh computation + * \param aShapesId - list of shapes with computed mesh entities (elements or nodes) + * \retval bool - true if none submesh failed to compute + */ + bool Compute(::SMESH_Mesh & aMesh, + const TopoDS_Shape & aShape, + const bool anUpward=false, + const ::MeshDimension aDim=::MeshDim_3D, + TSetOfInt* aShapesId=0); + + bool CheckAlgoState(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape); + // notify on bad state of attached algos, return false + // if Compute() would fail because of some algo bad state + + /*! + * \brief Sets number of segments per diagonal of boundary box of geometry by which + * default segment length of appropriate 1D hypotheses is defined + */ + void SetBoundaryBoxSegmentation( int theNbSegments ) { _segmentation = theNbSegments; } + int GetBoundaryBoxSegmentation() const { return _segmentation; } + /*! + * \brief Sets default number of segments per edge + */ + void SetDefaultNbSegments(int nb) { _nbSegments = nb; } + int GetDefaultNbSegments() const { return _nbSegments; } + + struct TAlgoStateError + { + TAlgoStateErrorName _name; + const SMESH_Algo* _algo; + int _algoDim; + bool _isGlobalAlgo; + + TAlgoStateError(): _name(SMESH_Hypothesis::HYP_OK),_algo(0),_algoDim(0) {} + void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal) + { _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; } + void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal) + { _name = name; _algo = 0; _algoDim = algoDim; _isGlobalAlgo = isGlobal; } + }; + + bool GetAlgoState(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, + std::list< SMESH_Gen::TAlgoStateError > & theErrors); + // notify on bad state of attached algos, return false + // if Compute() would fail because of some algo bad state + // theErrors list contains problems description + + StudyContextStruct *GetStudyContext(int studyId); + + static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType); + static int GetShapeDim(const TopoDS_Shape & aShape) + { return GetShapeDim( aShape.ShapeType() ); } + SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0); + static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh); + + // inherited methods from SALOMEDS::Driver + +// void Save(int studyId, const char *aUrlOfFile); +// void Load(int studyId, const char *aUrlOfFile); +// void Close(int studyId); +// const char *ComponentDataType(); + +// const char *IORToLocalPersistentID(const char *IORString, bool & IsAFile); +// const char *LocalPersistentIDToIOR(const char *aLocalPersistentID); + + int GetANewId(); + + std::map < int, SMESH_Algo * >_mapAlgo; + std::map < int, SMESH_0D_Algo * >_map0D_Algo; + std::map < int, SMESH_1D_Algo * >_map1D_Algo; + std::map < int, SMESH_2D_Algo * >_map2D_Algo; + std::map < int, SMESH_3D_Algo * >_map3D_Algo; + +<<<<<<< HEAD + private: +======= +protected: + SMESH_Gen(); + static SMESH_Gen* generator; + +private: +>>>>>>> 9778eb1... FEM: Use single smesh mesh generator throughout FreeCAD + + int _localId; // unique Id of created objects, within SMESH_Gen entity + std::map < int, StudyContextStruct * >_mapStudyContext; + + // hypotheses managing + int _hypId; + + // number of segments per diagonal of boundary box of geometry by which + // default segment length of appropriate 1D hypotheses is defined + int _segmentation; + // default of segments + int _nbSegments; +}; + +#endif diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Mesh.hxx.orig b/src/3rdParty/salomesmesh/inc/SMESH_Mesh.hxx.orig new file mode 100644 index 000000000000..43edaaf82fcd --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/SMESH_Mesh.hxx.orig @@ -0,0 +1,400 @@ +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License, or (at your option) any later version. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// File : SMESH_Mesh.hxx +// Author : Paul RASCLE, EDF +// Module : SMESH +// +#ifndef _SMESH_MESH_HXX_ +#define _SMESH_MESH_HXX_ + +#include "SMESH_SMESH.hxx" + +#include "SMDSAbs_ElementType.hxx" +#include "SMESHDS_Command.hxx" +#include "SMESHDS_Mesh.hxx" +#include "SMESH_ComputeError.hxx" +#include "SMESH_Controls.hxx" +#include "SMESH_Hypothesis.hxx" + +#include "Utils_SALOME_Exception.hxx" + +#include +#include +#include + +#include +#include + + +#ifdef WIN32 +#pragma warning(disable:4251) // Warning DLL Interface ... +#pragma warning(disable:4290) // Warning Exception ... +#endif + +class SMESH_Gen; +class SMESHDS_Document; +class SMESH_Group; +<<<<<<< bca7a1866e596ad2e318809f35b6d08776226a69 +#if OCC_VERSION_HEX < 0x070000 +class TopTools_ListOfShape; +#endif +======= +// class TopTools_ListOfShape; +>>>>>>> upgrade to SMESH7.7.1 +class SMESH_subMesh; +class SMESH_HypoFilter; +class TopoDS_Solid; + +typedef std::list TListOfInt; +typedef std::list TListOfListOfInt; + +class SMESH_EXPORT SMESH_Mesh +{ + public: + SMESH_Mesh(int theLocalId, + int theStudyId, + SMESH_Gen* theGen, + bool theIsEmbeddedMode, + SMESHDS_Document* theDocument); + + virtual ~SMESH_Mesh(); + + /*! + * \brief Set geometry to be meshed + */ + void ShapeToMesh(const TopoDS_Shape & aShape); + /*! + * \brief Return geometry to be meshed. (It may be a PseudoShape()!) + */ + TopoDS_Shape GetShapeToMesh() const; + /*! + * \brief Return true if there is a geometry to be meshed, not PseudoShape() + */ + bool HasShapeToMesh() const { return _isShapeToMesh; } + /*! + * \brief Return diagonal size of bounding box of shape to mesh. + */ + double GetShapeDiagonalSize() const; + /*! + * \brief Return diagonal size of bounding box of a shape. + */ + static double GetShapeDiagonalSize(const TopoDS_Shape & aShape); + /*! + * \brief Return a solid which is returned by GetShapeToMesh() if + * a real geometry to be meshed was not set + */ + static const TopoDS_Solid& PseudoShape(); + + /*! + * \brief Load mesh from study file + */ + void Load(); + /*! + * \brief Remove all nodes and elements + */ + void Clear(); + /*! + * \brief Remove all nodes and elements of indicated shape + */ + void ClearSubMesh(const int theShapeId); + + /*! + * consult DriverMED_R_SMESHDS_Mesh::ReadStatus for returned value + */ + int UNVToMesh(const char* theFileName); + + int MEDToMesh(const char* theFileName, const char* theMeshName); + + int STLToMesh(const char* theFileName); + + int DATToMesh(const char* theFileName); + + int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName); + + SMESH_ComputeErrorPtr GMFToMesh(const char* theFileName, + bool theMakeRequiredGroups = true ); + + SMESH_Hypothesis::Hypothesis_Status + AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* error=0) + throw(SALOME_Exception); + + SMESH_Hypothesis::Hypothesis_Status + RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId) + throw(SALOME_Exception); + + const std::list & + GetHypothesisList(const TopoDS_Shape & aSubShape) const + throw(SALOME_Exception); + + const SMESH_Hypothesis * GetHypothesis(const TopoDS_Shape & aSubShape, + const SMESH_HypoFilter& aFilter, + const bool andAncestors, + TopoDS_Shape* assignedTo=0) const; + + int GetHypotheses(const TopoDS_Shape & aSubShape, + const SMESH_HypoFilter& aFilter, + std::list< const SMESHDS_Hypothesis * >& aHypList, + const bool andAncestors, + std::list< TopoDS_Shape > * assignedTo=0) const; + + const SMESH_Hypothesis * GetHypothesis(const SMESH_subMesh * aSubMesh, + const SMESH_HypoFilter& aFilter, + const bool andAncestors, + TopoDS_Shape* assignedTo=0) const; + + int GetHypotheses(const SMESH_subMesh * aSubMesh, + const SMESH_HypoFilter& aFilter, + std::list< const SMESHDS_Hypothesis * >& aHypList, + const bool andAncestors, + std::list< TopoDS_Shape > * assignedTo=0) const; + + SMESH_Hypothesis * GetHypothesis(const int aHypID) const; + + const std::list & GetLog() throw(SALOME_Exception); + + void ClearLog() throw(SALOME_Exception); + + int GetId() const { return _id; } + + bool MeshExists( int meshId ) const; + + SMESH_Mesh* FindMesh( int meshId ) const; + + SMESHDS_Mesh * GetMeshDS() { return _myMeshDS; } + + const SMESHDS_Mesh * GetMeshDS() const { return _myMeshDS; } + + SMESH_Gen *GetGen() { return _gen; } + + SMESH_subMesh *GetSubMesh(const TopoDS_Shape & aSubShape) + throw(SALOME_Exception); + + SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape) const + throw(SALOME_Exception); + + SMESH_subMesh *GetSubMeshContaining(const int aShapeID) const + throw(SALOME_Exception); + /*! + * \brief Return submeshes of groups containing the given subshape + */ + std::list GetGroupSubMeshesContaining(const TopoDS_Shape & shape) const + throw(SALOME_Exception); + /*! + * \brief Say all submeshes that theChangedHyp has been modified + */ + void NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* theChangedHyp); + + // const std::list < SMESH_subMesh * >& + // GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) throw(SALOME_Exception); + /*! + * \brief Return True if anHyp is used to mesh aSubShape + */ + bool IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, + const SMESH_subMesh * aSubMesh); + /*! + * \brief check if a hypothesis alowing notconform mesh is present + */ + bool IsNotConformAllowed() const; + + bool IsMainShape(const TopoDS_Shape& theShape) const; + /*! + * \brief Return list of ancestors of theSubShape in the order + * that lower dimention shapes come first + */ + const TopTools_ListOfShape& GetAncestors(const TopoDS_Shape& theSubShape) const; + + void SetAutoColor(bool theAutoColor) throw(SALOME_Exception); + + bool GetAutoColor() throw(SALOME_Exception); + + /*! + * \brief Set the flag meaning that the mesh has been edited "manually". + * It is to set to false after Clear() and to set to true by MeshEditor + */ + void SetIsModified(bool isModified); + + bool GetIsModified() const { return _isModified; } + + /*! + * \brief Return true if the mesh has been edited since a total re-compute + * and those modifications may prevent successful partial re-compute. + * As a side effect reset _isModified flag if mesh is empty + */ + bool HasModificationsToDiscard() const; + + /*! + * \brief Return data map of descendant to ancestor shapes + */ + typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap; + const TAncestorMap& GetAncestorMap() const { return _mapAncestors; } + /*! + * \brief Check group names for duplications. + * Consider maximum group name length stored in MED file + */ + bool HasDuplicatedGroupNamesMED(); + + void ExportMED(const char * theFile, + const char* theMeshName = NULL, + bool theAutoGroups = true, + int theVersion = 0, + const SMESHDS_Mesh* theMeshPart = 0, + bool theAutoDimension = false, + bool theAddODOnVertices = false) + throw(SALOME_Exception); + + void ExportDAT(const char * file, + const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + void ExportUNV(const char * file, + const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + void ExportSTL(const char * file, + const bool isascii, + const SMESHDS_Mesh* meshPart = 0) throw(SALOME_Exception); + void ExportCGNS(const char * file, + const SMESHDS_Mesh* mesh, + const char * meshName = 0); + void ExportGMF(const char * file, + const SMESHDS_Mesh* mesh, + bool withRequiredGroups = true ); + void ExportSAUV(const char *file, + const char* theMeshName = NULL, + bool theAutoGroups = true) throw(SALOME_Exception); + + double GetComputeProgress() const; + + int NbNodes() const throw(SALOME_Exception); + int Nb0DElements() const throw(SALOME_Exception); + int NbBalls() const throw(SALOME_Exception); + + int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + + int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbBiQuadQuadrangles() const throw(SALOME_Exception); + int NbBiQuadTriangles() const throw(SALOME_Exception); + int NbPolygons(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + + int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbTriQuadraticHexas() const throw(SALOME_Exception); + int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception); + int NbHexagonalPrisms() const throw(SALOME_Exception); + int NbPolyhedrons() const throw(SALOME_Exception); + + int NbSubMesh() const throw(SALOME_Exception); + + int NbGroup() const { return _mapGroup.size(); } + + int NbMeshes() const; // nb meshes in the Study + + SMESH_Group* AddGroup (const SMDSAbs_ElementType theType, + const char* theName, + int& theId, + const TopoDS_Shape& theShape=TopoDS_Shape(), + const SMESH_PredicatePtr& thePredicate=SMESH_PredicatePtr()); + + SMESH_Group* AddGroup (SMESHDS_GroupBase* groupDS) throw(SALOME_Exception); + + typedef boost::shared_ptr< SMDS_Iterator > GroupIteratorPtr; + GroupIteratorPtr GetGroups() const; + + std::list GetGroupIds() const; + + SMESH_Group* GetGroup (const int theGroupID); + + bool RemoveGroup (const int theGroupID); + + SMESH_Group* ConvertToStandalone ( int theGroupID ); + + struct TCallUp // callback from SMESH to SMESH_I level + { + virtual void RemoveGroup (const int theGroupID)=0; + virtual void HypothesisModified ()=0; + virtual void Load ()=0; + virtual ~TCallUp() {} + }; + void SetCallUp( TCallUp * upCaller ); + + bool SynchronizeGroups(); + + + SMDSAbs_ElementType GetElementType( const int id, const bool iselem ); + + void ClearMeshOrder(); + void SetMeshOrder(const TListOfListOfInt& theOrder ); + const TListOfListOfInt& GetMeshOrder() const; + + // sort submeshes according to stored mesh order + bool SortByMeshOrder(std::vector& theListToSort) const; + + // return true if given order of sub-meshes is OK + bool IsOrderOK( const SMESH_subMesh* smBefore, + const SMESH_subMesh* smAfter ) const; + + ostream& Dump(ostream & save); + +private: + + void fillAncestorsMap(const TopoDS_Shape& theShape); + void getAncestorsSubMeshes(const TopoDS_Shape& theSubShape, + std::vector< SMESH_subMesh* >& theSubMeshes) const; + +protected: + int _id; // id given by creator (unique within the creator instance) + int _studyId; + int _groupId; // id generator for group objects + int _nbSubShapes; // initial nb of subshapes in the shape to mesh + bool _isShapeToMesh;// set to true when a shape is given (only once) + SMESHDS_Document * _myDocument; + SMESHDS_Mesh * _myMeshDS; + SMESH_Gen * _gen; + std::map _mapGroup; + + class SubMeshHolder; + SubMeshHolder* _subMeshHolder; + + bool _isAutoColor; + bool _isModified; //!< modified since last total re-compute, issue 0020693 + + double _shapeDiagonal; //!< diagonal size of bounding box of shape to mesh + + TopTools_IndexedDataMapOfShapeListOfShape _mapAncestors; + + mutable std::vector _ancestorSubMeshes; // to speed up GetHypothes[ei]s() + + TListOfListOfInt _mySubMeshOrder; + + // Struct calling methods at CORBA API implementation level, used to + // 1) make an upper level (SMESH_I) be consistent with a lower one (SMESH) + // when group removal is invoked by hyp modification (issue 0020918) + // 2) to forget not loaded mesh data at hyp modification + TCallUp* _callUp; + +protected: + SMESH_Mesh(); + SMESH_Mesh(const SMESH_Mesh&) {}; +}; + +#endif diff --git a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx.orig b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx.orig new file mode 100644 index 000000000000..06a10e9b1a8e --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx.orig @@ -0,0 +1,329 @@ +<<<<<<< HEAD +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +#ifndef _SMESH_MeshVSLink_HeaderFile +#define _SMESH_MeshVSLink_HeaderFile + +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _Handle_SMESH_MeshVSLink_HeaderFile +#include +#endif +#ifndef _TColStd_PackedMapOfInteger_HeaderFile +#include +#endif +#ifndef _TColStd_HArray2OfInteger_HeaderFile +#include +#endif +#ifndef _TColStd_HArray2OfReal_HeaderFile +#include +#endif +#ifndef _MeshVS_DataSource3D_HeaderFile +#include +#endif +#ifndef _Standard_Boolean_HeaderFile +#include +#endif +#ifndef _Standard_Integer_HeaderFile +#include +#endif +#ifndef _MeshVS_EntityType_HeaderFile +#include +#endif +#ifndef _Standard_Address_HeaderFile +#include +#endif +#ifndef _TColStd_HArray1OfInteger_HeaderFile +#include +#endif +#ifndef _Standard_Real_HeaderFile +#include +#endif +#ifndef _SMESH_Mesh_HeaderFile +#include +#endif +#ifndef _Standard_Version_HeaderFile +#include +#endif + +#if OCC_VERSION_HEX >= 0x070000 +DEFINE_STANDARD_HANDLE(SMESH_MeshVSLink, MeshVS_DataSource3D) +#endif +class SMESH_MeshVSLink : public MeshVS_DataSource3D { + + public: + // Methods PUBLIC + // + + //! Constructor
+ Standard_EXPORT SMESH_MeshVSLink(const SMESH_Mesh *aMesh); + + //Not implemented yet + /* + + Standard_EXPORT Standard_Boolean GetNodeNormal(const Standard_Integer ranknode,const Standard_Integer ElementId,Standard_Real& nx,Standard_Real& ny,Standard_Real& nz) const; + Standard_EXPORT Standard_Boolean GetNormalsByElement(const Standard_Integer Id,const Standard_Boolean IsNodal,const Standard_Integer MaxNodes,Handle(TColStd_HArray1OfReal)& Normals) const; + Standard_EXPORT void GetAllGroups(TColStd_PackedMapOfInteger& Ids) const; + Standard_EXPORT Standard_Boolean GetGroup(const Standard_Integer Id,MeshVS_EntityType& Type,TColStd_PackedMapOfInteger& Ids) const; + Standard_EXPORT Standard_Address GetGroupAddr(const Standard_Integer ID) const; + Standard_EXPORT Standard_Boolean IsAdvancedSelectionEnabled() const; + Standard_EXPORT Bnd_Box GetBoundingBox() const; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,const Standard_Real X,const Standard_Real Y,const Standard_Real aTol,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,const Standard_Real XMin,const Standard_Real YMin,const Standard_Real XMax,const Standard_Real YMax,const Standard_Real aTol,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,const TColgp_Array1OfPnt2d& Polyline,const Bnd_Box2d& aBox,const Standard_Real aTol,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + */ + + //! Returns geometry information about node ( if IsElement is False ) or element ( IsElement is True )
+ //! by co-ordinates. For element this method must return all its nodes co-ordinates in the strict order: X, Y, Z and
+ //! with nodes order is the same as in wire bounding the face or link. NbNodes is number of nodes of element.
+ //! It is recommended to return 1 for node. Type is an element type.
+ Standard_EXPORT Standard_Boolean GetGeom(const Standard_Integer ID,const Standard_Boolean IsElement,TColStd_Array1OfReal& Coords,Standard_Integer& NbNodes,MeshVS_EntityType& Type) const; + + Standard_EXPORT Standard_Boolean Get3DGeom(const Standard_Integer ID,Standard_Integer& NbNodes,Handle(MeshVS_HArray1OfSequenceOfInteger)& Data) const; + + //! This method is similar to GetGeom, but returns only element or node type. This method is provided for
+ //! a fine performance.
+ Standard_EXPORT Standard_Boolean GetGeomType(const Standard_Integer ID,const Standard_Boolean IsElement,MeshVS_EntityType& Type) const; + + //! This method returns by number an address of any entity which represents element or node data structure.
+ Standard_EXPORT Standard_Address GetAddr(const Standard_Integer ID,const Standard_Boolean IsElement) const; + + //! This method returns information about what node this element consist of.
+ Standard_EXPORT /*virtual*/ Standard_Boolean GetNodesByElement(const Standard_Integer ID,TColStd_Array1OfInteger& NodeIDs,Standard_Integer& NbNodes) const; + + //! This method returns map of all nodes the object consist of.
+ Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllNodes() const; + + //! This method returns map of all elements the object consist of.
+ Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllElements() const; + + //! This method calculates normal of face, which is using for correct reflection presentation.
+ //! There is default method, for advance reflection this method can be redefined.
+ Standard_EXPORT Standard_Boolean GetNormal(const Standard_Integer Id,const Standard_Integer Max,Standard_Real& nx,Standard_Real& ny,Standard_Real& nz) const; + + //! This method returns map of all groups the object contains.
+ Standard_EXPORT void GetAllGroups(TColStd_PackedMapOfInteger& Ids) const; + + // Type management + // +#if OCC_VERSION_HEX >= 0x070000 + DEFINE_STANDARD_RTTIEXT(SMESH_MeshVSLink,MeshVS_DataSource3D) +#else + Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; +#endif + + protected: + // Methods PROTECTED + // + + // Fields PROTECTED + // + + private: + // Methods PRIVATE + // + + // Fields PRIVATE + // + SMESH_Mesh *myMesh; + TColStd_PackedMapOfInteger myNodes; + TColStd_PackedMapOfInteger myElements; + TColStd_PackedMapOfInteger myGroups; +}; + +// other Inline functions and methods (like "C++: function call" methods) +// + +#endif +======= +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +#ifndef _SMESH_MeshVSLink_HeaderFile +#define _SMESH_MeshVSLink_HeaderFile + +#if OCC_VERSION_HEX < 0x070000 +#ifndef _Handle_SMESH_MeshVSLink_HeaderFile +#include +#endif +#endif + +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _TColStd_PackedMapOfInteger_HeaderFile +#include +#endif +#ifndef _TColStd_HArray2OfInteger_HeaderFile +#include +#endif +#ifndef _TColStd_HArray2OfReal_HeaderFile +#include +#endif +#ifndef _MeshVS_DataSource3D_HeaderFile +#include +#endif +#ifndef _Standard_Boolean_HeaderFile +#include +#endif +#ifndef _Standard_Integer_HeaderFile +#include +#endif +#ifndef _MeshVS_EntityType_HeaderFile +#include +#endif +#ifndef _Standard_Address_HeaderFile +#include +#endif +#ifndef _TColStd_HArray1OfInteger_HeaderFile +#include +#endif +#ifndef _Standard_Real_HeaderFile +#include +#endif +#ifndef _SMESH_Mesh_HeaderFile +#include +#endif +#ifndef _Standard_Version_HeaderFile +#include +#endif + +#if OCC_VERSION_HEX >= 0x070000 +DEFINE_STANDARD_HANDLE(SMESH_MeshVSLink, MeshVS_DataSource3D) +#endif +class SMESH_MeshVSLink : public MeshVS_DataSource3D { + + public: + // Methods PUBLIC + // + + //! Constructor
+ Standard_EXPORT SMESH_MeshVSLink(const SMESH_Mesh *aMesh); + + //Not implemented yet + /* + + Standard_EXPORT Standard_Boolean GetNodeNormal(const Standard_Integer ranknode,const Standard_Integer ElementId,Standard_Real& nx,Standard_Real& ny,Standard_Real& nz) const; + Standard_EXPORT Standard_Boolean GetNormalsByElement(const Standard_Integer Id,const Standard_Boolean IsNodal,const Standard_Integer MaxNodes,Handle(TColStd_HArray1OfReal)& Normals) const; + Standard_EXPORT void GetAllGroups(TColStd_PackedMapOfInteger& Ids) const; + Standard_EXPORT Standard_Boolean GetGroup(const Standard_Integer Id,MeshVS_EntityType& Type,TColStd_PackedMapOfInteger& Ids) const; + Standard_EXPORT Standard_Address GetGroupAddr(const Standard_Integer ID) const; + Standard_EXPORT Standard_Boolean IsAdvancedSelectionEnabled() const; + Standard_EXPORT Bnd_Box GetBoundingBox() const; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,const Standard_Real X,const Standard_Real Y,const Standard_Real aTol,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,const Standard_Real XMin,const Standard_Real YMin,const Standard_Real XMax,const Standard_Real YMax,const Standard_Real aTol,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,const TColgp_Array1OfPnt2d& Polyline,const Bnd_Box2d& aBox,const Standard_Real aTol,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + Standard_EXPORT Standard_Boolean GetDetectedEntities(const Handle(MeshVS_Mesh)& Prs,Handle(TColStd_HPackedMapOfInteger)& Nodes,Handle(TColStd_HPackedMapOfInteger)& Elements) ; + */ + + //! Returns geometry information about node ( if IsElement is False ) or element ( IsElement is True )
+ //! by co-ordinates. For element this method must return all its nodes co-ordinates in the strict order: X, Y, Z and
+ //! with nodes order is the same as in wire bounding the face or link. NbNodes is number of nodes of element.
+ //! It is recommended to return 1 for node. Type is an element type.
+ Standard_EXPORT Standard_Boolean GetGeom(const Standard_Integer ID,const Standard_Boolean IsElement,TColStd_Array1OfReal& Coords,Standard_Integer& NbNodes,MeshVS_EntityType& Type) const; + + Standard_EXPORT Standard_Boolean Get3DGeom(const Standard_Integer ID,Standard_Integer& NbNodes,Handle(MeshVS_HArray1OfSequenceOfInteger)& Data) const; + + //! This method is similar to GetGeom, but returns only element or node type. This method is provided for
+ //! a fine performance.
+ Standard_EXPORT Standard_Boolean GetGeomType(const Standard_Integer ID,const Standard_Boolean IsElement,MeshVS_EntityType& Type) const; + + //! This method returns by number an address of any entity which represents element or node data structure.
+ Standard_EXPORT Standard_Address GetAddr(const Standard_Integer ID,const Standard_Boolean IsElement) const; + + //! This method returns information about what node this element consist of.
+ Standard_EXPORT /*virtual*/ Standard_Boolean GetNodesByElement(const Standard_Integer ID,TColStd_Array1OfInteger& NodeIDs,Standard_Integer& NbNodes) const; + + //! This method returns map of all nodes the object consist of.
+ Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllNodes() const; + + //! This method returns map of all elements the object consist of.
+ Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllElements() const; + + //! This method calculates normal of face, which is using for correct reflection presentation.
+ //! There is default method, for advance reflection this method can be redefined.
+ Standard_EXPORT Standard_Boolean GetNormal(const Standard_Integer Id,const Standard_Integer Max,Standard_Real& nx,Standard_Real& ny,Standard_Real& nz) const; + + //! This method returns map of all groups the object contains.
+ Standard_EXPORT void GetAllGroups(TColStd_PackedMapOfInteger& Ids) const; + + // Type management + // +#if OCC_VERSION_HEX >= 0x070000 + DEFINE_STANDARD_RTTIEXT(SMESH_MeshVSLink,MeshVS_DataSource3D) +#else + Standard_EXPORT const Handle(Standard_Type)& DynamicType() const; +#endif + + protected: + // Methods PROTECTED + // + + // Fields PROTECTED + // + + private: + // Methods PRIVATE + // + + // Fields PRIVATE + // + SMESH_Mesh *myMesh; + TColStd_PackedMapOfInteger myNodes; + TColStd_PackedMapOfInteger myElements; + TColStd_PackedMapOfInteger myGroups; +}; +#include +// other Inline functions and methods (like "C++: function call" methods) +// +#endif +>>>>>>> 901e260... FEM: Make SMESH7 compile with occ6 diff --git a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.ixx.orig b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.ixx.orig new file mode 100644 index 000000000000..a0c1bcf0da21 --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.ixx.orig @@ -0,0 +1,154 @@ +<<<<<<< HEAD +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +#include + +#ifndef _Standard_TypeMismatch_HeaderFile +#include +#endif + +#ifndef _Standard_Version_HeaderFile +#include +#endif + +#if OCC_VERSION_HEX < 0x070000 +Standard_EXPORT Handle_Standard_Type& SMESH_MeshVSLink_Type_() +{ + static Handle_Standard_Type aType1 = STANDARD_TYPE(MeshVS_DataSource3D); + static Handle_Standard_Type aType2 = STANDARD_TYPE(MeshVS_DataSource); + static Handle_Standard_Type aType3 = STANDARD_TYPE(MMgt_TShared); + static Handle_Standard_Type aType4 = STANDARD_TYPE(Standard_Transient); + + + static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,NULL}; + static Handle_Standard_Type _aType = new Standard_Type("SMESH_MeshVSLink", + sizeof(SMESH_MeshVSLink), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); + + return _aType; +} + + +// DownCast method +// allow safe downcasting +// +const Handle(SMESH_MeshVSLink) Handle(SMESH_MeshVSLink)::DownCast(const Handle(Standard_Transient)& AnObject) +{ + Handle(SMESH_MeshVSLink) _anOtherObject; + + if (!AnObject.IsNull()) { + if (AnObject->IsKind(STANDARD_TYPE(SMESH_MeshVSLink))) { + _anOtherObject = Handle(SMESH_MeshVSLink)((Handle(SMESH_MeshVSLink)&)AnObject); + } + } + + return _anOtherObject ; +} + +const Handle(Standard_Type)& SMESH_MeshVSLink::DynamicType() const +{ + return STANDARD_TYPE(SMESH_MeshVSLink) ; +} +#endif +======= +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +#if OCC_VERSION_HEX < 0x070000 + +#include + +#ifndef _Standard_TypeMismatch_HeaderFile +#include +#endif + +Standard_EXPORT Handle_Standard_Type& SMESH_MeshVSLink_Type_() +{ + static Handle_Standard_Type aType1 = STANDARD_TYPE(MeshVS_DataSource3D); + static Handle_Standard_Type aType2 = STANDARD_TYPE(MeshVS_DataSource); + static Handle_Standard_Type aType3 = STANDARD_TYPE(MMgt_TShared); + static Handle_Standard_Type aType4 = STANDARD_TYPE(Standard_Transient); + + + static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,aType4,NULL}; + static Handle_Standard_Type _aType = new Standard_Type("SMESH_MeshVSLink", + sizeof(SMESH_MeshVSLink), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); + + return _aType; +} + + +// DownCast method +// allow safe downcasting +// +const Handle(SMESH_MeshVSLink) Handle(SMESH_MeshVSLink)::DownCast(const Handle(Standard_Transient)& AnObject) +{ + Handle(SMESH_MeshVSLink) _anOtherObject; + + if (!AnObject.IsNull()) { + if (AnObject->IsKind(STANDARD_TYPE(SMESH_MeshVSLink))) { + _anOtherObject = Handle(SMESH_MeshVSLink)((Handle(SMESH_MeshVSLink)&)AnObject); + } + } + + return _anOtherObject ; +} + +const Handle(Standard_Type)& SMESH_MeshVSLink::DynamicType() const +{ + return STANDARD_TYPE(SMESH_MeshVSLink) ; +} +#endif +>>>>>>> 901e260... FEM: Make SMESH7 compile with occ6 diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_Hexa_3D.hxx.orig b/src/3rdParty/salomesmesh/inc/StdMeshers_Hexa_3D.hxx.orig new file mode 100644 index 000000000000..25c045b00c32 --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/StdMeshers_Hexa_3D.hxx.orig @@ -0,0 +1,75 @@ +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License, or (at your option) any later version. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SMESH SMESH : implementaion of SMESH idl descriptions +// File : StdMeshers_Hexa_3D.hxx +// Moved here from SMESH_Hexa_3D.hxx +// Author : Paul RASCLE, EDF +// Module : SMESH +// +#ifndef _SMESH_HEXA_3D_HXX_ +#define _SMESH_HEXA_3D_HXX_ + +#include "SMESH_StdMeshers.hxx" + +#include "SMESH_Algo.hxx" + +<<<<<<< bca7a1866e596ad2e318809f35b6d08776226a69 +#if OCC_VERSION_HEX < 0x070000 +class TopTools_IndexedMapOfShape; +#endif + +typedef struct point3Dstruct +{ + const SMDS_MeshNode * node; +} Point3DStruct; +======= +>>>>>>> upgrade to SMESH7.7.1 + +class StdMeshers_ViscousLayers; +class SMESH_MesherHelper; + +class STDMESHERS_EXPORT StdMeshers_Hexa_3D : public SMESH_3D_Algo +{ +public: + StdMeshers_Hexa_3D(int hypId, int studyId, SMESH_Gen* gen); + virtual ~StdMeshers_Hexa_3D(); + + virtual bool CheckHypothesis(SMESH_Mesh& aMesh, + const TopoDS_Shape& aShape, + SMESH_Hypothesis::Hypothesis_Status& aStatus); + + virtual bool Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape); + + virtual bool Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper); + + virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, + MapShapeNbElems& aResMap); + + static bool IsApplicable(const TopoDS_Shape & aShape, bool toCheckAll); + + protected: + + const StdMeshers_ViscousLayers* _viscousLayersHyp; +}; + +#endif diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_ProjectionUtils.hxx.orig b/src/3rdParty/salomesmesh/inc/StdMeshers_ProjectionUtils.hxx.orig new file mode 100644 index 000000000000..dd9e6e1bc433 --- /dev/null +++ b/src/3rdParty/salomesmesh/inc/StdMeshers_ProjectionUtils.hxx.orig @@ -0,0 +1,227 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESH : idl implementation based on 'SMESH' unit's calsses +// File : StdMeshers_ProjectionUtils.hxx +// Created : Thu Oct 26 15:37:24 2006 +// Author : Edward AGAPOV (eap) +// +#ifndef StdMeshers_ProjectionUtils_HeaderFile +#define StdMeshers_ProjectionUtils_HeaderFile + +#include "SMESH_StdMeshers.hxx" + +#include +#include +#include +#include +#include +<<<<<<< HEAD +#include +======= +#include +#include +>>>>>>> 901e260... FEM: Make SMESH7 compile with occ6 + +#include +#include + +class TopoDS_Shape; +class SMDS_MeshNode; +class SMESH_Mesh; +class SMESH_Hypothesis; +class SMESH_subMesh; +<<<<<<< HEAD +======= +class TopoDS_Shape; +>>>>>>> 901e260... FEM: Make SMESH7 compile with occ6 + +/*! + * \brief Class encapsulating methods common to Projection algorithms + */ +class StdMeshers_ProjectionUtils +{ + public: + + typedef TopTools_DataMapOfShapeShape TShapeShapeMap; + typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap; + typedef std::map TNodeNodeMap; + + /*! + * \brief Looks for association of all subshapes of two shapes + * \param theShape1 - shape 1 + * \param theMesh1 - mesh built on shape 1 + * \param theShape2 - shape 2 + * \param theMesh2 - mesh built on shape 2 + * \param theAssociation - association map to be filled that may + * contain association of one or two pairs of vertices + * \retval bool - true if association found + */ + static bool FindSubShapeAssociation(const TopoDS_Shape& theShape1, + SMESH_Mesh* theMesh1, + const TopoDS_Shape& theShape2, + SMESH_Mesh* theMesh2, + TShapeShapeMap & theAssociationMap); + + /*! + * \brief Find association of edges of faces + * \param face1 - face 1 + * \param VV1 - vertices of face 1 + * \param face2 - face 2 + * \param VV2 - vertices of face 2 associated with oned of face 1 + * \param edges1 - out list of edges of face 1 + * \param edges2 - out list of edges of face 2 + * \retval int - nb of edges in an outer wire in a success case, else zero + */ + static int FindFaceAssociation(const TopoDS_Face& face1, + TopoDS_Vertex VV1[2], + const TopoDS_Face& face2, + TopoDS_Vertex VV2[2], + std::list< TopoDS_Edge > & edges1, + std::list< TopoDS_Edge > & edges2); + + /*! + * \brief Insert vertex association defined by a hypothesis into a map + * \param theHyp - hypothesis + * \param theAssociationMap - association map + * \param theTargetShape - the shape theHyp assigned to + */ + static void InitVertexAssociation( const SMESH_Hypothesis* theHyp, + TShapeShapeMap & theAssociationMap, + const TopoDS_Shape& theTargetShape); + + /*! + * \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap + * \param theShape1 - shape 1 + * \param theShape2 - shape 2 + * \param theAssociationMap - association map + * \param theBidirectional - if false, inserts theShape1 -> theShape2 association + * \retval bool - true if there was no association for these shapes before + */ + static bool InsertAssociation( const TopoDS_Shape& theShape1, + const TopoDS_Shape& theShape2, + TShapeShapeMap & theAssociationMap, + const bool theBidirectional=true); + + static bool IsSubShape( const TopoDS_Shape& shape, SMESH_Mesh* aMesh ); + + static bool IsSubShape( const TopoDS_Shape& shape, const TopoDS_Shape& mainShape ); + + /*! + * \brief Finds an edge by its vertices in a main shape of the mesh + */ + static TopoDS_Edge GetEdgeByVertices( SMESH_Mesh* aMesh, + const TopoDS_Vertex& V1, + const TopoDS_Vertex& V2); + + /*! + * \brief Return another face sharing an edge + * \param edgeToFaces - data map of descendants to ancestors + */ + static TopoDS_Face GetNextFace( const TAncestorMap& edgeToFaces, + const TopoDS_Edge& edge, + const TopoDS_Face& face); + /*! + * \brief Return other vertex of an edge + */ + static TopoDS_Vertex GetNextVertex(const TopoDS_Edge& edge, + const TopoDS_Vertex& vertex); + + /*! + * \brief Return an oriented propagation edge + * \param aMesh - mesh + * \param fromEdge - start edge for propagation + * \retval pair - propagation step and found edge + */ + static std::pair GetPropagationEdge( SMESH_Mesh* aMesh, + const TopoDS_Edge& anEdge, + const TopoDS_Edge& fromEdge); + + /*! + * \brief Find corresponding nodes on two faces + * \param face1 - the first face + * \param mesh1 - mesh containing elements on the first face + * \param face2 - the second face + * \param mesh2 - mesh containing elements on the second face + * \param assocMap - map associating subshapes of the faces + * \param nodeIn2OutMap - map containing found matching nodes + * \retval bool - is a success + */ + static bool FindMatchingNodesOnFaces( const TopoDS_Face& face1, + SMESH_Mesh* mesh1, + const TopoDS_Face& face2, + SMESH_Mesh* mesh2, + const TShapeShapeMap & assocMap, + TNodeNodeMap & nodeIn2OutMap); + /*! + * \brief Check if the first and last vertices of an edge are the same + * \param anEdge - the edge to check + * \retval bool - true if same + */ + static bool IsClosedEdge( const TopoDS_Edge& anEdge ); + + /*! + * \brief Return any subshape of a face belonging to the outer wire + * \param face - the face + * \param type - type of subshape to return + * \retval TopoDS_Shape - the found subshape + */ + static TopoDS_Shape OuterShape( const TopoDS_Face& face, + TopAbs_ShapeEnum type); + + /*! + * \brief Check that submeshis is computed and try to compute it if is not + * \param sm - submesh to compute + * \param iterationNb - int used to stop infinite recursive call + * \retval bool - true if computed + */ + static bool MakeComputed(SMESH_subMesh * sm, const int iterationNb = 0); + + /*! + * \brief Count nb of subshapes + * \param shape - the shape + * \param type - the type of subshapes to count + * \param ignoreSame - if true, use map not to count same shapes, esle use explorer + * \retval int - the calculated number + */ + static int Count(const TopoDS_Shape& shape, + const TopAbs_ShapeEnum type, + const bool ignoreSame); + + /*! + * \brief Set event listeners to submesh with projection algo + * \param subMesh - submesh with projection algo + * \param srcShape - source shape + * \param srcMesh - source mesh + */ + static void SetEventListener(SMESH_subMesh* subMesh, + TopoDS_Shape srcShape, + SMESH_Mesh* srcMesh); + + /*! + * \brief Return true if edge is a boundary of edgeContainer + */ + static bool IsBoundaryEdge(const TopoDS_Edge& edge, + const TopoDS_Shape& edgeContainer, + SMESH_Mesh& mesh); +}; + +#endif diff --git a/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp.orig b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp.orig new file mode 100644 index 000000000000..b8a94ea6d564 --- /dev/null +++ b/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp.orig @@ -0,0 +1,3333 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + +#include "SMESH_ControlsDef.hxx" + +#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 "SMDS_Mesh.hxx" +#include "SMDS_Iterator.hxx" +#include "SMDS_MeshElement.hxx" +#include "SMDS_MeshNode.hxx" +#include "SMDS_VolumeTool.hxx" +#include "SMDS_QuadraticFaceOfNodes.hxx" +#include "SMDS_QuadraticEdge.hxx" + +#include "SMESHDS_Mesh.hxx" +#include "SMESHDS_GroupBase.hxx" + +#ifndef PI +#define PI M_PI +#endif + +/* + AUXILIARY METHODS +*/ + +namespace{ + inline double getAngle( const gp_XYZ& P1, const gp_XYZ& P2, const gp_XYZ& P3 ) + { + gp_Vec v1( P1 - P2 ), v2( P3 - P2 ); + + return v1.Magnitude() < gp::Resolution() || + v2.Magnitude() < gp::Resolution() ? 0 : v1.Angle( v2 ); + } + + inline double getArea( const gp_XYZ& P1, const gp_XYZ& P2, const gp_XYZ& P3 ) + { + gp_Vec aVec1( P2 - P1 ); + gp_Vec aVec2( P3 - P1 ); + return ( aVec1 ^ aVec2 ).Magnitude() * 0.5; + } + + inline double getArea( const gp_Pnt& P1, const gp_Pnt& P2, const gp_Pnt& P3 ) + { + return getArea( P1.XYZ(), P2.XYZ(), P3.XYZ() ); + } + + + + inline double getDistance( const gp_XYZ& P1, const gp_XYZ& P2 ) + { + double aDist = gp_Pnt( P1 ).Distance( gp_Pnt( P2 ) ); + return aDist; + } + + int getNbMultiConnection( const SMDS_Mesh* theMesh, const int theId ) + { + if ( theMesh == 0 ) + return 0; + + const SMDS_MeshElement* anEdge = theMesh->FindElement( theId ); + if ( anEdge == 0 || anEdge->GetType() != SMDSAbs_Edge/* || anEdge->NbNodes() != 2 */) + return 0; + + // for each pair of nodes in anEdge (there are 2 pairs in a quadratic edge) + // count elements containing both nodes of the pair. + // Note that there may be such cases for a quadratic edge (a horizontal line): + // + // Case 1 Case 2 + // | | | | | + // | | | | | + // +-----+------+ +-----+------+ + // | | | | + // | | | | + // result sould be 2 in both cases + // + int aResult0 = 0, aResult1 = 0; + // last node, it is a medium one in a quadratic edge + const SMDS_MeshNode* aLastNode = anEdge->GetNode( anEdge->NbNodes() - 1 ); + const SMDS_MeshNode* aNode0 = anEdge->GetNode( 0 ); + const SMDS_MeshNode* aNode1 = anEdge->GetNode( 1 ); + if ( aNode1 == aLastNode ) aNode1 = 0; + + SMDS_ElemIteratorPtr anElemIter = aLastNode->GetInverseElementIterator(); + while( anElemIter->more() ) { + const SMDS_MeshElement* anElem = anElemIter->next(); + if ( anElem != 0 && anElem->GetType() != SMDSAbs_Edge ) { + SMDS_ElemIteratorPtr anIter = anElem->nodesIterator(); + while ( anIter->more() ) { + if ( const SMDS_MeshElement* anElemNode = anIter->next() ) { + if ( anElemNode == aNode0 ) { + aResult0++; + if ( !aNode1 ) break; // not a quadratic edge + } + else if ( anElemNode == aNode1 ) + aResult1++; + } + } + } + } + int aResult = std::max ( aResult0, aResult1 ); + +// TColStd_MapOfInteger aMap; + +// SMDS_ElemIteratorPtr anIter = anEdge->nodesIterator(); +// if ( anIter != 0 ) { +// while( anIter->more() ) { +// const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next(); +// if ( aNode == 0 ) +// return 0; +// SMDS_ElemIteratorPtr anElemIter = aNode->GetInverseElementIterator(); +// while( anElemIter->more() ) { +// const SMDS_MeshElement* anElem = anElemIter->next(); +// if ( anElem != 0 && anElem->GetType() != SMDSAbs_Edge ) { +// int anId = anElem->GetID(); + +// if ( anIter->more() ) // i.e. first node +// aMap.Add( anId ); +// else if ( aMap.Contains( anId ) ) +// aResult++; +// } +// } +// } +// } + + return aResult; + } + +} + + + +using namespace SMESH::Controls; + +/* + FUNCTORS +*/ + +/* + Class : NumericalFunctor + Description : Base class for numerical functors +*/ +NumericalFunctor::NumericalFunctor(): + myMesh(NULL) +{ + myPrecision = -1; +} + +void NumericalFunctor::SetMesh( const SMDS_Mesh* theMesh ) +{ + myMesh = theMesh; +} + +bool NumericalFunctor::GetPoints(const int theId, + TSequenceOfXYZ& theRes ) const +{ + theRes.clear(); + + if ( myMesh == 0 ) + return false; + + return GetPoints( myMesh->FindElement( theId ), theRes ); +} + +bool NumericalFunctor::GetPoints(const SMDS_MeshElement* anElem, + TSequenceOfXYZ& theRes ) +{ + theRes.clear(); + + if ( anElem == 0) + return false; + + theRes.reserve( anElem->NbNodes() ); + + // Get nodes of the element + SMDS_ElemIteratorPtr anIter; + + if ( anElem->IsQuadratic() ) { + switch ( anElem->GetType() ) { + case SMDSAbs_Edge: + anIter = static_cast + (anElem)->interlacedNodesElemIterator(); + break; + case SMDSAbs_Face: + anIter = static_cast + (anElem)->interlacedNodesElemIterator(); + break; + default: + anIter = anElem->nodesIterator(); + //return false; + } + } + else { + anIter = anElem->nodesIterator(); + } + + if ( anIter ) { + while( anIter->more() ) { + if ( const SMDS_MeshNode* aNode = static_cast( anIter->next() )) + theRes.push_back( gp_XYZ( aNode->X(), aNode->Y(), aNode->Z() ) ); + } + } + + return true; +} + +long NumericalFunctor::GetPrecision() const +{ + return myPrecision; +} + +void NumericalFunctor::SetPrecision( const long thePrecision ) +{ + myPrecision = thePrecision; +} + +double NumericalFunctor::GetValue( long theId ) +{ + myCurrElement = myMesh->FindElement( theId ); + TSequenceOfXYZ P; + if ( GetPoints( theId, P )) + { + double aVal = GetValue( P ); + if ( myPrecision >= 0 ) + { + double prec = pow( 10., (double)( myPrecision ) ); + aVal = floor( aVal * prec + 0.5 ) / prec; + } + return aVal; + } + + return 0.; +} + +//======================================================================= +//function : GetValue +//purpose : +//======================================================================= + +double Volume::GetValue( long theElementId ) +{ + if ( theElementId && myMesh ) { + SMDS_VolumeTool aVolumeTool; + if ( aVolumeTool.Set( myMesh->FindElement( theElementId ))) + return aVolumeTool.GetSize(); + } + return 0; +} + +//======================================================================= +//function : GetBadRate +//purpose : meaningless as it is not quality control functor +//======================================================================= + +double Volume::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + return Value; +} + +//======================================================================= +//function : GetType +//purpose : +//======================================================================= + +SMDSAbs_ElementType Volume::GetType() const +{ + return SMDSAbs_Volume; +} + + +/* + Class : MinimumAngle + Description : Functor for calculation of minimum angle +*/ + +double MinimumAngle::GetValue( const TSequenceOfXYZ& P ) +{ + double aMin; + + if (P.size() <3) + return 0.; + + aMin = getAngle(P( P.size() ), P( 1 ), P( 2 )); + aMin = Min(aMin,getAngle(P( P.size()-1 ), P( P.size() ), P( 1 ))); + + for (int i=2; i aLen (nbNodes); + for ( int i = 0; i < nbNodes - 1; i++ ) + aLen[ i ] = getDistance( P( i + 1 ), P( i + 2 ) ); + aLen[ nbNodes - 1 ] = getDistance( P( 1 ), P( nbNodes ) ); + // Q = alfa * h * p / S, where + // + // alfa = sqrt( 3 ) / 6 + // h - length of the longest edge + // p - half perimeter + // S - triangle surface + const double alfa = sqrt( 3. ) / 6.; + double maxLen = Max( aLen[ 0 ], Max( aLen[ 1 ], aLen[ 2 ] ) ); + double half_perimeter = ( aLen[0] + aLen[1] + aLen[2] ) / 2.; + double anArea = getArea( P( 1 ), P( 2 ), P( 3 ) ); + if ( anArea <= Precision::Confusion() ) + return 0.; + return alfa * maxLen * half_perimeter / anArea; + } + else if ( nbNodes == 6 ) { // quadratic triangles + // Compute lengths of the sides + std::vector< double > aLen (3); + aLen[0] = getDistance( P(1), P(3) ); + aLen[1] = getDistance( P(3), P(5) ); + aLen[2] = getDistance( P(5), P(1) ); + // Q = alfa * h * p / S, where + // + // alfa = sqrt( 3 ) / 6 + // h - length of the longest edge + // p - half perimeter + // S - triangle surface + const double alfa = sqrt( 3. ) / 6.; + double maxLen = Max( aLen[ 0 ], Max( aLen[ 1 ], aLen[ 2 ] ) ); + double half_perimeter = ( aLen[0] + aLen[1] + aLen[2] ) / 2.; + double anArea = getArea( P(1), P(3), P(5) ); + if ( anArea <= Precision::Confusion() ) + return 0.; + return alfa * maxLen * half_perimeter / anArea; + } + else if( nbNodes == 4 ) { // quadrangle + // return aspect ratio of the worst triange which can be built + // taking three nodes of the quadrangle + TSequenceOfXYZ triaPnts(3); + // triangle on nodes 1 3 2 + triaPnts(1) = P(1); + triaPnts(2) = P(3); + triaPnts(3) = P(2); + double ar = GetValue( triaPnts ); + // triangle on nodes 1 3 4 + triaPnts(3) = P(4); + ar = Max ( ar, GetValue( triaPnts )); + // triangle on nodes 1 2 4 + triaPnts(2) = P(2); + ar = Max ( ar, GetValue( triaPnts )); + // triangle on nodes 3 2 4 + triaPnts(1) = P(3); + ar = Max ( ar, GetValue( triaPnts )); + + return ar; + } + else { // nbNodes==8 - quadratic quadrangle + // return aspect ratio of the worst triange which can be built + // taking three nodes of the quadrangle + TSequenceOfXYZ triaPnts(3); + // triangle on nodes 1 3 2 + triaPnts(1) = P(1); + triaPnts(2) = P(5); + triaPnts(3) = P(3); + double ar = GetValue( triaPnts ); + // triangle on nodes 1 3 4 + triaPnts(3) = P(7); + ar = Max ( ar, GetValue( triaPnts )); + // triangle on nodes 1 2 4 + triaPnts(2) = P(3); + ar = Max ( ar, GetValue( triaPnts )); + // triangle on nodes 3 2 4 + triaPnts(1) = P(5); + ar = Max ( ar, GetValue( triaPnts )); + + return ar; + } +} + +double AspectRatio::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // the aspect ratio is in the range [1.0,infinity] + // 1.0 = good + // infinity = bad + return Value / 1000.; +} + +SMDSAbs_ElementType AspectRatio::GetType() const +{ + return SMDSAbs_Face; +} + + +/* + Class : AspectRatio3D + Description : Functor for calculating aspect ratio +*/ +namespace{ + + inline double getHalfPerimeter(double theTria[3]){ + return (theTria[0] + theTria[1] + theTria[2])/2.0; + } + + inline double getArea(double theHalfPerim, double theTria[3]){ + return sqrt(theHalfPerim* + (theHalfPerim-theTria[0])* + (theHalfPerim-theTria[1])* + (theHalfPerim-theTria[2])); + } + + inline double getVolume(double theLen[6]){ + double a2 = theLen[0]*theLen[0]; + double b2 = theLen[1]*theLen[1]; + double c2 = theLen[2]*theLen[2]; + double d2 = theLen[3]*theLen[3]; + double e2 = theLen[4]*theLen[4]; + double f2 = theLen[5]*theLen[5]; + double P = 4.0*a2*b2*d2; + double Q = a2*(b2+d2-e2)-b2*(a2+d2-f2)-d2*(a2+b2-c2); + double R = (b2+d2-e2)*(a2+d2-f2)*(a2+d2-f2); + return sqrt(P-Q+R)/12.0; + } + + inline double getVolume2(double theLen[6]){ + double a2 = theLen[0]*theLen[0]; + double b2 = theLen[1]*theLen[1]; + double c2 = theLen[2]*theLen[2]; + double d2 = theLen[3]*theLen[3]; + double e2 = theLen[4]*theLen[4]; + double f2 = theLen[5]*theLen[5]; + + double P = a2*e2*(b2+c2+d2+f2-a2-e2); + double Q = b2*f2*(a2+c2+d2+e2-b2-f2); + double R = c2*d2*(a2+b2+e2+f2-c2-d2); + double S = a2*b2*d2+b2*c2*e2+a2*c2*f2+d2*e2*f2; + + return sqrt(P+Q+R-S)/12.0; + } + + inline double getVolume(const TSequenceOfXYZ& P){ + gp_Vec aVec1( P( 2 ) - P( 1 ) ); + gp_Vec aVec2( P( 3 ) - P( 1 ) ); + gp_Vec aVec3( P( 4 ) - P( 1 ) ); + gp_Vec anAreaVec( aVec1 ^ aVec2 ); + return fabs(aVec3 * anAreaVec) / 6.0; + } + + inline double getMaxHeight(double theLen[6]) + { + double aHeight = std::max(theLen[0],theLen[1]); + aHeight = std::max(aHeight,theLen[2]); + aHeight = std::max(aHeight,theLen[3]); + aHeight = std::max(aHeight,theLen[4]); + aHeight = std::max(aHeight,theLen[5]); + return aHeight; + } + +} + +double AspectRatio3D::GetValue( const TSequenceOfXYZ& P ) +{ + double aQuality = 0.0; + if(myCurrElement->IsPoly()) return aQuality; + + int nbNodes = P.size(); + + if(myCurrElement->IsQuadratic()) { + if(nbNodes==10) nbNodes=4; // quadratic tetrahedron + else if(nbNodes==13) nbNodes=5; // quadratic pyramid + else if(nbNodes==15) nbNodes=6; // quadratic pentahedron + else if(nbNodes==20) nbNodes=8; // quadratic hexahedron + else return aQuality; + } + + switch(nbNodes){ + case 4:{ + double aLen[6] = { + getDistance(P( 1 ),P( 2 )), // a + getDistance(P( 2 ),P( 3 )), // b + getDistance(P( 3 ),P( 1 )), // c + getDistance(P( 2 ),P( 4 )), // d + getDistance(P( 3 ),P( 4 )), // e + getDistance(P( 1 ),P( 4 )) // f + }; + double aTria[4][3] = { + {aLen[0],aLen[1],aLen[2]}, // abc + {aLen[0],aLen[3],aLen[5]}, // adf + {aLen[1],aLen[3],aLen[4]}, // bde + {aLen[2],aLen[4],aLen[5]} // cef + }; + double aSumArea = 0.0; + double aHalfPerimeter = getHalfPerimeter(aTria[0]); + double anArea = getArea(aHalfPerimeter,aTria[0]); + aSumArea += anArea; + aHalfPerimeter = getHalfPerimeter(aTria[1]); + anArea = getArea(aHalfPerimeter,aTria[1]); + aSumArea += anArea; + aHalfPerimeter = getHalfPerimeter(aTria[2]); + anArea = getArea(aHalfPerimeter,aTria[2]); + aSumArea += anArea; + aHalfPerimeter = getHalfPerimeter(aTria[3]); + anArea = getArea(aHalfPerimeter,aTria[3]); + aSumArea += anArea; + double aVolume = getVolume(P); + //double aVolume = getVolume(aLen); + double aHeight = getMaxHeight(aLen); + static double aCoeff = sqrt(2.0)/12.0; + if ( aVolume > DBL_MIN ) + aQuality = aCoeff*aHeight*aSumArea/aVolume; + break; + } + case 5:{ + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 3 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 3 ),P( 4 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 4 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 3 ),P( 4 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + break; + } + case 6:{ + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 4 ),P( 6 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 4 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 5 ),P( 6 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 5 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 5 ),P( 4 ),P( 6 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 5 ),P( 4 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + break; + } + case 8:{ + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 5 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 5 ),P( 4 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 5 ),P( 7 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 5 ),P( 8 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 6 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 6 ),P( 4 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 6 ),P( 7 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 6 ),P( 8 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 6 ),P( 5 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 6 ),P( 5 ),P( 4 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 6 ),P( 5 ),P( 7 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 6 ),P( 5 ),P( 8 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 8 ),P( 1 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 8 ),P( 2 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 8 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 8 ),P( 6 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 7 ),P( 1 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 7 ),P( 2 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 7 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 7 ),P( 6 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 4 ),P( 8 ),P( 7 ),P( 1 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 4 ),P( 8 ),P( 7 ),P( 2 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 4 ),P( 8 ),P( 7 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 4 ),P( 8 ),P( 7 ),P( 6 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 4 ),P( 8 ),P( 7 ),P( 2 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 4 ),P( 5 ),P( 8 ),P( 2 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 4 ),P( 5 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 6 ),P( 7 ),P( 1 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 2 ),P( 3 ),P( 6 ),P( 4 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 5 ),P( 6 ),P( 8 ),P( 3 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 7 ),P( 8 ),P( 6 ),P( 1 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 1 ),P( 2 ),P( 4 ),P( 7 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + { + gp_XYZ aXYZ[4] = {P( 3 ),P( 4 ),P( 2 ),P( 5 )}; + aQuality = std::max(GetValue(TSequenceOfXYZ(&aXYZ[0],&aXYZ[4])),aQuality); + } + break; + } + } + if ( nbNodes > 4 ) { + // avaluate aspect ratio of quadranle faces + AspectRatio aspect2D; + SMDS_VolumeTool::VolumeType type = SMDS_VolumeTool::GetType( nbNodes ); + int nbFaces = SMDS_VolumeTool::NbFaces( type ); + TSequenceOfXYZ points(4); + for ( int i = 0; i < nbFaces; ++i ) { // loop on faces of a volume + if ( SMDS_VolumeTool::NbFaceNodes( type, i ) != 4 ) + continue; + const int* pInd = SMDS_VolumeTool::GetFaceNodesIndices( type, i, true ); + for ( int p = 0; p < 4; ++p ) // loop on nodes of a quadranle face + points( p + 1 ) = P( pInd[ p ] + 1 ); + aQuality = std::max( aQuality, aspect2D.GetValue( points )); + } + } + return aQuality; +} + +double AspectRatio3D::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // the aspect ratio is in the range [1.0,infinity] + // 1.0 = good + // infinity = bad + return Value / 1000.; +} + +SMDSAbs_ElementType AspectRatio3D::GetType() const +{ + return SMDSAbs_Volume; +} + + +/* + Class : Warping + Description : Functor for calculating warping +*/ +double Warping::GetValue( const TSequenceOfXYZ& P ) +{ + if ( P.size() != 4 ) + return 0; + + gp_XYZ G = ( P( 1 ) + P( 2 ) + P( 3 ) + P( 4 ) ) / 4.; + + double A1 = ComputeA( P( 1 ), P( 2 ), P( 3 ), G ); + double A2 = ComputeA( P( 2 ), P( 3 ), P( 4 ), G ); + double A3 = ComputeA( P( 3 ), P( 4 ), P( 1 ), G ); + double A4 = ComputeA( P( 4 ), P( 1 ), P( 2 ), G ); + + return Max( Max( A1, A2 ), Max( A3, A4 ) ); +} + +double Warping::ComputeA( const gp_XYZ& thePnt1, + const gp_XYZ& thePnt2, + const gp_XYZ& thePnt3, + const gp_XYZ& theG ) const +{ + double aLen1 = gp_Pnt( thePnt1 ).Distance( gp_Pnt( thePnt2 ) ); + double aLen2 = gp_Pnt( thePnt2 ).Distance( gp_Pnt( thePnt3 ) ); + double L = Min( aLen1, aLen2 ) * 0.5; + if ( L < Precision::Confusion()) + return 0.; + + gp_XYZ GI = ( thePnt2 + thePnt1 ) / 2. - theG; + gp_XYZ GJ = ( thePnt3 + thePnt2 ) / 2. - theG; + gp_XYZ N = GI.Crossed( GJ ); + + if ( N.Modulus() < gp::Resolution() ) + return PI / 2; + + N.Normalize(); + + double H = ( thePnt2 - theG ).Dot( N ); + return asin( fabs( H / L ) ) * 180. / PI; +} + +double Warping::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // the warp is in the range [0.0,PI/2] + // 0.0 = good (no warp) + // PI/2 = bad (face pliee) + return Value; +} + +SMDSAbs_ElementType Warping::GetType() const +{ + return SMDSAbs_Face; +} + + +/* + Class : Taper + Description : Functor for calculating taper +*/ +double Taper::GetValue( const TSequenceOfXYZ& P ) +{ + if ( P.size() != 4 ) + return 0.; + + // Compute taper + double J1 = getArea( P( 4 ), P( 1 ), P( 2 ) ) / 2.; + double J2 = getArea( P( 3 ), P( 1 ), P( 2 ) ) / 2.; + double J3 = getArea( P( 2 ), P( 3 ), P( 4 ) ) / 2.; + double J4 = getArea( P( 3 ), P( 4 ), P( 1 ) ) / 2.; + + double JA = 0.25 * ( J1 + J2 + J3 + J4 ); + if ( JA <= Precision::Confusion() ) + return 0.; + + double T1 = fabs( ( J1 - JA ) / JA ); + double T2 = fabs( ( J2 - JA ) / JA ); + double T3 = fabs( ( J3 - JA ) / JA ); + double T4 = fabs( ( J4 - JA ) / JA ); + + return Max( Max( T1, T2 ), Max( T3, T4 ) ); +} + +double Taper::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // the taper is in the range [0.0,1.0] + // 0.0 = good (no taper) + // 1.0 = bad (les cotes opposes sont allignes) + return Value; +} + +SMDSAbs_ElementType Taper::GetType() const +{ + return SMDSAbs_Face; +} + + +/* + Class : Skew + Description : Functor for calculating skew in degrees +*/ +static inline double skewAngle( const gp_XYZ& p1, const gp_XYZ& p2, const gp_XYZ& p3 ) +{ + gp_XYZ p12 = ( p2 + p1 ) / 2.; + gp_XYZ p23 = ( p3 + p2 ) / 2.; + gp_XYZ p31 = ( p3 + p1 ) / 2.; + + gp_Vec v1( p31 - p2 ), v2( p12 - p23 ); + + return v1.Magnitude() < gp::Resolution() || v2.Magnitude() < gp::Resolution() ? 0. : v1.Angle( v2 ); +} + +double Skew::GetValue( const TSequenceOfXYZ& P ) +{ + if ( P.size() != 3 && P.size() != 4 ) + return 0.; + + // Compute skew + static double PI2 = PI / 2.; + if ( P.size() == 3 ) + { + double A0 = fabs( PI2 - skewAngle( P( 3 ), P( 1 ), P( 2 ) ) ); + double A1 = fabs( PI2 - skewAngle( P( 1 ), P( 2 ), P( 3 ) ) ); + double A2 = fabs( PI2 - skewAngle( P( 2 ), P( 3 ), P( 1 ) ) ); + + return Max( A0, Max( A1, A2 ) ) * 180. / PI; + } + else + { + gp_XYZ p12 = ( P( 1 ) + P( 2 ) ) / 2.; + gp_XYZ p23 = ( P( 2 ) + P( 3 ) ) / 2.; + gp_XYZ p34 = ( P( 3 ) + P( 4 ) ) / 2.; + gp_XYZ p41 = ( P( 4 ) + P( 1 ) ) / 2.; + + gp_Vec v1( p34 - p12 ), v2( p23 - p41 ); + double A = v1.Magnitude() <= gp::Resolution() || v2.Magnitude() <= gp::Resolution() + ? 0. : fabs( PI2 - v1.Angle( v2 ) ); + + //BUG SWP12743 + if ( A < Precision::Angular() ) + return 0.; + + return A * 180. / PI; + } +} + +double Skew::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // the skew is in the range [0.0,PI/2]. + // 0.0 = good + // PI/2 = bad + return Value; +} + +SMDSAbs_ElementType Skew::GetType() const +{ + return SMDSAbs_Face; +} + + +/* + Class : Area + Description : Functor for calculating area +*/ +double Area::GetValue( const TSequenceOfXYZ& P ) +{ + gp_Vec aVec1( P(2) - P(1) ); + gp_Vec aVec2( P(3) - P(1) ); + gp_Vec SumVec = aVec1 ^ aVec2; + for (int i=4; i<=P.size(); i++) { + gp_Vec aVec1( P(i-1) - P(1) ); + gp_Vec aVec2( P(i) - P(1) ); + gp_Vec tmp = aVec1 ^ aVec2; + SumVec.Add(tmp); + } + return SumVec.Magnitude() * 0.5; +} + +double Area::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // meaningless as it is not a quality control functor + return Value; +} + +SMDSAbs_ElementType Area::GetType() const +{ + return SMDSAbs_Face; +} + + +/* + Class : Length + Description : Functor for calculating length off edge +*/ +double Length::GetValue( const TSequenceOfXYZ& P ) +{ + switch ( P.size() ) { + case 2: return getDistance( P( 1 ), P( 2 ) ); + case 3: return getDistance( P( 1 ), P( 2 ) ) + getDistance( P( 2 ), P( 3 ) ); + default: return 0.; + } +} + +double Length::GetBadRate( double Value, int /*nbNodes*/ ) const +{ + // meaningless as it is not quality control functor + return Value; +} + +SMDSAbs_ElementType Length::GetType() const +{ + return SMDSAbs_Edge; +} + +/* + Class : Length2D + Description : Functor for calculating length of edge +*/ + +double Length2D::GetValue( long theElementId) +{ + TSequenceOfXYZ P; + + //cout<<"Length2D::GetValue"<FindElement( theElementId ); + SMDSAbs_ElementType aType = aElem->GetType(); + + int len = P.size(); + + switch (aType){ + case SMDSAbs_All: + case SMDSAbs_Node: + case SMDSAbs_Edge: + if (len == 2){ + aVal = getDistance( P( 1 ), P( 2 ) ); + break; + } + else if (len == 3){ // quadratic edge + aVal = getDistance(P( 1 ),P( 3 )) + getDistance(P( 3 ),P( 2 )); + break; + } + case SMDSAbs_Face: + if (len == 3){ // triangles + double L1 = getDistance(P( 1 ),P( 2 )); + double L2 = getDistance(P( 2 ),P( 3 )); + double L3 = getDistance(P( 3 ),P( 1 )); + aVal = Max(L1,Max(L2,L3)); + break; + } + else if (len == 4){ // quadrangles + double L1 = getDistance(P( 1 ),P( 2 )); + double L2 = getDistance(P( 2 ),P( 3 )); + double L3 = getDistance(P( 3 ),P( 4 )); + double L4 = getDistance(P( 4 ),P( 1 )); + aVal = Max(Max(L1,L2),Max(L3,L4)); + break; + } + if (len == 6){ // quadratic triangles + double L1 = getDistance(P( 1 ),P( 2 )) + getDistance(P( 2 ),P( 3 )); + double L2 = getDistance(P( 3 ),P( 4 )) + getDistance(P( 4 ),P( 5 )); + double L3 = getDistance(P( 5 ),P( 6 )) + getDistance(P( 6 ),P( 1 )); + aVal = Max(L1,Max(L2,L3)); + //cout<<"L1="<FindElement( theId ); + const SMDSAbs_ElementType anElemType = anElem->GetType(); + if ( !anElem || (myType != SMDSAbs_All && anElemType != myType) ) + return false; + const int aNbNode = anElem->NbNodes(); + bool isOk = false; + switch( anElemType ) + { + case SMDSAbs_Node: + isOk = (myGeomType == SMDSGeom_POINT); + break; + + case SMDSAbs_Edge: + isOk = (myGeomType == SMDSGeom_EDGE); + break; + + case SMDSAbs_Face: + if ( myGeomType == SMDSGeom_TRIANGLE ) + isOk = (!anElem->IsPoly() && (anElem->IsQuadratic() ? aNbNode == 6 : aNbNode == 3)); + else if ( myGeomType == SMDSGeom_QUADRANGLE ) + isOk = (!anElem->IsPoly() && (anElem->IsQuadratic() ? aNbNode == 8 : aNbNode == 4)); + else if ( myGeomType == SMDSGeom_POLYGON ) + isOk = anElem->IsPoly(); + break; + + case SMDSAbs_Volume: + if ( myGeomType == SMDSGeom_TETRA ) + isOk = (!anElem->IsPoly() && (anElem->IsQuadratic() ? aNbNode == 10 : aNbNode == 4)); + else if ( myGeomType == SMDSGeom_PYRAMID ) + isOk = (!anElem->IsPoly() && (anElem->IsQuadratic() ? aNbNode == 13 : aNbNode == 5)); + else if ( myGeomType == SMDSGeom_PENTA ) + isOk = (!anElem->IsPoly() && (anElem->IsQuadratic() ? aNbNode == 15 : aNbNode == 6)); + else if ( myGeomType == SMDSGeom_HEXA ) + isOk = (!anElem->IsPoly() && (anElem->IsQuadratic() ? aNbNode == 20 : aNbNode == 8)); + else if ( myGeomType == SMDSGeom_POLYHEDRA ) + isOk = anElem->IsPoly(); + break; + + default: break; + } + return isOk; +} + +void ElemGeomType::SetType( SMDSAbs_ElementType theType ) +{ + myType = theType; +} + +SMDSAbs_ElementType ElemGeomType::GetType() const +{ + return myType; +} + +void ElemGeomType::SetGeomType( SMDSAbs_GeometryType theType ) +{ + myGeomType = theType; +} + +SMDSAbs_GeometryType ElemGeomType::GetGeomType() const +{ + return myGeomType; +} + +/* + Class : RangeOfIds + Description : Predicate for Range of Ids. + Range may be specified with two ways. + 1. Using AddToRange method + 2. With SetRangeStr method. Parameter of this method is a string + like as "1,2,3,50-60,63,67,70-" +*/ + +//======================================================================= +// name : RangeOfIds +// Purpose : Constructor +//======================================================================= +RangeOfIds::RangeOfIds() +{ + myMesh = 0; + myType = SMDSAbs_All; +} + +//======================================================================= +// name : SetMesh +// Purpose : Set mesh +//======================================================================= +void RangeOfIds::SetMesh( const SMDS_Mesh* theMesh ) +{ + myMesh = theMesh; +} + +//======================================================================= +// name : AddToRange +// Purpose : Add ID to the range +//======================================================================= +bool RangeOfIds::AddToRange( long theEntityId ) +{ + myIds.Add( theEntityId ); + return true; +} + +//======================================================================= +// name : GetRangeStr +// Purpose : Get range as a string. +// Example: "1,2,3,50-60,63,67,70-" +//======================================================================= +void RangeOfIds::GetRangeStr( TCollection_AsciiString& theResStr ) +{ + theResStr.Clear(); + + TColStd_SequenceOfInteger anIntSeq; + TColStd_SequenceOfAsciiString aStrSeq; + + TColStd_MapIteratorOfMapOfInteger anIter( myIds ); + for ( ; anIter.More(); anIter.Next() ) + { + int anId = anIter.Key(); + TCollection_AsciiString aStr( anId ); + anIntSeq.Append( anId ); + aStrSeq.Append( aStr ); + } + + for ( int i = 1, n = myMin.Length(); i <= n; i++ ) + { + int aMinId = myMin( i ); + int aMaxId = myMax( i ); + + TCollection_AsciiString aStr; + if ( aMinId != IntegerFirst() ) + aStr += aMinId; + + aStr += "-"; + + if ( aMaxId != IntegerLast() ) + aStr += aMaxId; + + // find position of the string in result sequence and insert string in it + if ( anIntSeq.Length() == 0 ) + { + anIntSeq.Append( aMinId ); + aStrSeq.Append( aStr ); + } + else + { + if ( aMinId < anIntSeq.First() ) + { + anIntSeq.Prepend( aMinId ); + aStrSeq.Prepend( aStr ); + } + else if ( aMinId > anIntSeq.Last() ) + { + anIntSeq.Append( aMinId ); + aStrSeq.Append( aStr ); + } + else + for ( int j = 1, k = anIntSeq.Length(); j <= k; j++ ) + if ( aMinId < anIntSeq( j ) ) + { + anIntSeq.InsertBefore( j, aMinId ); + aStrSeq.InsertBefore( j, aStr ); + break; + } + } + } + + if ( aStrSeq.Length() == 0 ) + return; + + theResStr = aStrSeq( 1 ); + for ( int j = 2, k = aStrSeq.Length(); j <= k; j++ ) + { + theResStr += ","; + theResStr += aStrSeq( j ); + } +} + +//======================================================================= +// name : SetRangeStr +// Purpose : Define range with string +// Example of entry string: "1,2,3,50-60,63,67,70-" +//======================================================================= +bool RangeOfIds::SetRangeStr( const TCollection_AsciiString& theStr ) +{ + myMin.Clear(); + myMax.Clear(); + myIds.Clear(); + + TCollection_AsciiString aStr = theStr; + aStr.RemoveAll( ' ' ); + aStr.RemoveAll( '\t' ); + + for ( int aPos = aStr.Search( ",," ); aPos != -1; aPos = aStr.Search( ",," ) ) + aStr.Remove( aPos, 2 ); + + TCollection_AsciiString tmpStr = aStr.Token( ",", 1 ); + int i = 1; + while ( tmpStr != "" ) + { + tmpStr = aStr.Token( ",", i++ ); + int aPos = tmpStr.Search( '-' ); + + if ( aPos == -1 ) + { + if ( tmpStr.IsIntegerValue() ) + myIds.Add( tmpStr.IntegerValue() ); + else + return false; + } + else + { + TCollection_AsciiString aMaxStr = tmpStr.Split( aPos ); + TCollection_AsciiString aMinStr = tmpStr; + + while ( aMinStr.Search( "-" ) != -1 ) aMinStr.RemoveAll( '-' ); + while ( aMaxStr.Search( "-" ) != -1 ) aMaxStr.RemoveAll( '-' ); + + if ( (!aMinStr.IsEmpty() && !aMinStr.IsIntegerValue()) || + (!aMaxStr.IsEmpty() && !aMaxStr.IsIntegerValue()) ) + return false; + + myMin.Append( aMinStr.IsEmpty() ? IntegerFirst() : aMinStr.IntegerValue() ); + myMax.Append( aMaxStr.IsEmpty() ? IntegerLast() : aMaxStr.IntegerValue() ); + } + } + + return true; +} + +//======================================================================= +// name : GetType +// Purpose : Get type of supported entities +//======================================================================= +SMDSAbs_ElementType RangeOfIds::GetType() const +{ + return myType; +} + +//======================================================================= +// name : SetType +// Purpose : Set type of supported entities +//======================================================================= +void RangeOfIds::SetType( SMDSAbs_ElementType theType ) +{ + myType = theType; +} + +//======================================================================= +// name : IsSatisfy +// Purpose : Verify whether entity satisfies to this rpedicate +//======================================================================= +bool RangeOfIds::IsSatisfy( long theId ) +{ + if ( !myMesh ) + return false; + + if ( myType == SMDSAbs_Node ) + { + if ( myMesh->FindNode( theId ) == 0 ) + return false; + } + else + { + const SMDS_MeshElement* anElem = myMesh->FindElement( theId ); + if ( anElem == 0 || (myType != anElem->GetType() && myType != SMDSAbs_All) ) + return false; + } + + if ( myIds.Contains( theId ) ) + return true; + + for ( int i = 1, n = myMin.Length(); i <= n; i++ ) + if ( theId >= myMin( i ) && theId <= myMax( i ) ) + return true; + + return false; +} + +/* + Class : Comparator + Description : Base class for comparators +*/ +Comparator::Comparator(): + myMargin(0) +{} + +Comparator::~Comparator() +{} + +void Comparator::SetMesh( const SMDS_Mesh* theMesh ) +{ + if ( myFunctor ) + myFunctor->SetMesh( theMesh ); +} + +void Comparator::SetMargin( double theValue ) +{ + myMargin = theValue; +} + +void Comparator::SetNumFunctor( NumericalFunctorPtr theFunct ) +{ + myFunctor = theFunct; +} + +SMDSAbs_ElementType Comparator::GetType() const +{ + return myFunctor ? myFunctor->GetType() : SMDSAbs_All; +} + +double Comparator::GetMargin() +{ + return myMargin; +} + + +/* + Class : LessThan + Description : Comparator "<" +*/ +bool LessThan::IsSatisfy( long theId ) +{ + return (myFunctor!=NULL) && myFunctor->GetValue( theId ) < myMargin; +} + + +/* + Class : MoreThan + Description : Comparator ">" +*/ +bool MoreThan::IsSatisfy( long theId ) +{ + return (myFunctor!=NULL) && myFunctor->GetValue( theId ) > myMargin; +} + + +/* + Class : EqualTo + Description : Comparator "=" +*/ +EqualTo::EqualTo(): + myToler(Precision::Confusion()) +{} + +bool EqualTo::IsSatisfy( long theId ) +{ + return (myFunctor!=NULL) && fabs( myFunctor->GetValue( theId ) - myMargin ) < myToler; +} + +void EqualTo::SetTolerance( double theToler ) +{ + myToler = theToler; +} + +double EqualTo::GetTolerance() +{ + return myToler; +} + +/* + Class : LogicalNOT + Description : Logical NOT predicate +*/ +LogicalNOT::LogicalNOT() +{} + +LogicalNOT::~LogicalNOT() +{} + +bool LogicalNOT::IsSatisfy( long theId ) +{ + return (myPredicate!=NULL) && !myPredicate->IsSatisfy( theId ); +} + +void LogicalNOT::SetMesh( const SMDS_Mesh* theMesh ) +{ + if ( myPredicate ) + myPredicate->SetMesh( theMesh ); +} + +void LogicalNOT::SetPredicate( PredicatePtr thePred ) +{ + myPredicate = thePred; +} + +SMDSAbs_ElementType LogicalNOT::GetType() const +{ + return myPredicate ? myPredicate->GetType() : SMDSAbs_All; +} + + +/* + Class : LogicalBinary + Description : Base class for binary logical predicate +*/ +LogicalBinary::LogicalBinary() +{} + +LogicalBinary::~LogicalBinary() +{} + +void LogicalBinary::SetMesh( const SMDS_Mesh* theMesh ) +{ + if ( myPredicate1 ) + myPredicate1->SetMesh( theMesh ); + + if ( myPredicate2 ) + myPredicate2->SetMesh( theMesh ); +} + +void LogicalBinary::SetPredicate1( PredicatePtr thePredicate ) +{ + myPredicate1 = thePredicate; +} + +void LogicalBinary::SetPredicate2( PredicatePtr thePredicate ) +{ + myPredicate2 = thePredicate; +} + +SMDSAbs_ElementType LogicalBinary::GetType() const +{ + if ( !myPredicate1 || !myPredicate2 ) + return SMDSAbs_All; + + SMDSAbs_ElementType aType1 = myPredicate1->GetType(); + SMDSAbs_ElementType aType2 = myPredicate2->GetType(); + + return aType1 == aType2 ? aType1 : SMDSAbs_All; +} + + +/* + Class : LogicalAND + Description : Logical AND +*/ +bool LogicalAND::IsSatisfy( long theId ) +{ + return + (myPredicate1!=NULL) && + (myPredicate2!=NULL) && + myPredicate1->IsSatisfy( theId ) && + myPredicate2->IsSatisfy( theId ); +} + + +/* + Class : LogicalOR + Description : Logical OR +*/ +bool LogicalOR::IsSatisfy( long theId ) +{ + return + (myPredicate1!=NULL) && + (myPredicate2!=NULL) && ( + myPredicate1->IsSatisfy( theId ) || + myPredicate2->IsSatisfy( theId ) + ); +} + + +/* + FILTER +*/ + +Filter::Filter() +{} + +Filter::~Filter() +{} + +void Filter::SetPredicate( PredicatePtr thePredicate ) +{ + myPredicate = thePredicate; +} + +template +inline void FillSequence(const TIterator& theIterator, + TPredicate& thePredicate, + Filter::TIdSequence& theSequence) +{ + if ( theIterator ) { + while( theIterator->more() ) { + TElement anElem = theIterator->next(); + long anId = anElem->GetID(); + if ( thePredicate->IsSatisfy( anId ) ) + theSequence.push_back( anId ); + } + } +} + +void +Filter:: +GetElementsId( const SMDS_Mesh* theMesh, + PredicatePtr thePredicate, + TIdSequence& theSequence ) +{ + theSequence.clear(); + + if ( !theMesh || !thePredicate ) + return; + + thePredicate->SetMesh( theMesh ); + + SMDSAbs_ElementType aType = thePredicate->GetType(); + switch(aType){ + case SMDSAbs_Node: + FillSequence(theMesh->nodesIterator(),thePredicate,theSequence); + break; + case SMDSAbs_Edge: + FillSequence(theMesh->edgesIterator(),thePredicate,theSequence); + break; + case SMDSAbs_Face: + FillSequence(theMesh->facesIterator(),thePredicate,theSequence); + break; + case SMDSAbs_Volume: + FillSequence(theMesh->volumesIterator(),thePredicate,theSequence); + break; + case SMDSAbs_All: + FillSequence(theMesh->edgesIterator(),thePredicate,theSequence); + FillSequence(theMesh->facesIterator(),thePredicate,theSequence); + FillSequence(theMesh->volumesIterator(),thePredicate,theSequence); + break; + } +} + +void +Filter::GetElementsId( const SMDS_Mesh* theMesh, + Filter::TIdSequence& theSequence ) +{ + GetElementsId(theMesh,myPredicate,theSequence); +} + +/* + ManifoldPart +*/ + +typedef std::set TMapOfFacePtr; + +/* + Internal class Link +*/ + +ManifoldPart::Link::Link( SMDS_MeshNode* theNode1, + SMDS_MeshNode* theNode2 ) +{ + myNode1 = theNode1; + myNode2 = theNode2; +} + +ManifoldPart::Link::~Link() +{ + myNode1 = 0; + myNode2 = 0; +} + +bool ManifoldPart::Link::IsEqual( const ManifoldPart::Link& theLink ) const +{ + if ( myNode1 == theLink.myNode1 && + myNode2 == theLink.myNode2 ) + return true; + else if ( myNode1 == theLink.myNode2 && + myNode2 == theLink.myNode1 ) + return true; + else + return false; +} + +bool ManifoldPart::Link::operator<( const ManifoldPart::Link& x ) const +{ + if(myNode1 < x.myNode1) return true; + if(myNode1 == x.myNode1) + if(myNode2 < x.myNode2) return true; + return false; +} + +bool ManifoldPart::IsEqual( const ManifoldPart::Link& theLink1, + const ManifoldPart::Link& theLink2 ) +{ + return theLink1.IsEqual( theLink2 ); +} + +ManifoldPart::ManifoldPart() +{ + myMesh = 0; + myAngToler = Precision::Angular(); + myIsOnlyManifold = true; +} + +ManifoldPart::~ManifoldPart() +{ + myMesh = 0; +} + +void ManifoldPart::SetMesh( const SMDS_Mesh* theMesh ) +{ + myMesh = theMesh; + process(); +} + +SMDSAbs_ElementType ManifoldPart::GetType() const +{ return SMDSAbs_Face; } + +bool ManifoldPart::IsSatisfy( long theElementId ) +{ + return myMapIds.Contains( theElementId ); +} + +void ManifoldPart::SetAngleTolerance( const double theAngToler ) +{ myAngToler = theAngToler; } + +double ManifoldPart::GetAngleTolerance() const +{ return myAngToler; } + +void ManifoldPart::SetIsOnlyManifold( const bool theIsOnly ) +{ myIsOnlyManifold = theIsOnly; } + +void ManifoldPart::SetStartElem( const long theStartId ) +{ myStartElemId = theStartId; } + +bool ManifoldPart::process() +{ + myMapIds.Clear(); + myMapBadGeomIds.Clear(); + + myAllFacePtr.clear(); + myAllFacePtrIntDMap.clear(); + if ( !myMesh ) + return false; + + // collect all faces into own map + SMDS_FaceIteratorPtr anFaceItr = myMesh->facesIterator(); + for (; anFaceItr->more(); ) + { + SMDS_MeshFace* aFacePtr = (SMDS_MeshFace*)anFaceItr->next(); + myAllFacePtr.push_back( aFacePtr ); + myAllFacePtrIntDMap[aFacePtr] = myAllFacePtr.size()-1; + } + + SMDS_MeshFace* aStartFace = (SMDS_MeshFace*)myMesh->FindElement( myStartElemId ); + if ( !aStartFace ) + return false; + + // the map of non manifold links and bad geometry + TMapOfLink aMapOfNonManifold; + TColStd_MapOfInteger aMapOfTreated; + + // begin cycle on faces from start index and run on vector till the end + // and from begin to start index to cover whole vector + const int aStartIndx = myAllFacePtrIntDMap[aStartFace]; + bool isStartTreat = false; + for ( int fi = aStartIndx; !isStartTreat || fi != aStartIndx ; fi++ ) + { + if ( fi == aStartIndx ) + isStartTreat = true; + // as result next time when fi will be equal to aStartIndx + + SMDS_MeshFace* aFacePtr = myAllFacePtr[ fi ]; + if ( aMapOfTreated.Contains( aFacePtr->GetID() ) ) + continue; + + aMapOfTreated.Add( aFacePtr->GetID() ); + TColStd_MapOfInteger aResFaces; + if ( !findConnected( myAllFacePtrIntDMap, aFacePtr, + aMapOfNonManifold, aResFaces ) ) + continue; + TColStd_MapIteratorOfMapOfInteger anItr( aResFaces ); + for ( ; anItr.More(); anItr.Next() ) + { + int aFaceId = anItr.Key(); + aMapOfTreated.Add( aFaceId ); + myMapIds.Add( aFaceId ); + } + + if ( fi == ( myAllFacePtr.size() - 1 ) ) + fi = 0; + } // end run on vector of faces + return !myMapIds.IsEmpty(); +} + +static void getLinks( const SMDS_MeshFace* theFace, + ManifoldPart::TVectorOfLink& theLinks ) +{ + int aNbNode = theFace->NbNodes(); + SMDS_ElemIteratorPtr aNodeItr = theFace->nodesIterator(); + int i = 1; + SMDS_MeshNode* aNode = 0; + for ( ; aNodeItr->more() && i <= aNbNode; ) + { + + SMDS_MeshNode* aN1 = (SMDS_MeshNode*)aNodeItr->next(); + if ( i == 1 ) + aNode = aN1; + i++; + SMDS_MeshNode* aN2 = ( i >= aNbNode ) ? aNode : (SMDS_MeshNode*)aNodeItr->next(); + i++; + ManifoldPart::Link aLink( aN1, aN2 ); + theLinks.push_back( aLink ); + } +} + +static gp_XYZ getNormale( const SMDS_MeshFace* theFace ) +{ + gp_XYZ n; + int aNbNode = theFace->NbNodes(); + TColgp_Array1OfXYZ anArrOfXYZ(1,4); + SMDS_ElemIteratorPtr aNodeItr = theFace->nodesIterator(); + int i = 1; + for ( ; aNodeItr->more() && i <= 4; i++ ) { + SMDS_MeshNode* aNode = (SMDS_MeshNode*)aNodeItr->next(); + anArrOfXYZ.SetValue(i, gp_XYZ( aNode->X(), aNode->Y(), aNode->Z() ) ); + } + + gp_XYZ q1 = anArrOfXYZ.Value(2) - anArrOfXYZ.Value(1); + gp_XYZ q2 = anArrOfXYZ.Value(3) - anArrOfXYZ.Value(1); + n = q1 ^ q2; + if ( aNbNode > 3 ) { + gp_XYZ q3 = anArrOfXYZ.Value(4) - anArrOfXYZ.Value(1); + n += q2 ^ q3; + } + double len = n.Modulus(); + if ( len > 0 ) + n /= len; + + return n; +} + +bool ManifoldPart::findConnected + ( const ManifoldPart::TDataMapFacePtrInt& theAllFacePtrInt, + SMDS_MeshFace* theStartFace, + ManifoldPart::TMapOfLink& theNonManifold, + TColStd_MapOfInteger& theResFaces ) +{ + theResFaces.Clear(); + if ( !theAllFacePtrInt.size() ) + return false; + + if ( getNormale( theStartFace ).SquareModulus() <= gp::Resolution() ) + { + myMapBadGeomIds.Add( theStartFace->GetID() ); + return false; + } + + ManifoldPart::TMapOfLink aMapOfBoundary, aMapToSkip; + ManifoldPart::TVectorOfLink aSeqOfBoundary; + theResFaces.Add( theStartFace->GetID() ); + ManifoldPart::TDataMapOfLinkFacePtr aDMapLinkFace; + + expandBoundary( aMapOfBoundary, aSeqOfBoundary, + aDMapLinkFace, theNonManifold, theStartFace ); + + bool isDone = false; + while ( !isDone && aMapOfBoundary.size() != 0 ) + { + bool isToReset = false; + ManifoldPart::TVectorOfLink::iterator pLink = aSeqOfBoundary.begin(); + for ( ; !isToReset && pLink != aSeqOfBoundary.end(); ++pLink ) + { + ManifoldPart::Link aLink = *pLink; + if ( aMapToSkip.find( aLink ) != aMapToSkip.end() ) + continue; + // each link could be treated only once + aMapToSkip.insert( aLink ); + + ManifoldPart::TVectorOfFacePtr aFaces; + // find next + if ( myIsOnlyManifold && + (theNonManifold.find( aLink ) != theNonManifold.end()) ) + continue; + else + { + getFacesByLink( aLink, aFaces ); + // filter the element to keep only indicated elements + ManifoldPart::TVectorOfFacePtr aFiltered; + ManifoldPart::TVectorOfFacePtr::iterator pFace = aFaces.begin(); + for ( ; pFace != aFaces.end(); ++pFace ) + { + SMDS_MeshFace* aFace = *pFace; + if ( myAllFacePtrIntDMap.find( aFace ) != myAllFacePtrIntDMap.end() ) + aFiltered.push_back( aFace ); + } + aFaces = aFiltered; + if ( aFaces.size() < 2 ) // no neihgbour faces + continue; + else if ( myIsOnlyManifold && aFaces.size() > 2 ) // non manifold case + { + theNonManifold.insert( aLink ); + continue; + } + } + + // compare normal with normals of neighbor element + SMDS_MeshFace* aPrevFace = aDMapLinkFace[ aLink ]; + ManifoldPart::TVectorOfFacePtr::iterator pFace = aFaces.begin(); + for ( ; pFace != aFaces.end(); ++pFace ) + { + SMDS_MeshFace* aNextFace = *pFace; + if ( aPrevFace == aNextFace ) + continue; + int anNextFaceID = aNextFace->GetID(); + if ( myIsOnlyManifold && theResFaces.Contains( anNextFaceID ) ) + // should not be with non manifold restriction. probably bad topology + continue; + // check if face was treated and skipped + if ( myMapBadGeomIds.Contains( anNextFaceID ) || + !isInPlane( aPrevFace, aNextFace ) ) + continue; + // add new element to connected and extend the boundaries. + theResFaces.Add( anNextFaceID ); + expandBoundary( aMapOfBoundary, aSeqOfBoundary, + aDMapLinkFace, theNonManifold, aNextFace ); + isToReset = true; + } + } + isDone = !isToReset; + } + + return !theResFaces.IsEmpty(); +} + +bool ManifoldPart::isInPlane( const SMDS_MeshFace* theFace1, + const SMDS_MeshFace* theFace2 ) +{ + gp_Dir aNorm1 = gp_Dir( getNormale( theFace1 ) ); + gp_XYZ aNorm2XYZ = getNormale( theFace2 ); + if ( aNorm2XYZ.SquareModulus() <= gp::Resolution() ) + { + myMapBadGeomIds.Add( theFace2->GetID() ); + return false; + } + if ( aNorm1.IsParallel( gp_Dir( aNorm2XYZ ), myAngToler ) ) + return true; + + return false; +} + +void ManifoldPart::expandBoundary + ( ManifoldPart::TMapOfLink& theMapOfBoundary, + ManifoldPart::TVectorOfLink& theSeqOfBoundary, + ManifoldPart::TDataMapOfLinkFacePtr& theDMapLinkFacePtr, + ManifoldPart::TMapOfLink& theNonManifold, + SMDS_MeshFace* theNextFace ) const +{ + ManifoldPart::TVectorOfLink aLinks; + getLinks( theNextFace, aLinks ); + int aNbLink = (int)aLinks.size(); + for ( int i = 0; i < aNbLink; i++ ) + { + ManifoldPart::Link aLink = aLinks[ i ]; + if ( myIsOnlyManifold && (theNonManifold.find( aLink ) != theNonManifold.end()) ) + continue; + if ( theMapOfBoundary.find( aLink ) != theMapOfBoundary.end() ) + { + if ( myIsOnlyManifold ) + { + // remove from boundary + theMapOfBoundary.erase( aLink ); + ManifoldPart::TVectorOfLink::iterator pLink = theSeqOfBoundary.begin(); + for ( ; pLink != theSeqOfBoundary.end(); ++pLink ) + { + ManifoldPart::Link aBoundLink = *pLink; + if ( aBoundLink.IsEqual( aLink ) ) + { + theSeqOfBoundary.erase( pLink ); + break; + } + } + } + } + else + { + theMapOfBoundary.insert( aLink ); + theSeqOfBoundary.push_back( aLink ); + theDMapLinkFacePtr[ aLink ] = theNextFace; + } + } +} + +void ManifoldPart::getFacesByLink( const ManifoldPart::Link& theLink, + ManifoldPart::TVectorOfFacePtr& theFaces ) const +{ + SMDS_Mesh::SetOfFaces aSetOfFaces; + // take all faces that shared first node + SMDS_ElemIteratorPtr anItr = theLink.myNode1->facesIterator(); + for ( ; anItr->more(); ) + { + SMDS_MeshFace* aFace = (SMDS_MeshFace*)anItr->next(); + if ( !aFace ) + continue; + aSetOfFaces.Add( aFace ); + } + // take all faces that shared second node + anItr = theLink.myNode2->facesIterator(); + // find the common part of two sets + for ( ; anItr->more(); ) + { + SMDS_MeshFace* aFace = (SMDS_MeshFace*)anItr->next(); + if ( aSetOfFaces.Contains( aFace ) ) + theFaces.push_back( aFace ); + } +} + + +/* + ElementsOnSurface +*/ + +ElementsOnSurface::ElementsOnSurface() +{ + myMesh = 0; + myIds.Clear(); + myType = SMDSAbs_All; + mySurf.Nullify(); + myToler = Precision::Confusion(); + myUseBoundaries = false; +} + +ElementsOnSurface::~ElementsOnSurface() +{ + myMesh = 0; +} + +void ElementsOnSurface::SetMesh( const SMDS_Mesh* theMesh ) +{ + if ( myMesh == theMesh ) + return; + myMesh = theMesh; + process(); +} + +bool ElementsOnSurface::IsSatisfy( long theElementId ) +{ + return myIds.Contains( theElementId ); +} + +SMDSAbs_ElementType ElementsOnSurface::GetType() const +{ return myType; } + +void ElementsOnSurface::SetTolerance( const double theToler ) +{ + if ( myToler != theToler ) + myIds.Clear(); + myToler = theToler; +} + +double ElementsOnSurface::GetTolerance() const +{ return myToler; } + +void ElementsOnSurface::SetUseBoundaries( bool theUse ) +{ + if ( myUseBoundaries != theUse ) { + myUseBoundaries = theUse; + SetSurface( mySurf, myType ); + } +} + +void ElementsOnSurface::SetSurface( const TopoDS_Shape& theShape, + const SMDSAbs_ElementType theType ) +{ + myIds.Clear(); + myType = theType; + mySurf.Nullify(); + if ( theShape.IsNull() || theShape.ShapeType() != TopAbs_FACE ) + return; + mySurf = TopoDS::Face( theShape ); + BRepAdaptor_Surface SA( mySurf, myUseBoundaries ); + Standard_Real + u1 = SA.FirstUParameter(), + u2 = SA.LastUParameter(), + v1 = SA.FirstVParameter(), + v2 = SA.LastVParameter(); + Handle(Geom_Surface) surf = BRep_Tool::Surface( mySurf ); + myProjector.Init( surf, u1,u2, v1,v2 ); + process(); +} + +void ElementsOnSurface::process() +{ + myIds.Clear(); + if ( mySurf.IsNull() ) + return; + + if ( myMesh == 0 ) + return; + + if ( myType == SMDSAbs_Face || myType == SMDSAbs_All ) + { + myIds.ReSize( myMesh->NbFaces() ); + SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); + for(; anIter->more(); ) + process( anIter->next() ); + } + + if ( myType == SMDSAbs_Edge || myType == SMDSAbs_All ) + { + myIds.ReSize( myIds.Extent() + myMesh->NbEdges() ); + SMDS_EdgeIteratorPtr anIter = myMesh->edgesIterator(); + for(; anIter->more(); ) + process( anIter->next() ); + } + + if ( myType == SMDSAbs_Node ) + { + myIds.ReSize( myMesh->NbNodes() ); + SMDS_NodeIteratorPtr anIter = myMesh->nodesIterator(); + for(; anIter->more(); ) + process( anIter->next() ); + } +} + +void ElementsOnSurface::process( const SMDS_MeshElement* theElemPtr ) +{ + SMDS_ElemIteratorPtr aNodeItr = theElemPtr->nodesIterator(); + bool isSatisfy = true; + for ( ; aNodeItr->more(); ) + { + SMDS_MeshNode* aNode = (SMDS_MeshNode*)aNodeItr->next(); + if ( !isOnSurface( aNode ) ) + { + isSatisfy = false; + break; + } + } + if ( isSatisfy ) + myIds.Add( theElemPtr->GetID() ); +} + +bool ElementsOnSurface::isOnSurface( const SMDS_MeshNode* theNode ) +{ + if ( mySurf.IsNull() ) + return false; + + gp_Pnt aPnt( theNode->X(), theNode->Y(), theNode->Z() ); + // double aToler2 = myToler * myToler; +// if ( mySurf->IsKind(STANDARD_TYPE(Geom_Plane))) +// { +// gp_Pln aPln = Handle(Geom_Plane)::DownCast(mySurf)->Pln(); +// if ( aPln.SquareDistance( aPnt ) > aToler2 ) +// return false; +// } +// else if ( mySurf->IsKind(STANDARD_TYPE(Geom_CylindricalSurface))) +// { +// gp_Cylinder aCyl = Handle(Geom_CylindricalSurface)::DownCast(mySurf)->Cylinder(); +// double aRad = aCyl.Radius(); +// gp_Ax3 anAxis = aCyl.Position(); +// gp_XYZ aLoc = aCyl.Location().XYZ(); +// double aXDist = anAxis.XDirection().XYZ() * ( aPnt.XYZ() - aLoc ); +// double aYDist = anAxis.YDirection().XYZ() * ( aPnt.XYZ() - aLoc ); +// if ( fabs(aXDist*aXDist + aYDist*aYDist - aRad*aRad) > aToler2 ) +// return false; +// } +// else +// return false; + myProjector.Perform( aPnt ); + bool isOn = ( myProjector.IsDone() && myProjector.LowerDistance() <= myToler ); + + return isOn; +} + + +/* + ElementsOnShape +*/ + +ElementsOnShape::ElementsOnShape() + : myMesh(0), + myType(SMDSAbs_All), + myToler(Precision::Confusion()), + myAllNodesFlag(false) +{ + myCurShapeType = TopAbs_SHAPE; +} + +ElementsOnShape::~ElementsOnShape() +{ +} + +void ElementsOnShape::SetMesh (const SMDS_Mesh* theMesh) +{ + if (myMesh != theMesh) { + myMesh = theMesh; + SetShape(myShape, myType); + } +} + +bool ElementsOnShape::IsSatisfy (long theElementId) +{ + return myIds.Contains(theElementId); +} + +SMDSAbs_ElementType ElementsOnShape::GetType() const +{ + return myType; +} + +void ElementsOnShape::SetTolerance (const double theToler) +{ + if (myToler != theToler) { + myToler = theToler; + SetShape(myShape, myType); + } +} + +double ElementsOnShape::GetTolerance() const +{ + return myToler; +} + +void ElementsOnShape::SetAllNodes (bool theAllNodes) +{ + if (myAllNodesFlag != theAllNodes) { + myAllNodesFlag = theAllNodes; + SetShape(myShape, myType); + } +} + +void ElementsOnShape::SetShape (const TopoDS_Shape& theShape, + const SMDSAbs_ElementType theType) +{ + myType = theType; + myShape = theShape; + myIds.Clear(); + + if (myMesh == 0) return; + + switch (myType) + { + case SMDSAbs_All: + myIds.ReSize(myMesh->NbEdges() + myMesh->NbFaces() + myMesh->NbVolumes()); + break; + case SMDSAbs_Node: + myIds.ReSize(myMesh->NbNodes()); + break; + case SMDSAbs_Edge: + myIds.ReSize(myMesh->NbEdges()); + break; + case SMDSAbs_Face: + myIds.ReSize(myMesh->NbFaces()); + break; + case SMDSAbs_Volume: + myIds.ReSize(myMesh->NbVolumes()); + break; + default: + break; + } + + myShapesMap.Clear(); + addShape(myShape); +} + +void ElementsOnShape::addShape (const TopoDS_Shape& theShape) +{ + if (theShape.IsNull() || myMesh == 0) + return; + + if (!myShapesMap.Add(theShape)) return; + + myCurShapeType = theShape.ShapeType(); + switch (myCurShapeType) + { + case TopAbs_COMPOUND: + case TopAbs_COMPSOLID: + case TopAbs_SHELL: + case TopAbs_WIRE: + { + TopoDS_Iterator anIt (theShape, Standard_True, Standard_True); + for (; anIt.More(); anIt.Next()) addShape(anIt.Value()); + } + break; + case TopAbs_SOLID: + { + myCurSC.Load(theShape); + process(); + } + break; + case TopAbs_FACE: + { + TopoDS_Face aFace = TopoDS::Face(theShape); + BRepAdaptor_Surface SA (aFace, true); + Standard_Real + u1 = SA.FirstUParameter(), + u2 = SA.LastUParameter(), + v1 = SA.FirstVParameter(), + v2 = SA.LastVParameter(); + Handle(Geom_Surface) surf = BRep_Tool::Surface(aFace); + myCurProjFace.Init(surf, u1,u2, v1,v2); + myCurFace = aFace; + process(); + } + break; + case TopAbs_EDGE: + { + TopoDS_Edge anEdge = TopoDS::Edge(theShape); + Standard_Real u1, u2; + Handle(Geom_Curve) curve = BRep_Tool::Curve(anEdge, u1, u2); + myCurProjEdge.Init(curve, u1, u2); + process(); + } + break; + case TopAbs_VERTEX: + { + TopoDS_Vertex aV = TopoDS::Vertex(theShape); + myCurPnt = BRep_Tool::Pnt(aV); + process(); + } + break; + default: + break; + } +} + +void ElementsOnShape::process() +{ + if (myShape.IsNull() || myMesh == 0) + return; + + if (myType == SMDSAbs_Node) + { + SMDS_NodeIteratorPtr anIter = myMesh->nodesIterator(); + while (anIter->more()) + process(anIter->next()); + } + else + { + if (myType == SMDSAbs_Edge || myType == SMDSAbs_All) + { + SMDS_EdgeIteratorPtr anIter = myMesh->edgesIterator(); + while (anIter->more()) + process(anIter->next()); + } + + if (myType == SMDSAbs_Face || myType == SMDSAbs_All) + { + SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); + while (anIter->more()) { + process(anIter->next()); + } + } + + if (myType == SMDSAbs_Volume || myType == SMDSAbs_All) + { + SMDS_VolumeIteratorPtr anIter = myMesh->volumesIterator(); + while (anIter->more()) + process(anIter->next()); + } + } +} + +void ElementsOnShape::process (const SMDS_MeshElement* theElemPtr) +{ + if (myShape.IsNull()) + return; + + SMDS_ElemIteratorPtr aNodeItr = theElemPtr->nodesIterator(); + bool isSatisfy = myAllNodesFlag; + + gp_XYZ centerXYZ (0, 0, 0); + + while (aNodeItr->more() && (isSatisfy == myAllNodesFlag)) + { + SMDS_MeshNode* aNode = (SMDS_MeshNode*)aNodeItr->next(); + gp_Pnt aPnt (aNode->X(), aNode->Y(), aNode->Z()); + centerXYZ += aPnt.XYZ(); + + switch (myCurShapeType) + { + case TopAbs_SOLID: + { + myCurSC.Perform(aPnt, myToler); + isSatisfy = (myCurSC.State() == TopAbs_IN || myCurSC.State() == TopAbs_ON); + } + break; + case TopAbs_FACE: + { + myCurProjFace.Perform(aPnt); + isSatisfy = (myCurProjFace.IsDone() && myCurProjFace.LowerDistance() <= myToler); + if (isSatisfy) + { + // check relatively the face + Quantity_Parameter u, v; + myCurProjFace.LowerDistanceParameters(u, v); + gp_Pnt2d aProjPnt (u, v); + BRepClass_FaceClassifier aClsf (myCurFace, aProjPnt, myToler); + isSatisfy = (aClsf.State() == TopAbs_IN || aClsf.State() == TopAbs_ON); + } + } + break; + case TopAbs_EDGE: + { + myCurProjEdge.Perform(aPnt); + isSatisfy = (myCurProjEdge.NbPoints() > 0 && myCurProjEdge.LowerDistance() <= myToler); + } + break; + case TopAbs_VERTEX: + { + isSatisfy = (aPnt.Distance(myCurPnt) <= myToler); + } + break; + default: + { + isSatisfy = false; + } + } + } + + if (isSatisfy && myCurShapeType == TopAbs_SOLID) { // Check the center point for volumes MantisBug 0020168 + centerXYZ /= theElemPtr->NbNodes(); + gp_Pnt aCenterPnt (centerXYZ); + myCurSC.Perform(aCenterPnt, myToler); + if ( !(myCurSC.State() == TopAbs_IN || myCurSC.State() == TopAbs_ON)) + isSatisfy = false; + } + + if (isSatisfy) + myIds.Add(theElemPtr->GetID()); +} + +TSequenceOfXYZ::TSequenceOfXYZ() +{} + +TSequenceOfXYZ::TSequenceOfXYZ(size_type n) : std::vector(n) +{} + +TSequenceOfXYZ::TSequenceOfXYZ(size_type n, const value_type& t) : std::vector(n,t) +{} + +TSequenceOfXYZ::TSequenceOfXYZ(const TSequenceOfXYZ& theSequenceOfXYZ) : std::vector(theSequenceOfXYZ) +{} + +template +TSequenceOfXYZ::TSequenceOfXYZ(InputIterator theBegin, InputIterator theEnd): std::vector(theBegin,theEnd) +{} + +TSequenceOfXYZ& TSequenceOfXYZ::operator=(const TSequenceOfXYZ& theSequenceOfXYZ) +{ + std::vector::operator=(theSequenceOfXYZ); + return *this; +} + +std::vector::reference TSequenceOfXYZ::operator()(size_type n) +{ + return std::vector::operator[](n-1); +} + +std::vector::const_reference TSequenceOfXYZ::operator()(size_type n) const +{ + return std::vector::operator[](n-1); +} diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp.orig b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp.orig new file mode 100644 index 000000000000..790e46b09ef3 --- /dev/null +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp.orig @@ -0,0 +1,785 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESH : implementaion of SMESH idl descriptions +// File : SMESH_Gen.cxx +// Author : Paul RASCLE, EDF +// Module : SMESH + +#include "SMESH_Gen.hxx" +#include "SMESH_subMesh.hxx" +#include "SMESH_HypoFilter.hxx" +#include "SMESHDS_Document.hxx" +#include "SMDS_MeshElement.hxx" +#include "SMDS_MeshNode.hxx" + +#include "utilities.h" +//#include "OpUtil.hxx" +#include "SMESH_ExceptHandlers.hxx" + +#include +#include +#include +#include + +using namespace std; + +<<<<<<< HEAD +======= +//#include + +SMESH_Gen* SMESH_Gen::generator = nullptr; + +>>>>>>> 9778eb1... FEM: Use single smesh mesh generator throughout FreeCAD +//============================================================================= +/*! + * default constructor: + */ +//============================================================================= + +SMESH_Gen::SMESH_Gen() +{ + //MESSAGE("SMESH_Gen::SMESH_Gen"); + _localId = 0; + _hypId = 0; + _segmentation = 10; +} + +SMESH_Gen* SMESH_Gen::get() { + + if(!generator) + generator = new SMESH_Gen(); + + return generator; +} + + +//============================================================================= +/*! + * + */ +//============================================================================= + +SMESH_Gen::~SMESH_Gen() +{ + //MESSAGE("SMESH_Gen::~SMESH_Gen"); +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +/*SMESH_Hypothesis *SMESH_Gen::CreateHypothesis(const char *anHyp, int studyId) + throw(SALOME_Exception) +{ + + MESSAGE("CreateHypothesis("<GetID(); + myStudyContext->mapHypothesis[hypId] = myHypothesis; + SCRUTE(studyId); + SCRUTE(hypId); + + // store hypothesis in SMESHDS document + + myStudyContext->myDocument->AddHypothesis(myHypothesis); + return myHypothesis; +}*/ + +//============================================================================= +/*! + * + */ +//============================================================================= + +SMESH_Mesh* SMESH_Gen::CreateMesh(int theStudyId, bool theIsEmbeddedMode) + throw(SMESH_Exception) +{ + Unexpect aCatch(SmeshException); + MESSAGE("SMESH_Gen::CreateMesh"); + + // Get studyContext, create it if it does'nt exist, with a SMESHDS_Document + StudyContextStruct *aStudyContext = GetStudyContext(theStudyId); + + // create a new SMESH_mesh object + SMESH_Mesh *aMesh = new SMESH_Mesh(_localId++, + theStudyId, + this, + theIsEmbeddedMode, + aStudyContext->myDocument); + aStudyContext->mapMesh[_localId] = aMesh; + + return aMesh; +} + +//============================================================================= +/*! + * Compute a mesh + */ +//============================================================================= + +bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, + const TopoDS_Shape & aShape, + const bool anUpward, + const ::MeshDimension aDim, + TSetOfInt* aShapesId) +{ + MESSAGE("SMESH_Gen::Compute"); + + bool ret = true; + + SMESH_subMesh *sm = aMesh.GetSubMesh(aShape); + + const bool includeSelf = true; + const bool complexShapeFirst = true; + + SMESH_subMeshIteratorPtr smIt; + + if ( anUpward ) // is called from below code here + { + // ----------------------------------------------- + // mesh all the subshapes starting from vertices + // ----------------------------------------------- + smIt = sm->getDependsOnIterator(includeSelf, !complexShapeFirst); + while ( smIt->more() ) + { + SMESH_subMesh* smToCompute = smIt->next(); + + // do not mesh vertices of a pseudo shape + const TopAbs_ShapeEnum aShType = smToCompute->GetSubShape().ShapeType(); + if ( !aMesh.HasShapeToMesh() && aShType == TopAbs_VERTEX ) + continue; + + // check for preview dimension limitations + if ( aShapesId && GetShapeDim( aShType ) > (int)aDim ) + { + // clear compute state to not show previous compute errors + // if preview invoked less dimension less than previous + smToCompute->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); + continue; + } + + if (smToCompute->GetComputeState() == SMESH_subMesh::READY_TO_COMPUTE) + smToCompute->ComputeStateEngine( SMESH_subMesh::COMPUTE ); + + // we check all the submeshes here and detect if any of them failed to compute + if (smToCompute->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE) + ret = false; + else if ( aShapesId ) + aShapesId->insert( smToCompute->GetId() ); + } + return ret; + } + else + { + // ----------------------------------------------------------------- + // apply algos that DO NOT require descretized boundaries and DO NOT + // support submeshes, starting from the most complex shapes + // and collect submeshes with algos that DO support submeshes + // ----------------------------------------------------------------- + list< SMESH_subMesh* > smWithAlgoSupportingSubmeshes; + smIt = sm->getDependsOnIterator(includeSelf, complexShapeFirst); + while ( smIt->more() ) + { + SMESH_subMesh* smToCompute = smIt->next(); + if ( smToCompute->GetComputeState() != SMESH_subMesh::READY_TO_COMPUTE ) + continue; + + const TopoDS_Shape& aSubShape = smToCompute->GetSubShape(); + const int aShapeDim = GetShapeDim( aSubShape ); + if ( aShapeDim < 1 ) break; + + // check for preview dimension limitations + if ( aShapesId && aShapeDim > (int)aDim ) + continue; + + SMESH_Algo* algo = GetAlgo( aMesh, aSubShape ); + if ( algo && !algo->NeedDescretBoundary() ) + { + if ( algo->SupportSubmeshes() ) + smWithAlgoSupportingSubmeshes.push_back( smToCompute ); + else + { + smToCompute->ComputeStateEngine( SMESH_subMesh::COMPUTE ); + if ( aShapesId ) + aShapesId->insert( smToCompute->GetId() ); + } + } + } + // ------------------------------------------------------------ + // compute submeshes under shapes with algos that DO NOT require + // descretized boundaries and DO support submeshes + // ------------------------------------------------------------ + list< SMESH_subMesh* >::reverse_iterator subIt, subEnd; + subIt = smWithAlgoSupportingSubmeshes.rbegin(); + subEnd = smWithAlgoSupportingSubmeshes.rend(); + // start from lower shapes + for ( ; subIt != subEnd; ++subIt ) + { + sm = *subIt; + + // get a shape the algo is assigned to + TopoDS_Shape algoShape; + if ( !GetAlgo( aMesh, sm->GetSubShape(), & algoShape )) + continue; // strange... + + // look for more local algos + smIt = sm->getDependsOnIterator(!includeSelf, !complexShapeFirst); + while ( smIt->more() ) + { + SMESH_subMesh* smToCompute = smIt->next(); + + const TopoDS_Shape& aSubShape = smToCompute->GetSubShape(); + const int aShapeDim = GetShapeDim( aSubShape ); + //if ( aSubShape.ShapeType() == TopAbs_VERTEX ) continue; + if ( aShapeDim < 1 ) continue; + + // check for preview dimension limitations + if ( aShapesId && GetShapeDim( aSubShape.ShapeType() ) > (int)aDim ) + continue; + + SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() ); + filter + .And( SMESH_HypoFilter::IsApplicableTo( aSubShape )) + .And( SMESH_HypoFilter::IsMoreLocalThan( algoShape )); + + if ( SMESH_Algo* subAlgo = (SMESH_Algo*) aMesh.GetHypothesis( aSubShape, filter, true )) { + SMESH_Hypothesis::Hypothesis_Status status; + if ( subAlgo->CheckHypothesis( aMesh, aSubShape, status )) + // mesh a lower smToCompute starting from vertices + Compute( aMesh, aSubShape, /*anUpward=*/true, aDim, aShapesId ); + } + } + } + // ---------------------------------------------------------- + // apply the algos that do not require descretized boundaries + // ---------------------------------------------------------- + for ( subIt = smWithAlgoSupportingSubmeshes.rbegin(); subIt != subEnd; ++subIt ) + if ( sm->GetComputeState() == SMESH_subMesh::READY_TO_COMPUTE) + { + const TopAbs_ShapeEnum aShType = sm->GetSubShape().ShapeType(); + // check for preview dimension limitations + if ( aShapesId && GetShapeDim( aShType ) > (int)aDim ) + continue; + + sm->ComputeStateEngine( SMESH_subMesh::COMPUTE ); + if ( aShapesId ) + aShapesId->insert( sm->GetId() ); + } + + // ----------------------------------------------- + // mesh the rest subshapes starting from vertices + // ----------------------------------------------- + ret = Compute( aMesh, aShape, /*anUpward=*/true, aDim, aShapesId ); + } + + MESSAGE( "VSR - SMESH_Gen::Compute() finished, OK = " << ret); + return ret; +} + +//======================================================================= +//function : checkConformIgnoredAlgos +//purpose : +//======================================================================= + +static bool checkConformIgnoredAlgos(SMESH_Mesh& aMesh, + SMESH_subMesh* aSubMesh, + const SMESH_Algo* aGlobIgnoAlgo, + const SMESH_Algo* aLocIgnoAlgo, + bool & checkConform, + map& aCheckedMap, + list< SMESH_Gen::TAlgoStateError > & theErrors) +{ + ASSERT( aSubMesh ); + if ( aSubMesh->GetSubShape().ShapeType() == TopAbs_VERTEX) + return true; + + + bool ret = true; + + const list& listHyp = + aMesh.GetMeshDS()->GetHypothesis( aSubMesh->GetSubShape() ); + list::const_iterator it=listHyp.begin(); + for ( ; it != listHyp.end(); it++) + { + const SMESHDS_Hypothesis * aHyp = *it; + if (aHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO) + continue; + + const SMESH_Algo* algo = dynamic_cast (aHyp); + ASSERT ( algo ); + + if ( aLocIgnoAlgo ) // algo is hidden by a local algo of upper dim + { + INFOS( "Local <" << algo->GetName() << "> is hidden by local <" + << aLocIgnoAlgo->GetName() << ">"); + } + else + { + bool isGlobal = (aMesh.IsMainShape( aSubMesh->GetSubShape() )); + int dim = algo->GetDim(); + int aMaxGlobIgnoDim = ( aGlobIgnoAlgo ? aGlobIgnoAlgo->GetDim() : -1 ); + + if ( dim < aMaxGlobIgnoDim ) + { + // algo is hidden by a global algo + INFOS( ( isGlobal ? "Global" : "Local" ) + << " <" << algo->GetName() << "> is hidden by global <" + << aGlobIgnoAlgo->GetName() << ">"); + } + else if ( !algo->NeedDescretBoundary() && !isGlobal) + { + // local algo is not hidden and hides algos on sub-shapes + if (checkConform && !aSubMesh->IsConform( algo )) + { + ret = false; + checkConform = false; // no more check conformity + INFOS( "ERROR: Local <" << algo->GetName() << + "> would produce not conform mesh: " + " hypotesis is missing"); + theErrors.push_back( SMESH_Gen::TAlgoStateError() ); + theErrors.back().Set( SMESH_Hypothesis::HYP_NOTCONFORM, algo, false ); + } + + // sub-algos will be hidden by a local + const map& smMap = aSubMesh->DependsOn(); + map::const_reverse_iterator revItSub; + bool checkConform2 = false; + for ( revItSub = smMap.rbegin(); revItSub != smMap.rend(); revItSub++) + { + checkConformIgnoredAlgos (aMesh, (*revItSub).second, aGlobIgnoAlgo, + algo, checkConform2, aCheckedMap, theErrors); + int key = (*revItSub).first; + SMESH_subMesh* sm = (*revItSub).second; + if ( aCheckedMap.find( key ) == aCheckedMap.end() ) + { + aCheckedMap[ key ] = sm; + } + } + } + } + } + + return ret; +} + +//======================================================================= +//function : checkMissing +//purpose : notify on missing hypothesis +// Return false if algo or hipothesis is missing +//======================================================================= + +static bool checkMissing(SMESH_Gen* aGen, + SMESH_Mesh& aMesh, + SMESH_subMesh* aSubMesh, + const int aTopAlgoDim, + bool* globalChecked, + const bool checkNoAlgo, + map& aCheckedMap, + list< SMESH_Gen::TAlgoStateError > & theErrors) +{ + if ( aSubMesh->GetSubShape().ShapeType() == TopAbs_VERTEX) + return true; + + //MESSAGE("=====checkMissing"); + + int ret = true; + SMESH_Algo* algo = 0; + + switch (aSubMesh->GetAlgoState()) + { + case SMESH_subMesh::NO_ALGO: { + if (checkNoAlgo) + { + // should there be any algo? + int shapeDim = SMESH_Gen::GetShapeDim( aSubMesh->GetSubShape() ); + if (aTopAlgoDim > shapeDim) + { + MESSAGE( "ERROR: " << shapeDim << "D algorithm is missing" ); + ret = false; + theErrors.push_back( SMESH_Gen::TAlgoStateError() ); + theErrors.back().Set( SMESH_Hypothesis::HYP_MISSING, shapeDim, true ); + } + } + return ret; + } + case SMESH_subMesh::MISSING_HYP: { + // notify if an algo missing hyp is attached to aSubMesh + algo = aGen->GetAlgo( aMesh, aSubMesh->GetSubShape() ); + ASSERT( algo ); + bool IsGlobalHypothesis = aGen->IsGlobalHypothesis( algo, aMesh ); + if (!IsGlobalHypothesis || !globalChecked[ algo->GetDim() ]) + { + TAlgoStateErrorName errName = SMESH_Hypothesis::HYP_MISSING; + SMESH_Hypothesis::Hypothesis_Status status; + algo->CheckHypothesis( aMesh, aSubMesh->GetSubShape(), status ); + if ( status == SMESH_Hypothesis::HYP_BAD_PARAMETER ) { + MESSAGE( "ERROR: hypothesis of " << (IsGlobalHypothesis ? "Global " : "Local ") + << "<" << algo->GetName() << "> has a bad parameter value"); + errName = status; + } else if ( status == SMESH_Hypothesis::HYP_BAD_GEOMETRY ) { + MESSAGE( "ERROR: " << (IsGlobalHypothesis ? "Global " : "Local ") + << "<" << algo->GetName() << "> assigned to mismatching geometry"); + errName = status; + } else { + MESSAGE( "ERROR: " << (IsGlobalHypothesis ? "Global " : "Local ") + << "<" << algo->GetName() << "> misses some hypothesis"); + } + if (IsGlobalHypothesis) + globalChecked[ algo->GetDim() ] = true; + theErrors.push_back( SMESH_Gen::TAlgoStateError() ); + theErrors.back().Set( errName, algo, IsGlobalHypothesis ); + } + ret = false; + break; + } + case SMESH_subMesh::HYP_OK: + algo = aGen->GetAlgo( aMesh, aSubMesh->GetSubShape() ); + ret = true; + break; + default: ASSERT(0); + } + + // do not check under algo that hides sub-algos or + // re-start checking NO_ALGO state + ASSERT (algo); + bool isTopLocalAlgo = + ( aTopAlgoDim <= algo->GetDim() && !aGen->IsGlobalHypothesis( algo, aMesh )); + if (!algo->NeedDescretBoundary() || isTopLocalAlgo) + { + bool checkNoAlgo2 = ( algo->NeedDescretBoundary() ); + const map& subMeshes = aSubMesh->DependsOn(); + map::const_iterator itsub; + for (itsub = subMeshes.begin(); itsub != subMeshes.end(); itsub++) + { + // sub-meshes should not be checked further more + int key = (*itsub).first; + SMESH_subMesh* sm = (*itsub).second; + if ( aCheckedMap.find( key ) == aCheckedMap.end() ) + aCheckedMap[ key ] = sm; + + if (isTopLocalAlgo) + { + //check algo on sub-meshes + int aTopAlgoDim2 = algo->GetDim(); + if (!checkMissing (aGen, aMesh, sm, aTopAlgoDim2, + globalChecked, checkNoAlgo2, aCheckedMap, theErrors)) + { + ret = false; + if (sm->GetAlgoState() == SMESH_subMesh::NO_ALGO ) + checkNoAlgo2 = false; + } + } + } + } + return ret; +} + +//======================================================================= +//function : CheckAlgoState +//purpose : notify on bad state of attached algos, return false +// if Compute() would fail because of some algo bad state +//======================================================================= + +bool SMESH_Gen::CheckAlgoState(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape) +{ + list< TAlgoStateError > errors; + return GetAlgoState( aMesh, aShape, errors ); +} + +//======================================================================= +//function : GetAlgoState +//purpose : notify on bad state of attached algos, return false +// if Compute() would fail because of some algo bad state +// theErrors list contains problems description +//======================================================================= + +bool SMESH_Gen::GetAlgoState(SMESH_Mesh& theMesh, + const TopoDS_Shape& theShape, + list< TAlgoStateError > & theErrors) +{ + //MESSAGE("SMESH_Gen::CheckAlgoState"); + + bool ret = true; + bool hasAlgo = false; + + SMESH_subMesh* sm = theMesh.GetSubMesh(theShape); + const SMESHDS_Mesh* meshDS = theMesh.GetMeshDS(); + TopoDS_Shape mainShape = meshDS->ShapeToMesh(); + + // ----------------- + // get global algos + // ----------------- + + const SMESH_Algo* aGlobAlgoArr[] = {0,0,0,0}; + + const list& listHyp = meshDS->GetHypothesis( mainShape ); + list::const_iterator it=listHyp.begin(); + for ( ; it != listHyp.end(); it++) + { + const SMESHDS_Hypothesis * aHyp = *it; + if (aHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO) + continue; + + const SMESH_Algo* algo = dynamic_cast (aHyp); + ASSERT ( algo ); + + int dim = algo->GetDim(); + aGlobAlgoArr[ dim ] = algo; + + hasAlgo = true; + } + + // -------------------------------------------------------- + // info on algos that will be ignored because of ones that + // don't NeedDescretBoundary() attached to super-shapes, + // check that a conform mesh will be produced + // -------------------------------------------------------- + + + // find a global algo possibly hiding sub-algos + int dim; + const SMESH_Algo* aGlobIgnoAlgo = 0; + for (dim = 3; dim > 0; dim--) + { + if (aGlobAlgoArr[ dim ] && + !aGlobAlgoArr[ dim ]->NeedDescretBoundary()) + { + aGlobIgnoAlgo = aGlobAlgoArr[ dim ]; + break; + } + } + + const map& smMap = sm->DependsOn(); + map::const_reverse_iterator revItSub = smMap.rbegin(); + map aCheckedMap; + bool checkConform = ( !theMesh.IsNotConformAllowed() ); + int aKey = 1; + SMESH_subMesh* smToCheck = sm; + + // loop on theShape and its sub-shapes + while ( smToCheck ) + { + if ( smToCheck->GetSubShape().ShapeType() == TopAbs_VERTEX) + break; + + if ( aCheckedMap.find( aKey ) == aCheckedMap.end() ) + if (!checkConformIgnoredAlgos (theMesh, smToCheck, aGlobIgnoAlgo, + 0, checkConform, aCheckedMap, theErrors)) + ret = false; + + if ( smToCheck->GetAlgoState() != SMESH_subMesh::NO_ALGO ) + hasAlgo = true; + + // next subMesh + if (revItSub != smMap.rend()) + { + aKey = (*revItSub).first; + smToCheck = (*revItSub).second; + revItSub++; + } + else + { + smToCheck = 0; + } + + } + + // ---------------------------------------------------------------- + // info on missing hypothesis and find out if all needed algos are + // well defined + // ---------------------------------------------------------------- + + //MESSAGE( "---info on missing hypothesis and find out if all needed algos are"); + + // find max dim of global algo + int aTopAlgoDim = 0; + for (dim = 3; dim > 0; dim--) + { + if (aGlobAlgoArr[ dim ]) + { + aTopAlgoDim = dim; + break; + } + } + aCheckedMap.clear(); + smToCheck = sm; + revItSub = smMap.rbegin(); + bool checkNoAlgo = theMesh.HasShapeToMesh() ? bool( aTopAlgoDim ) : false; + bool globalChecked[] = { false, false, false, false }; + + // loop on theShape and its sub-shapes + while ( smToCheck ) + { + if ( smToCheck->GetSubShape().ShapeType() == TopAbs_VERTEX) + break; + + if ( aCheckedMap.find( aKey ) == aCheckedMap.end() ) + if (!checkMissing (this, theMesh, smToCheck, aTopAlgoDim, + globalChecked, checkNoAlgo, aCheckedMap, theErrors)) + { + ret = false; + if (smToCheck->GetAlgoState() == SMESH_subMesh::NO_ALGO ) + checkNoAlgo = false; + } + + // next subMesh + if (revItSub != smMap.rend()) + { + aKey = (*revItSub).first; + smToCheck = (*revItSub).second; + revItSub++; + } + else + smToCheck = 0; + } + + if ( !hasAlgo ) { + ret = false; + INFOS( "None algorithm attached" ); + theErrors.push_back( TAlgoStateError() ); + theErrors.back().Set( SMESH_Hypothesis::HYP_MISSING, 1, true ); + } + + return ret; +} + +//======================================================================= +//function : IsGlobalHypothesis +//purpose : check if theAlgo is attached to the main shape +//======================================================================= + +bool SMESH_Gen::IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh) +{ + SMESH_HypoFilter filter( SMESH_HypoFilter::Is( theHyp )); + return aMesh.GetHypothesis( aMesh.GetMeshDS()->ShapeToMesh(), filter, false ); +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +SMESH_Algo *SMESH_Gen::GetAlgo(SMESH_Mesh & aMesh, + const TopoDS_Shape & aShape, + TopoDS_Shape* assignedTo) +{ + + SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() ); + filter.And( filter.IsApplicableTo( aShape )); + + return (SMESH_Algo*) aMesh.GetHypothesis( aShape, filter, true, assignedTo ); +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +StudyContextStruct *SMESH_Gen::GetStudyContext(int studyId) +{ + // Get studyContext, create it if it does'nt exist, with a SMESHDS_Document + + if (_mapStudyContext.find(studyId) == _mapStudyContext.end()) + { + _mapStudyContext[studyId] = new StudyContextStruct; + _mapStudyContext[studyId]->myDocument = new SMESHDS_Document(studyId); + } + StudyContextStruct *myStudyContext = _mapStudyContext[studyId]; +// ASSERT(_mapStudyContext.find(studyId) != _mapStudyContext.end()); + return myStudyContext; +} + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= + +// void SMESH_Gen::Save(int studyId, const char *aUrlOfFile) +// { +// } + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= + +// void SMESH_Gen::Load(int studyId, const char *aUrlOfFile) +// { +// } + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= + +// void SMESH_Gen::Close(int studyId) +// { +// } + +//============================================================================= +/*! + * + */ +//============================================================================= + +int SMESH_Gen::GetShapeDim(const TopAbs_ShapeEnum & aShapeType) +{ + static vector dim; + if ( dim.empty() ) + { + dim.resize( TopAbs_SHAPE, -1 ); + dim[ TopAbs_COMPOUND ] = MeshDim_3D; + dim[ TopAbs_COMPSOLID ] = MeshDim_3D; + dim[ TopAbs_SOLID ] = MeshDim_3D; + dim[ TopAbs_SHELL ] = MeshDim_3D; + dim[ TopAbs_FACE ] = MeshDim_2D; + dim[ TopAbs_WIRE ] = MeshDim_1D; + dim[ TopAbs_EDGE ] = MeshDim_1D; + dim[ TopAbs_VERTEX ] = MeshDim_0D; + } + return dim[ aShapeType ]; +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +int SMESH_Gen::GetANewId() +{ + //MESSAGE("SMESH_Gen::GetANewId"); + return _hypId++; +} diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp.orig b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp.orig new file mode 100644 index 000000000000..eac63ab993ca --- /dev/null +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp.orig @@ -0,0 +1,8319 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMESH : idl implementation based on 'SMESH' unit's classes +// File : SMESH_MeshEditor.cxx +// Created : Mon Apr 12 16:10:22 2004 +// Author : Edward AGAPOV (eap) +// +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#endif // _MSC_VER +#include + +#include "SMESH_MeshEditor.hxx" + +#include "SMDS_FaceOfNodes.hxx" +#include "SMDS_VolumeTool.hxx" +#include "SMDS_EdgePosition.hxx" +#include "SMDS_PolyhedralVolumeOfNodes.hxx" +#include "SMDS_FacePosition.hxx" +#include "SMDS_SpacePosition.hxx" +#include "SMDS_QuadraticFaceOfNodes.hxx" +#include "SMDS_MeshGroup.hxx" + +#include "SMESHDS_Group.hxx" +#include "SMESHDS_Mesh.hxx" + +#include "SMESH_subMesh.hxx" +#include "SMESH_ControlsDef.hxx" +#include "SMESH_MesherHelper.hxx" +#include "SMESH_OctreeNode.hxx" +#include "SMESH_Group.hxx" + +#include "utilities.h" + +#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 + +#ifndef PI +#define PI M_PI +#endif + +#define cast2Node(elem) static_cast( elem ) + +using namespace std; +using namespace SMESH::Controls; + +typedef map > TElemOfNodeListMap; +typedef map > TElemOfElemListMap; +//typedef map > TNodeOfNodeVecMap; +//typedef TNodeOfNodeVecMap::iterator TNodeOfNodeVecMapItr; +//typedef map > TElemOfVecOfMapNodesMap; + +struct TNodeXYZ : public gp_XYZ { + TNodeXYZ( const SMDS_MeshNode* n ):gp_XYZ( n->X(), n->Y(), n->Z() ) {} +}; + +//======================================================================= +//function : SMESH_MeshEditor +//purpose : +//======================================================================= + +SMESH_MeshEditor::SMESH_MeshEditor( SMESH_Mesh* theMesh ) + :myMesh( theMesh ) // theMesh may be NULL +{ +} + +//======================================================================= +/*! + * \brief Add element + */ +//======================================================================= + +SMDS_MeshElement* +SMESH_MeshEditor::AddElement(const vector & node, + const SMDSAbs_ElementType type, + const bool isPoly, + const int ID) +{ + SMDS_MeshElement* e = 0; + int nbnode = node.size(); + SMESHDS_Mesh* mesh = GetMeshDS(); + switch ( type ) { + case SMDSAbs_Edge: + if ( nbnode == 2 ) + if ( ID ) e = mesh->AddEdgeWithID(node[0], node[1], ID); + else e = mesh->AddEdge (node[0], node[1] ); + else if ( nbnode == 3 ) { + if ( ID ) e = mesh->AddEdgeWithID(node[0], node[1], node[2], ID); + else e = mesh->AddEdge (node[0], node[1], node[2] ); + } + break; + case SMDSAbs_Face: + if ( !isPoly ) { + if (nbnode == 3) + if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], ID); + else e = mesh->AddFace (node[0], node[1], node[2] ); + else if (nbnode == 4) + if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], node[3], ID); + else e = mesh->AddFace (node[0], node[1], node[2], node[3] ); + else if (nbnode == 6) + if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], node[3], + node[4], node[5], ID); + else e = mesh->AddFace (node[0], node[1], node[2], node[3], + node[4], node[5] ); + else if (nbnode == 8) { + if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], ID); + else e = mesh->AddFace (node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7] ); + } + } else { + if ( ID ) e = mesh->AddPolygonalFaceWithID(node, ID); + else e = mesh->AddPolygonalFace (node ); + } + break; + case SMDSAbs_Volume: + if ( !isPoly ) { + if (nbnode == 4) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3] ); + else if (nbnode == 5) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4] ); + else if (nbnode == 6) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], node[5], ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4], node[5] ); + else if (nbnode == 8) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7] ); + else if (nbnode == 10) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9] ); + else if (nbnode == 13) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], node[10],node[11], + node[12],ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], node[10],node[11], + node[12] ); + else if (nbnode == 15) + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], node[10],node[11], + node[12],node[13],node[14],ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], node[10],node[11], + node[12],node[13],node[14] ); + else if (nbnode == 20) { + if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], node[10],node[11], + node[12],node[13],node[14],node[15], + node[16],node[17],node[18],node[19],ID); + else e = mesh->AddVolume (node[0], node[1], node[2], node[3], + node[4], node[5], node[6], node[7], + node[8], node[9], node[10],node[11], + node[12],node[13],node[14],node[15], + node[16],node[17],node[18],node[19] ); + } + } + } + return e; +} + +//======================================================================= +/*! + * \brief Add element + */ +//======================================================================= + +SMDS_MeshElement* SMESH_MeshEditor::AddElement(const vector & nodeIDs, + const SMDSAbs_ElementType type, + const bool isPoly, + const int ID) +{ + vector nodes; + nodes.reserve( nodeIDs.size() ); + vector::const_iterator id = nodeIDs.begin(); + while ( id != nodeIDs.end() ) { + if ( const SMDS_MeshNode* node = GetMeshDS()->FindNode( *id++ )) + nodes.push_back( node ); + else + return 0; + } + return AddElement( nodes, type, isPoly, ID ); +} + +//======================================================================= +//function : Remove +//purpose : Remove a node or an element. +// Modify a compute state of sub-meshes which become empty +//======================================================================= + +bool SMESH_MeshEditor::Remove (const list< int >& theIDs, + const bool isNodes ) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + set< SMESH_subMesh *> smmap; + + list::const_iterator it = theIDs.begin(); + for ( ; it != theIDs.end(); it++ ) { + const SMDS_MeshElement * elem; + if ( isNodes ) + elem = aMesh->FindNode( *it ); + else + elem = aMesh->FindElement( *it ); + if ( !elem ) + continue; + + // Notify VERTEX sub-meshes about modification + if ( isNodes ) { + const SMDS_MeshNode* node = cast2Node( elem ); + if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX ) + if ( int aShapeID = node->GetPosition()->GetShapeId() ) + if ( SMESH_subMesh * sm = GetMesh()->GetSubMeshContaining( aShapeID ) ) + smmap.insert( sm ); + } + // Find sub-meshes to notify about modification +// SMDS_ElemIteratorPtr nodeIt = elem->nodesIterator(); +// while ( nodeIt->more() ) { +// const SMDS_MeshNode* node = static_cast( nodeIt->next() ); +// const SMDS_PositionPtr& aPosition = node->GetPosition(); +// if ( aPosition.get() ) { +// if ( int aShapeID = aPosition->GetShapeId() ) { +// if ( SMESH_subMesh * sm = GetMesh()->GetSubMeshContaining( aShapeID ) ) +// smmap.insert( sm ); +// } +// } +// } + + // Do remove + if ( isNodes ) + aMesh->RemoveNode( static_cast< const SMDS_MeshNode* >( elem )); + else + aMesh->RemoveElement( elem ); + } + + // Notify sub-meshes about modification + if ( !smmap.empty() ) { + set< SMESH_subMesh *>::iterator smIt; + for ( smIt = smmap.begin(); smIt != smmap.end(); smIt++ ) + (*smIt)->ComputeStateEngine( SMESH_subMesh::MESH_ENTITY_REMOVED ); + } + +// // Check if the whole mesh becomes empty +// if ( SMESH_subMesh * sm = GetMesh()->GetSubMeshContaining( 1 ) ) +// sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); + + return true; +} + +//======================================================================= +//function : FindShape +//purpose : Return an index of the shape theElem is on +// or zero if a shape not found +//======================================================================= + +int SMESH_MeshEditor::FindShape (const SMDS_MeshElement * theElem) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + SMESHDS_Mesh * aMesh = GetMeshDS(); + if ( aMesh->ShapeToMesh().IsNull() ) + return 0; + + if ( theElem->GetType() == SMDSAbs_Node ) { + const SMDS_PositionPtr& aPosition = + static_cast( theElem )->GetPosition(); + if ( aPosition.get() ) + return aPosition->GetShapeId(); + else + return 0; + } + + TopoDS_Shape aShape; // the shape a node is on + SMDS_ElemIteratorPtr nodeIt = theElem->nodesIterator(); + while ( nodeIt->more() ) { + const SMDS_MeshNode* node = static_cast( nodeIt->next() ); + const SMDS_PositionPtr& aPosition = node->GetPosition(); + if ( aPosition.get() ) { + int aShapeID = aPosition->GetShapeId(); + SMESHDS_SubMesh * sm = aMesh->MeshElements( aShapeID ); + if ( sm ) { + if ( sm->Contains( theElem )) + return aShapeID; + if ( aShape.IsNull() ) + aShape = aMesh->IndexToShape( aShapeID ); + } + else { + //MESSAGE ( "::FindShape() No SubShape for aShapeID " << aShapeID ); + } + } + } + + // None of nodes is on a proper shape, + // find the shape among ancestors of aShape on which a node is + if ( aShape.IsNull() ) { + //MESSAGE ("::FindShape() - NONE node is on shape") + return 0; + } + TopTools_ListIteratorOfListOfShape ancIt( GetMesh()->GetAncestors( aShape )); + for ( ; ancIt.More(); ancIt.Next() ) { + SMESHDS_SubMesh * sm = aMesh->MeshElements( ancIt.Value() ); + if ( sm && sm->Contains( theElem )) + return aMesh->ShapeToIndex( ancIt.Value() ); + } + + //MESSAGE ("::FindShape() - SHAPE NOT FOUND") + return 0; +} + +//======================================================================= +//function : IsMedium +//purpose : +//======================================================================= + +bool SMESH_MeshEditor::IsMedium(const SMDS_MeshNode* node, + const SMDSAbs_ElementType typeToCheck) +{ + bool isMedium = false; + SMDS_ElemIteratorPtr it = node->GetInverseElementIterator(typeToCheck); + while (it->more() && !isMedium ) { + const SMDS_MeshElement* elem = it->next(); + isMedium = elem->IsMediumNode(node); + } + return isMedium; +} + +//======================================================================= +//function : ShiftNodesQuadTria +//purpose : auxilary +// Shift nodes in the array corresponded to quadratic triangle +// example: (0,1,2,3,4,5) -> (1,2,0,4,5,3) +//======================================================================= +static void ShiftNodesQuadTria(const SMDS_MeshNode* aNodes[]) +{ + const SMDS_MeshNode* nd1 = aNodes[0]; + aNodes[0] = aNodes[1]; + aNodes[1] = aNodes[2]; + aNodes[2] = nd1; + const SMDS_MeshNode* nd2 = aNodes[3]; + aNodes[3] = aNodes[4]; + aNodes[4] = aNodes[5]; + aNodes[5] = nd2; +} + +//======================================================================= +//function : GetNodesFromTwoTria +//purpose : auxilary +// Shift nodes in the array corresponded to quadratic triangle +// example: (0,1,2,3,4,5) -> (1,2,0,4,5,3) +//======================================================================= +static bool GetNodesFromTwoTria(const SMDS_MeshElement * theTria1, + const SMDS_MeshElement * theTria2, + const SMDS_MeshNode* N1[], + const SMDS_MeshNode* N2[]) +{ + SMDS_ElemIteratorPtr it = theTria1->nodesIterator(); + int i=0; + while(i<6) { + N1[i] = static_cast( it->next() ); + i++; + } + if(it->more()) return false; + it = theTria2->nodesIterator(); + i=0; + while(i<6) { + N2[i] = static_cast( it->next() ); + i++; + } + if(it->more()) return false; + + int sames[3] = {-1,-1,-1}; + int nbsames = 0; + int j; + for(i=0; i<3; i++) { + for(j=0; j<3; j++) { + if(N1[i]==N2[j]) { + sames[i] = j; + nbsames++; + break; + } + } + } + if(nbsames!=2) return false; + if(sames[0]>-1) { + ShiftNodesQuadTria(N1); + if(sames[1]>-1) { + ShiftNodesQuadTria(N1); + } + } + i = sames[0] + sames[1] + sames[2]; + for(; i<2; i++) { + ShiftNodesQuadTria(N2); + } + // now we receive following N1 and N2 (using numeration as above image) + // tria1 : (1 2 4 5 9 7) and tria2 : (3 4 2 8 9 6) + // i.e. first nodes from both arrays determ new diagonal + return true; +} + +//======================================================================= +//function : InverseDiag +//purpose : Replace two neighbour triangles with ones built on the same 4 nodes +// but having other common link. +// Return False if args are improper +//======================================================================= + +bool SMESH_MeshEditor::InverseDiag (const SMDS_MeshElement * theTria1, + const SMDS_MeshElement * theTria2 ) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + if (!theTria1 || !theTria2) + return false; + + const SMDS_FaceOfNodes* F1 = dynamic_cast( theTria1 ); + const SMDS_FaceOfNodes* F2 = dynamic_cast( theTria2 ); + if (F1 && F2) { + + // 1 +--+ A theTria1: ( 1 A B ) A->2 ( 1 2 B ) 1 +--+ A + // | /| theTria2: ( B A 2 ) B->1 ( 1 A 2 ) |\ | + // |/ | | \| + // B +--+ 2 B +--+ 2 + + // put nodes in array and find out indices of the same ones + const SMDS_MeshNode* aNodes [6]; + int sameInd [] = { 0, 0, 0, 0, 0, 0 }; + int i = 0; + SMDS_ElemIteratorPtr it = theTria1->nodesIterator(); + while ( it->more() ) { + aNodes[ i ] = static_cast( it->next() ); + + if ( i > 2 ) // theTria2 + // find same node of theTria1 + for ( int j = 0; j < 3; j++ ) + if ( aNodes[ i ] == aNodes[ j ]) { + sameInd[ j ] = i; + sameInd[ i ] = j; + break; + } + // next + i++; + if ( i == 3 ) { + if ( it->more() ) + return false; // theTria1 is not a triangle + it = theTria2->nodesIterator(); + } + if ( i == 6 && it->more() ) + return false; // theTria2 is not a triangle + } + + // find indices of 1,2 and of A,B in theTria1 + int iA = 0, iB = 0, i1 = 0, i2 = 0; + for ( i = 0; i < 6; i++ ) { + if ( sameInd [ i ] == 0 ) { + if ( i < 3 ) i1 = i; + else i2 = i; + } else if (i < 3) { + if ( iA ) iB = i; + else iA = i; + } + } + // nodes 1 and 2 should not be the same + if ( aNodes[ i1 ] == aNodes[ i2 ] ) + return false; + + // theTria1: A->2 + aNodes[ iA ] = aNodes[ i2 ]; + // theTria2: B->1 + aNodes[ sameInd[ iB ]] = aNodes[ i1 ]; + + //MESSAGE( theTria1 << theTria2 ); + + GetMeshDS()->ChangeElementNodes( theTria1, aNodes, 3 ); + GetMeshDS()->ChangeElementNodes( theTria2, &aNodes[ 3 ], 3 ); + + //MESSAGE( theTria1 << theTria2 ); + + return true; + + } // end if(F1 && F2) + + // check case of quadratic faces + const SMDS_QuadraticFaceOfNodes* QF1 = + dynamic_cast (theTria1); + if(!QF1) return false; + const SMDS_QuadraticFaceOfNodes* QF2 = + dynamic_cast (theTria2); + if(!QF2) return false; + + // 5 + // 1 +--+--+ 2 theTria1: (1 2 4 5 9 7) or (2 4 1 9 7 5) or (4 1 2 7 5 9) + // | /| theTria2: (2 3 4 6 8 9) or (3 4 2 8 9 6) or (4 2 3 9 6 8) + // | / | + // 7 + + + 6 + // | /9 | + // |/ | + // 4 +--+--+ 3 + // 8 + + const SMDS_MeshNode* N1 [6]; + const SMDS_MeshNode* N2 [6]; + if(!GetNodesFromTwoTria(theTria1,theTria2,N1,N2)) + return false; + // now we receive following N1 and N2 (using numeration as above image) + // tria1 : (1 2 4 5 9 7) and tria2 : (3 4 2 8 9 6) + // i.e. first nodes from both arrays determ new diagonal + + const SMDS_MeshNode* N1new [6]; + const SMDS_MeshNode* N2new [6]; + N1new[0] = N1[0]; + N1new[1] = N2[0]; + N1new[2] = N2[1]; + N1new[3] = N1[4]; + N1new[4] = N2[3]; + N1new[5] = N1[5]; + N2new[0] = N1[0]; + N2new[1] = N1[1]; + N2new[2] = N2[0]; + N2new[3] = N1[3]; + N2new[4] = N2[5]; + N2new[5] = N1[4]; + // replaces nodes in faces + GetMeshDS()->ChangeElementNodes( theTria1, N1new, 6 ); + GetMeshDS()->ChangeElementNodes( theTria2, N2new, 6 ); + + return true; +} + +//======================================================================= +//function : findTriangles +//purpose : find triangles sharing theNode1-theNode2 link +//======================================================================= + +static bool findTriangles(const SMDS_MeshNode * theNode1, + const SMDS_MeshNode * theNode2, + const SMDS_MeshElement*& theTria1, + const SMDS_MeshElement*& theTria2) +{ + if ( !theNode1 || !theNode2 ) return false; + + theTria1 = theTria2 = 0; + + set< const SMDS_MeshElement* > emap; + SMDS_ElemIteratorPtr it = theNode1->GetInverseElementIterator(SMDSAbs_Face); + while (it->more()) { + const SMDS_MeshElement* elem = it->next(); + if ( elem->NbNodes() == 3 ) + emap.insert( elem ); + } + it = theNode2->GetInverseElementIterator(SMDSAbs_Face); + while (it->more()) { + const SMDS_MeshElement* elem = it->next(); + if ( emap.find( elem ) != emap.end() ) { + if ( theTria1 ) { + // theTria1 must be element with minimum ID + if( theTria1->GetID() < elem->GetID() ) { + theTria2 = elem; + } + else { + theTria2 = theTria1; + theTria1 = elem; + } + break; + } + else { + theTria1 = elem; + } + } + } + return ( theTria1 && theTria2 ); +} + +//======================================================================= +//function : InverseDiag +//purpose : Replace two neighbour triangles sharing theNode1-theNode2 link +// with ones built on the same 4 nodes but having other common link. +// Return false if proper faces not found +//======================================================================= + +bool SMESH_MeshEditor::InverseDiag (const SMDS_MeshNode * theNode1, + const SMDS_MeshNode * theNode2) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE( "::InverseDiag()" ); + + const SMDS_MeshElement *tr1, *tr2; + if ( !findTriangles( theNode1, theNode2, tr1, tr2 )) + return false; + + const SMDS_FaceOfNodes* F1 = dynamic_cast( tr1 ); + //if (!F1) return false; + const SMDS_FaceOfNodes* F2 = dynamic_cast( tr2 ); + //if (!F2) return false; + if (F1 && F2) { + + // 1 +--+ A tr1: ( 1 A B ) A->2 ( 1 2 B ) 1 +--+ A + // | /| tr2: ( B A 2 ) B->1 ( 1 A 2 ) |\ | + // |/ | | \| + // B +--+ 2 B +--+ 2 + + // put nodes in array + // and find indices of 1,2 and of A in tr1 and of B in tr2 + int i, iA1 = 0, i1 = 0; + const SMDS_MeshNode* aNodes1 [3]; + SMDS_ElemIteratorPtr it; + for (i = 0, it = tr1->nodesIterator(); it->more(); i++ ) { + aNodes1[ i ] = static_cast( it->next() ); + if ( aNodes1[ i ] == theNode1 ) + iA1 = i; // node A in tr1 + else if ( aNodes1[ i ] != theNode2 ) + i1 = i; // node 1 + } + int iB2 = 0, i2 = 0; + const SMDS_MeshNode* aNodes2 [3]; + for (i = 0, it = tr2->nodesIterator(); it->more(); i++ ) { + aNodes2[ i ] = static_cast( it->next() ); + if ( aNodes2[ i ] == theNode2 ) + iB2 = i; // node B in tr2 + else if ( aNodes2[ i ] != theNode1 ) + i2 = i; // node 2 + } + + // nodes 1 and 2 should not be the same + if ( aNodes1[ i1 ] == aNodes2[ i2 ] ) + return false; + + // tr1: A->2 + aNodes1[ iA1 ] = aNodes2[ i2 ]; + // tr2: B->1 + aNodes2[ iB2 ] = aNodes1[ i1 ]; + + //MESSAGE( tr1 << tr2 ); + + GetMeshDS()->ChangeElementNodes( tr1, aNodes1, 3 ); + GetMeshDS()->ChangeElementNodes( tr2, aNodes2, 3 ); + + //MESSAGE( tr1 << tr2 ); + + return true; + } + + // check case of quadratic faces + const SMDS_QuadraticFaceOfNodes* QF1 = + dynamic_cast (tr1); + if(!QF1) return false; + const SMDS_QuadraticFaceOfNodes* QF2 = + dynamic_cast (tr2); + if(!QF2) return false; + return InverseDiag(tr1,tr2); +} + +//======================================================================= +//function : getQuadrangleNodes +//purpose : fill theQuadNodes - nodes of a quadrangle resulting from +// fusion of triangles tr1 and tr2 having shared link on +// theNode1 and theNode2 +//======================================================================= + +bool getQuadrangleNodes(const SMDS_MeshNode * theQuadNodes [], + const SMDS_MeshNode * theNode1, + const SMDS_MeshNode * theNode2, + const SMDS_MeshElement * tr1, + const SMDS_MeshElement * tr2 ) +{ + if( tr1->NbNodes() != tr2->NbNodes() ) + return false; + // find the 4-th node to insert into tr1 + const SMDS_MeshNode* n4 = 0; + SMDS_ElemIteratorPtr it = tr2->nodesIterator(); + int i=0; + while ( !n4 && i<3 ) { + const SMDS_MeshNode * n = cast2Node( it->next() ); + i++; + bool isDiag = ( n == theNode1 || n == theNode2 ); + if ( !isDiag ) + n4 = n; + } + // Make an array of nodes to be in a quadrangle + int iNode = 0, iFirstDiag = -1; + it = tr1->nodesIterator(); + i=0; + while ( i<3 ) { + const SMDS_MeshNode * n = cast2Node( it->next() ); + i++; + bool isDiag = ( n == theNode1 || n == theNode2 ); + if ( isDiag ) { + if ( iFirstDiag < 0 ) + iFirstDiag = iNode; + else if ( iNode - iFirstDiag == 1 ) + theQuadNodes[ iNode++ ] = n4; // insert the 4-th node between diagonal nodes + } + else if ( n == n4 ) { + return false; // tr1 and tr2 should not have all the same nodes + } + theQuadNodes[ iNode++ ] = n; + } + if ( iNode == 3 ) // diagonal nodes have 0 and 2 indices + theQuadNodes[ iNode ] = n4; + + return true; +} + +//======================================================================= +//function : DeleteDiag +//purpose : Replace two neighbour triangles sharing theNode1-theNode2 link +// with a quadrangle built on the same 4 nodes. +// Return false if proper faces not found +//======================================================================= + +bool SMESH_MeshEditor::DeleteDiag (const SMDS_MeshNode * theNode1, + const SMDS_MeshNode * theNode2) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE( "::DeleteDiag()" ); + + const SMDS_MeshElement *tr1, *tr2; + if ( !findTriangles( theNode1, theNode2, tr1, tr2 )) + return false; + + const SMDS_FaceOfNodes* F1 = dynamic_cast( tr1 ); + //if (!F1) return false; + const SMDS_FaceOfNodes* F2 = dynamic_cast( tr2 ); + //if (!F2) return false; + if (F1 && F2) { + + const SMDS_MeshNode* aNodes [ 4 ]; + if ( ! getQuadrangleNodes( aNodes, theNode1, theNode2, tr1, tr2 )) + return false; + + //MESSAGE( endl << tr1 << tr2 ); + + GetMeshDS()->ChangeElementNodes( tr1, aNodes, 4 ); + myLastCreatedElems.Append(tr1); + GetMeshDS()->RemoveElement( tr2 ); + + //MESSAGE( endl << tr1 ); + + return true; + } + + // check case of quadratic faces + const SMDS_QuadraticFaceOfNodes* QF1 = + dynamic_cast (tr1); + if(!QF1) return false; + const SMDS_QuadraticFaceOfNodes* QF2 = + dynamic_cast (tr2); + if(!QF2) return false; + + // 5 + // 1 +--+--+ 2 tr1: (1 2 4 5 9 7) or (2 4 1 9 7 5) or (4 1 2 7 5 9) + // | /| tr2: (2 3 4 6 8 9) or (3 4 2 8 9 6) or (4 2 3 9 6 8) + // | / | + // 7 + + + 6 + // | /9 | + // |/ | + // 4 +--+--+ 3 + // 8 + + const SMDS_MeshNode* N1 [6]; + const SMDS_MeshNode* N2 [6]; + if(!GetNodesFromTwoTria(tr1,tr2,N1,N2)) + return false; + // now we receive following N1 and N2 (using numeration as above image) + // tria1 : (1 2 4 5 9 7) and tria2 : (3 4 2 8 9 6) + // i.e. first nodes from both arrays determ new diagonal + + const SMDS_MeshNode* aNodes[8]; + aNodes[0] = N1[0]; + aNodes[1] = N1[1]; + aNodes[2] = N2[0]; + aNodes[3] = N2[1]; + aNodes[4] = N1[3]; + aNodes[5] = N2[5]; + aNodes[6] = N2[3]; + aNodes[7] = N1[5]; + + GetMeshDS()->ChangeElementNodes( tr1, aNodes, 8 ); + myLastCreatedElems.Append(tr1); + GetMeshDS()->RemoveElement( tr2 ); + + // remove middle node (9) + GetMeshDS()->RemoveNode( N1[4] ); + + return true; +} + +//======================================================================= +//function : Reorient +//purpose : Reverse theElement orientation +//======================================================================= + +bool SMESH_MeshEditor::Reorient (const SMDS_MeshElement * theElem) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + if (!theElem) + return false; + SMDS_ElemIteratorPtr it = theElem->nodesIterator(); + if ( !it || !it->more() ) + return false; + + switch ( theElem->GetType() ) { + + case SMDSAbs_Edge: + case SMDSAbs_Face: { + if(!theElem->IsQuadratic()) { + int i = theElem->NbNodes(); + vector aNodes( i ); + while ( it->more() ) + aNodes[ --i ]= static_cast( it->next() ); + return GetMeshDS()->ChangeElementNodes( theElem, &aNodes[0], theElem->NbNodes() ); + } + else { + // quadratic elements + if(theElem->GetType()==SMDSAbs_Edge) { + vector aNodes(3); + aNodes[1]= static_cast( it->next() ); + aNodes[0]= static_cast( it->next() ); + aNodes[2]= static_cast( it->next() ); + return GetMeshDS()->ChangeElementNodes( theElem, &aNodes[0], 3 ); + } + else { + int nbn = theElem->NbNodes(); + vector aNodes(nbn); + aNodes[0]= static_cast( it->next() ); + int i=1; + for(; i( it->next() ); + } + for(i=0; i( it->next() ); + } + return GetMeshDS()->ChangeElementNodes( theElem, &aNodes[0], nbn ); + } + } + } + case SMDSAbs_Volume: { + if (theElem->IsPoly()) { + const SMDS_PolyhedralVolumeOfNodes* aPolyedre = + static_cast( theElem ); + if (!aPolyedre) { + MESSAGE("Warning: bad volumic element"); + return false; + } + + int nbFaces = aPolyedre->NbFaces(); + vector poly_nodes; + vector quantities (nbFaces); + + // reverse each face of the polyedre + for (int iface = 1; iface <= nbFaces; iface++) { + int inode, nbFaceNodes = aPolyedre->NbFaceNodes(iface); + quantities[iface - 1] = nbFaceNodes; + + for (inode = nbFaceNodes; inode >= 1; inode--) { + const SMDS_MeshNode* curNode = aPolyedre->GetFaceNode(iface, inode); + poly_nodes.push_back(curNode); + } + } + + return GetMeshDS()->ChangePolyhedronNodes( theElem, poly_nodes, quantities ); + + } + else { + SMDS_VolumeTool vTool; + if ( !vTool.Set( theElem )) + return false; + vTool.Inverse(); + return GetMeshDS()->ChangeElementNodes( theElem, vTool.GetNodes(), vTool.NbNodes() ); + } + } + default:; + } + + return false; +} + +//======================================================================= +//function : getBadRate +//purpose : +//======================================================================= + +static double getBadRate (const SMDS_MeshElement* theElem, + SMESH::Controls::NumericalFunctorPtr& theCrit) +{ + SMESH::Controls::TSequenceOfXYZ P; + if ( !theElem || !theCrit->GetPoints( theElem, P )) + return 1e100; + return theCrit->GetBadRate( theCrit->GetValue( P ), theElem->NbNodes() ); + //return theCrit->GetBadRate( theCrit->GetValue( theElem->GetID() ), theElem->NbNodes() ); +} + +//======================================================================= +//function : QuadToTri +//purpose : Cut quadrangles into triangles. +// theCrit is used to select a diagonal to cut +//======================================================================= + +bool SMESH_MeshEditor::QuadToTri (TIDSortedElemSet & theElems, + SMESH::Controls::NumericalFunctorPtr theCrit) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE( "::QuadToTri()" ); + + if ( !theCrit.get() ) + return false; + + SMESHDS_Mesh * aMesh = GetMeshDS(); + + Handle(Geom_Surface) surface; + SMESH_MesherHelper helper( *GetMesh() ); + + TIDSortedElemSet::iterator itElem; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + const SMDS_MeshElement* elem = *itElem; + if ( !elem || elem->GetType() != SMDSAbs_Face ) + continue; + if ( elem->NbNodes() != ( elem->IsQuadratic() ? 8 : 4 )) + continue; + + // retrieve element nodes + const SMDS_MeshNode* aNodes [8]; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int i = 0; + while ( itN->more() ) + aNodes[ i++ ] = static_cast( itN->next() ); + + // compare two sets of possible triangles + double aBadRate1, aBadRate2; // to what extent a set is bad + SMDS_FaceOfNodes tr1 ( aNodes[0], aNodes[1], aNodes[2] ); + SMDS_FaceOfNodes tr2 ( aNodes[2], aNodes[3], aNodes[0] ); + aBadRate1 = getBadRate( &tr1, theCrit ) + getBadRate( &tr2, theCrit ); + + SMDS_FaceOfNodes tr3 ( aNodes[1], aNodes[2], aNodes[3] ); + SMDS_FaceOfNodes tr4 ( aNodes[3], aNodes[0], aNodes[1] ); + aBadRate2 = getBadRate( &tr3, theCrit ) + getBadRate( &tr4, theCrit ); + + int aShapeId = FindShape( elem ); + const SMDS_MeshElement* newElem = 0; + + if( !elem->IsQuadratic() ) { + + // split liner quadrangle + + if ( aBadRate1 <= aBadRate2 ) { + // tr1 + tr2 is better + aMesh->ChangeElementNodes( elem, aNodes, 3 ); + newElem = aMesh->AddFace( aNodes[2], aNodes[3], aNodes[0] ); + } + else { + // tr3 + tr4 is better + aMesh->ChangeElementNodes( elem, &aNodes[1], 3 ); + newElem = aMesh->AddFace( aNodes[3], aNodes[0], aNodes[1] ); + } + } + else { + + // split quadratic quadrangle + + // get surface elem is on + if ( aShapeId != helper.GetSubShapeID() ) { + surface.Nullify(); + TopoDS_Shape shape; + if ( aShapeId > 0 ) + shape = aMesh->IndexToShape( aShapeId ); + if ( !shape.IsNull() && shape.ShapeType() == TopAbs_FACE ) { + TopoDS_Face face = TopoDS::Face( shape ); + surface = BRep_Tool::Surface( face ); + if ( !surface.IsNull() ) + helper.SetSubShape( shape ); + } + } + // get elem nodes + const SMDS_MeshNode* aNodes [8]; + const SMDS_MeshNode* inFaceNode = 0; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int i = 0; + while ( itN->more() ) { + aNodes[ i++ ] = static_cast( itN->next() ); + if ( !inFaceNode && helper.GetNodeUVneedInFaceNode() && + aNodes[ i-1 ]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) + { + inFaceNode = aNodes[ i-1 ]; + } + } + // find middle point for (0,1,2,3) + // and create a node in this point; + gp_XYZ p( 0,0,0 ); + if ( surface.IsNull() ) { + for(i=0; i<4; i++) + p += gp_XYZ(aNodes[i]->X(), aNodes[i]->Y(), aNodes[i]->Z() ); + p /= 4; + } + else { + TopoDS_Face face = TopoDS::Face( helper.GetSubShape() ); + gp_XY uv( 0,0 ); + for(i=0; i<4; i++) + uv += helper.GetNodeUV( face, aNodes[i], inFaceNode ); + uv /= 4.; + p = surface->Value( uv.X(), uv.Y() ).XYZ(); + } + const SMDS_MeshNode* newN = aMesh->AddNode( p.X(), p.Y(), p.Z() ); + myLastCreatedNodes.Append(newN); + + // create a new element + const SMDS_MeshNode* N[6]; + if ( aBadRate1 <= aBadRate2 ) { + N[0] = aNodes[0]; + N[1] = aNodes[1]; + N[2] = aNodes[2]; + N[3] = aNodes[4]; + N[4] = aNodes[5]; + N[5] = newN; + newElem = aMesh->AddFace(aNodes[2], aNodes[3], aNodes[0], + aNodes[6], aNodes[7], newN ); + } + else { + N[0] = aNodes[1]; + N[1] = aNodes[2]; + N[2] = aNodes[3]; + N[3] = aNodes[5]; + N[4] = aNodes[6]; + N[5] = newN; + newElem = aMesh->AddFace(aNodes[3], aNodes[0], aNodes[1], + aNodes[7], aNodes[4], newN ); + } + aMesh->ChangeElementNodes( elem, N, 6 ); + + } // quadratic case + + // care of a new element + + myLastCreatedElems.Append(newElem); + AddToSameGroups( newElem, elem, aMesh ); + + // put a new triangle on the same shape + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + } + return true; +} + +//======================================================================= +//function : BestSplit +//purpose : Find better diagonal for cutting. +//======================================================================= +int SMESH_MeshEditor::BestSplit (const SMDS_MeshElement* theQuad, + SMESH::Controls::NumericalFunctorPtr theCrit) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + if (!theCrit.get()) + return -1; + + if (!theQuad || theQuad->GetType() != SMDSAbs_Face ) + return -1; + + if( theQuad->NbNodes()==4 || + (theQuad->NbNodes()==8 && theQuad->IsQuadratic()) ) { + + // retrieve element nodes + const SMDS_MeshNode* aNodes [4]; + SMDS_ElemIteratorPtr itN = theQuad->nodesIterator(); + int i = 0; + //while (itN->more()) + while (i<4) { + aNodes[ i++ ] = static_cast( itN->next() ); + } + // compare two sets of possible triangles + double aBadRate1, aBadRate2; // to what extent a set is bad + SMDS_FaceOfNodes tr1 ( aNodes[0], aNodes[1], aNodes[2] ); + SMDS_FaceOfNodes tr2 ( aNodes[2], aNodes[3], aNodes[0] ); + aBadRate1 = getBadRate( &tr1, theCrit ) + getBadRate( &tr2, theCrit ); + + SMDS_FaceOfNodes tr3 ( aNodes[1], aNodes[2], aNodes[3] ); + SMDS_FaceOfNodes tr4 ( aNodes[3], aNodes[0], aNodes[1] ); + aBadRate2 = getBadRate( &tr3, theCrit ) + getBadRate( &tr4, theCrit ); + + if (aBadRate1 <= aBadRate2) // tr1 + tr2 is better + return 1; // diagonal 1-3 + + return 2; // diagonal 2-4 + } + return -1; +} + +//======================================================================= +//function : AddToSameGroups +//purpose : add elemToAdd to the groups the elemInGroups belongs to +//======================================================================= + +void SMESH_MeshEditor::AddToSameGroups (const SMDS_MeshElement* elemToAdd, + const SMDS_MeshElement* elemInGroups, + SMESHDS_Mesh * aMesh) +{ + const set& groups = aMesh->GetGroups(); + if (!groups.empty()) { + set::const_iterator grIt = groups.begin(); + for ( ; grIt != groups.end(); grIt++ ) { + SMESHDS_Group* group = dynamic_cast( *grIt ); + if ( group && group->Contains( elemInGroups )) + group->SMDSGroup().Add( elemToAdd ); + } + } +} + + +//======================================================================= +//function : RemoveElemFromGroups +//purpose : Remove removeelem to the groups the elemInGroups belongs to +//======================================================================= +void SMESH_MeshEditor::RemoveElemFromGroups (const SMDS_MeshElement* removeelem, + SMESHDS_Mesh * aMesh) +{ + const set& groups = aMesh->GetGroups(); + if (!groups.empty()) + { + set::const_iterator GrIt = groups.begin(); + for (; GrIt != groups.end(); GrIt++) + { + SMESHDS_Group* grp = dynamic_cast(*GrIt); + if (!grp || grp->IsEmpty()) continue; + grp->SMDSGroup().Remove(removeelem); + } + } +} + +//======================================================================= +//function : ReplaceElemInGroups +//purpose : replace elemToRm by elemToAdd in the all groups +//======================================================================= + +void SMESH_MeshEditor::ReplaceElemInGroups (const SMDS_MeshElement* elemToRm, + const SMDS_MeshElement* elemToAdd, + SMESHDS_Mesh * aMesh) +{ + const set& groups = aMesh->GetGroups(); + if (!groups.empty()) { + set::const_iterator grIt = groups.begin(); + for ( ; grIt != groups.end(); grIt++ ) { + SMESHDS_Group* group = dynamic_cast( *grIt ); + if ( group && group->SMDSGroup().Remove( elemToRm ) && elemToAdd ) + group->SMDSGroup().Add( elemToAdd ); + } + } +} + +//======================================================================= +//function : QuadToTri +//purpose : Cut quadrangles into triangles. +// theCrit is used to select a diagonal to cut +//======================================================================= + +bool SMESH_MeshEditor::QuadToTri (TIDSortedElemSet & theElems, + const bool the13Diag) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE( "::QuadToTri()" ); + + SMESHDS_Mesh * aMesh = GetMeshDS(); + + Handle(Geom_Surface) surface; + SMESH_MesherHelper helper( *GetMesh() ); + + TIDSortedElemSet::iterator itElem; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + const SMDS_MeshElement* elem = *itElem; + if ( !elem || elem->GetType() != SMDSAbs_Face ) + continue; + bool isquad = elem->NbNodes()==4 || elem->NbNodes()==8; + if(!isquad) continue; + + if(elem->NbNodes()==4) { + // retrieve element nodes + const SMDS_MeshNode* aNodes [4]; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int i = 0; + while ( itN->more() ) + aNodes[ i++ ] = static_cast( itN->next() ); + + int aShapeId = FindShape( elem ); + const SMDS_MeshElement* newElem = 0; + if ( the13Diag ) { + aMesh->ChangeElementNodes( elem, aNodes, 3 ); + newElem = aMesh->AddFace( aNodes[2], aNodes[3], aNodes[0] ); + } + else { + aMesh->ChangeElementNodes( elem, &aNodes[1], 3 ); + newElem = aMesh->AddFace( aNodes[3], aNodes[0], aNodes[1] ); + } + myLastCreatedElems.Append(newElem); + // put a new triangle on the same shape and add to the same groups + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + AddToSameGroups( newElem, elem, aMesh ); + } + + // Quadratic quadrangle + + if( elem->NbNodes()==8 && elem->IsQuadratic() ) { + + // get surface elem is on + int aShapeId = FindShape( elem ); + if ( aShapeId != helper.GetSubShapeID() ) { + surface.Nullify(); + TopoDS_Shape shape; + if ( aShapeId > 0 ) + shape = aMesh->IndexToShape( aShapeId ); + if ( !shape.IsNull() && shape.ShapeType() == TopAbs_FACE ) { + TopoDS_Face face = TopoDS::Face( shape ); + surface = BRep_Tool::Surface( face ); + if ( !surface.IsNull() ) + helper.SetSubShape( shape ); + } + } + + const SMDS_MeshNode* aNodes [8]; + const SMDS_MeshNode* inFaceNode = 0; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int i = 0; + while ( itN->more() ) { + aNodes[ i++ ] = static_cast( itN->next() ); + if ( !inFaceNode && helper.GetNodeUVneedInFaceNode() && + aNodes[ i-1 ]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_FACE ) + { + inFaceNode = aNodes[ i-1 ]; + } + } + + // find middle point for (0,1,2,3) + // and create a node in this point; + gp_XYZ p( 0,0,0 ); + if ( surface.IsNull() ) { + for(i=0; i<4; i++) + p += gp_XYZ(aNodes[i]->X(), aNodes[i]->Y(), aNodes[i]->Z() ); + p /= 4; + } + else { + TopoDS_Face geomFace = TopoDS::Face( helper.GetSubShape() ); + gp_XY uv( 0,0 ); + for(i=0; i<4; i++) + uv += helper.GetNodeUV( geomFace, aNodes[i], inFaceNode ); + uv /= 4.; + p = surface->Value( uv.X(), uv.Y() ).XYZ(); + } + const SMDS_MeshNode* newN = aMesh->AddNode( p.X(), p.Y(), p.Z() ); + myLastCreatedNodes.Append(newN); + + // create a new element + const SMDS_MeshElement* newElem = 0; + const SMDS_MeshNode* N[6]; + if ( the13Diag ) { + N[0] = aNodes[0]; + N[1] = aNodes[1]; + N[2] = aNodes[2]; + N[3] = aNodes[4]; + N[4] = aNodes[5]; + N[5] = newN; + newElem = aMesh->AddFace(aNodes[2], aNodes[3], aNodes[0], + aNodes[6], aNodes[7], newN ); + } + else { + N[0] = aNodes[1]; + N[1] = aNodes[2]; + N[2] = aNodes[3]; + N[3] = aNodes[5]; + N[4] = aNodes[6]; + N[5] = newN; + newElem = aMesh->AddFace(aNodes[3], aNodes[0], aNodes[1], + aNodes[7], aNodes[4], newN ); + } + myLastCreatedElems.Append(newElem); + aMesh->ChangeElementNodes( elem, N, 6 ); + // put a new triangle on the same shape and add to the same groups + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + AddToSameGroups( newElem, elem, aMesh ); + } + } + + return true; +} + +//======================================================================= +//function : getAngle +//purpose : +//======================================================================= + +double getAngle(const SMDS_MeshElement * tr1, + const SMDS_MeshElement * tr2, + const SMDS_MeshNode * n1, + const SMDS_MeshNode * n2) +{ + double angle = 2*PI; // bad angle + + // get normals + SMESH::Controls::TSequenceOfXYZ P1, P2; + if ( !SMESH::Controls::NumericalFunctor::GetPoints( tr1, P1 ) || + !SMESH::Controls::NumericalFunctor::GetPoints( tr2, P2 )) + return angle; + gp_Vec N1,N2; + if(!tr1->IsQuadratic()) + N1 = gp_Vec( P1(2) - P1(1) ) ^ gp_Vec( P1(3) - P1(1) ); + else + N1 = gp_Vec( P1(3) - P1(1) ) ^ gp_Vec( P1(5) - P1(1) ); + if ( N1.SquareMagnitude() <= gp::Resolution() ) + return angle; + if(!tr2->IsQuadratic()) + N2 = gp_Vec( P2(2) - P2(1) ) ^ gp_Vec( P2(3) - P2(1) ); + else + N2 = gp_Vec( P2(3) - P2(1) ) ^ gp_Vec( P2(5) - P2(1) ); + if ( N2.SquareMagnitude() <= gp::Resolution() ) + return angle; + + // find the first diagonal node n1 in the triangles: + // take in account a diagonal link orientation + const SMDS_MeshElement *nFirst[2], *tr[] = { tr1, tr2 }; + for ( int t = 0; t < 2; t++ ) { + SMDS_ElemIteratorPtr it = tr[ t ]->nodesIterator(); + int i = 0, iDiag = -1; + while ( it->more()) { + const SMDS_MeshElement *n = it->next(); + if ( n == n1 || n == n2 ) { + if ( iDiag < 0) + iDiag = i; + else { + if ( i - iDiag == 1 ) + nFirst[ t ] = ( n == n1 ? n2 : n1 ); + else + nFirst[ t ] = n; + break; + } + } + i++; + } + } + if ( nFirst[ 0 ] == nFirst[ 1 ] ) + N2.Reverse(); + + angle = N1.Angle( N2 ); + //SCRUTE( angle ); + return angle; +} + +// ================================================= +// class generating a unique ID for a pair of nodes +// and able to return nodes by that ID +// ================================================= +class LinkID_Gen { + public: + + LinkID_Gen( const SMESHDS_Mesh* theMesh ) + :myMesh( theMesh ), myMaxID( theMesh->MaxNodeID() + 1) + {} + + long GetLinkID (const SMDS_MeshNode * n1, + const SMDS_MeshNode * n2) const + { + return ( Min(n1->GetID(),n2->GetID()) * myMaxID + Max(n1->GetID(),n2->GetID())); + } + + bool GetNodes (const long theLinkID, + const SMDS_MeshNode* & theNode1, + const SMDS_MeshNode* & theNode2) const + { + theNode1 = myMesh->FindNode( theLinkID / myMaxID ); + if ( !theNode1 ) return false; + theNode2 = myMesh->FindNode( theLinkID % myMaxID ); + if ( !theNode2 ) return false; + return true; + } + + private: + LinkID_Gen(); + const SMESHDS_Mesh* myMesh; + long myMaxID; +}; + + +//======================================================================= +//function : TriToQuad +//purpose : Fuse neighbour triangles into quadrangles. +// theCrit is used to select a neighbour to fuse with. +// theMaxAngle is a max angle between element normals at which +// fusion is still performed. +//======================================================================= + +bool SMESH_MeshEditor::TriToQuad (TIDSortedElemSet & theElems, + SMESH::Controls::NumericalFunctorPtr theCrit, + const double theMaxAngle) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE( "::TriToQuad()" ); + + if ( !theCrit.get() ) + return false; + + SMESHDS_Mesh * aMesh = GetMeshDS(); + + // Prepare data for algo: build + // 1. map of elements with their linkIDs + // 2. map of linkIDs with their elements + + map< SMESH_TLink, list< const SMDS_MeshElement* > > mapLi_listEl; + map< SMESH_TLink, list< const SMDS_MeshElement* > >::iterator itLE; + map< const SMDS_MeshElement*, set< SMESH_TLink > > mapEl_setLi; + map< const SMDS_MeshElement*, set< SMESH_TLink > >::iterator itEL; + + TIDSortedElemSet::iterator itElem; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + const SMDS_MeshElement* elem = *itElem; + if(!elem || elem->GetType() != SMDSAbs_Face ) continue; + bool IsTria = elem->NbNodes()==3 || (elem->NbNodes()==6 && elem->IsQuadratic()); + if(!IsTria) continue; + + // retrieve element nodes + const SMDS_MeshNode* aNodes [4]; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int i = 0; + while ( i<3 ) + aNodes[ i++ ] = cast2Node( itN->next() ); + aNodes[ 3 ] = aNodes[ 0 ]; + + // fill maps + for ( i = 0; i < 3; i++ ) { + SMESH_TLink link( aNodes[i], aNodes[i+1] ); + // check if elements sharing a link can be fused + itLE = mapLi_listEl.find( link ); + if ( itLE != mapLi_listEl.end() ) { + if ((*itLE).second.size() > 1 ) // consider only 2 elems adjacent by a link + continue; + const SMDS_MeshElement* elem2 = (*itLE).second.front(); + //if ( FindShape( elem ) != FindShape( elem2 )) + // continue; // do not fuse triangles laying on different shapes + if ( getAngle( elem, elem2, aNodes[i], aNodes[i+1] ) > theMaxAngle ) + continue; // avoid making badly shaped quads + (*itLE).second.push_back( elem ); + } + else { + mapLi_listEl[ link ].push_back( elem ); + } + mapEl_setLi [ elem ].insert( link ); + } + } + // Clean the maps from the links shared by a sole element, ie + // links to which only one element is bound in mapLi_listEl + + for ( itLE = mapLi_listEl.begin(); itLE != mapLi_listEl.end(); itLE++ ) { + int nbElems = (*itLE).second.size(); + if ( nbElems < 2 ) { + const SMDS_MeshElement* elem = (*itLE).second.front(); + SMESH_TLink link = (*itLE).first; + mapEl_setLi[ elem ].erase( link ); + if ( mapEl_setLi[ elem ].empty() ) + mapEl_setLi.erase( elem ); + } + } + + // Algo: fuse triangles into quadrangles + + while ( ! mapEl_setLi.empty() ) { + // Look for the start element: + // the element having the least nb of shared links + const SMDS_MeshElement* startElem = 0; + int minNbLinks = 4; + for ( itEL = mapEl_setLi.begin(); itEL != mapEl_setLi.end(); itEL++ ) { + int nbLinks = (*itEL).second.size(); + if ( nbLinks < minNbLinks ) { + startElem = (*itEL).first; + minNbLinks = nbLinks; + if ( minNbLinks == 1 ) + break; + } + } + + // search elements to fuse starting from startElem or links of elements + // fused earlyer - startLinks + list< SMESH_TLink > startLinks; + while ( startElem || !startLinks.empty() ) { + while ( !startElem && !startLinks.empty() ) { + // Get an element to start, by a link + SMESH_TLink linkId = startLinks.front(); + startLinks.pop_front(); + itLE = mapLi_listEl.find( linkId ); + if ( itLE != mapLi_listEl.end() ) { + list< const SMDS_MeshElement* > & listElem = (*itLE).second; + list< const SMDS_MeshElement* >::iterator itE = listElem.begin(); + for ( ; itE != listElem.end() ; itE++ ) + if ( mapEl_setLi.find( (*itE) ) != mapEl_setLi.end() ) + startElem = (*itE); + mapLi_listEl.erase( itLE ); + } + } + + if ( startElem ) { + // Get candidates to be fused + const SMDS_MeshElement *tr1 = startElem, *tr2 = 0, *tr3 = 0; + const SMESH_TLink *link12, *link13; + startElem = 0; + ASSERT( mapEl_setLi.find( tr1 ) != mapEl_setLi.end() ); + set< SMESH_TLink >& setLi = mapEl_setLi[ tr1 ]; + ASSERT( !setLi.empty() ); + set< SMESH_TLink >::iterator itLi; + for ( itLi = setLi.begin(); itLi != setLi.end(); itLi++ ) + { + const SMESH_TLink & link = (*itLi); + itLE = mapLi_listEl.find( link ); + if ( itLE == mapLi_listEl.end() ) + continue; + + const SMDS_MeshElement* elem = (*itLE).second.front(); + if ( elem == tr1 ) + elem = (*itLE).second.back(); + mapLi_listEl.erase( itLE ); + if ( mapEl_setLi.find( elem ) == mapEl_setLi.end()) + continue; + if ( tr2 ) { + tr3 = elem; + link13 = &link; + } + else { + tr2 = elem; + link12 = &link; + } + + // add other links of elem to list of links to re-start from + set< SMESH_TLink >& links = mapEl_setLi[ elem ]; + set< SMESH_TLink >::iterator it; + for ( it = links.begin(); it != links.end(); it++ ) { + const SMESH_TLink& link2 = (*it); + if ( link2 != link ) + startLinks.push_back( link2 ); + } + } + + // Get nodes of possible quadrangles + const SMDS_MeshNode *n12 [4], *n13 [4]; + bool Ok12 = false, Ok13 = false; + const SMDS_MeshNode *linkNode1, *linkNode2; + if(tr2) { + linkNode1 = link12->first; + linkNode2 = link12->second; + if ( tr2 && getQuadrangleNodes( n12, linkNode1, linkNode2, tr1, tr2 )) + Ok12 = true; + } + if(tr3) { + linkNode1 = link13->first; + linkNode2 = link13->second; + if ( tr3 && getQuadrangleNodes( n13, linkNode1, linkNode2, tr1, tr3 )) + Ok13 = true; + } + + // Choose a pair to fuse + if ( Ok12 && Ok13 ) { + SMDS_FaceOfNodes quad12 ( n12[ 0 ], n12[ 1 ], n12[ 2 ], n12[ 3 ] ); + SMDS_FaceOfNodes quad13 ( n13[ 0 ], n13[ 1 ], n13[ 2 ], n13[ 3 ] ); + double aBadRate12 = getBadRate( &quad12, theCrit ); + double aBadRate13 = getBadRate( &quad13, theCrit ); + if ( aBadRate13 < aBadRate12 ) + Ok12 = false; + else + Ok13 = false; + } + + // Make quadrangles + // and remove fused elems and removed links from the maps + mapEl_setLi.erase( tr1 ); + if ( Ok12 ) { + mapEl_setLi.erase( tr2 ); + mapLi_listEl.erase( *link12 ); + if(tr1->NbNodes()==3) { + if( tr1->GetID() < tr2->GetID() ) { + aMesh->ChangeElementNodes( tr1, n12, 4 ); + myLastCreatedElems.Append(tr1); + aMesh->RemoveElement( tr2 ); + } + else { + aMesh->ChangeElementNodes( tr2, n12, 4 ); + myLastCreatedElems.Append(tr2); + aMesh->RemoveElement( tr1); + } + } + else { + const SMDS_MeshNode* N1 [6]; + const SMDS_MeshNode* N2 [6]; + GetNodesFromTwoTria(tr1,tr2,N1,N2); + // now we receive following N1 and N2 (using numeration as above image) + // tria1 : (1 2 4 5 9 7) and tria2 : (3 4 2 8 9 6) + // i.e. first nodes from both arrays determ new diagonal + const SMDS_MeshNode* aNodes[8]; + aNodes[0] = N1[0]; + aNodes[1] = N1[1]; + aNodes[2] = N2[0]; + aNodes[3] = N2[1]; + aNodes[4] = N1[3]; + aNodes[5] = N2[5]; + aNodes[6] = N2[3]; + aNodes[7] = N1[5]; + if( tr1->GetID() < tr2->GetID() ) { + GetMeshDS()->ChangeElementNodes( tr1, aNodes, 8 ); + myLastCreatedElems.Append(tr1); + GetMeshDS()->RemoveElement( tr2 ); + } + else { + GetMeshDS()->ChangeElementNodes( tr2, aNodes, 8 ); + myLastCreatedElems.Append(tr2); + GetMeshDS()->RemoveElement( tr1 ); + } + // remove middle node (9) + GetMeshDS()->RemoveNode( N1[4] ); + } + } + else if ( Ok13 ) { + mapEl_setLi.erase( tr3 ); + mapLi_listEl.erase( *link13 ); + if(tr1->NbNodes()==3) { + if( tr1->GetID() < tr2->GetID() ) { + aMesh->ChangeElementNodes( tr1, n13, 4 ); + myLastCreatedElems.Append(tr1); + aMesh->RemoveElement( tr3 ); + } + else { + aMesh->ChangeElementNodes( tr3, n13, 4 ); + myLastCreatedElems.Append(tr3); + aMesh->RemoveElement( tr1 ); + } + } + else { + const SMDS_MeshNode* N1 [6]; + const SMDS_MeshNode* N2 [6]; + GetNodesFromTwoTria(tr1,tr3,N1,N2); + // now we receive following N1 and N2 (using numeration as above image) + // tria1 : (1 2 4 5 9 7) and tria2 : (3 4 2 8 9 6) + // i.e. first nodes from both arrays determ new diagonal + const SMDS_MeshNode* aNodes[8]; + aNodes[0] = N1[0]; + aNodes[1] = N1[1]; + aNodes[2] = N2[0]; + aNodes[3] = N2[1]; + aNodes[4] = N1[3]; + aNodes[5] = N2[5]; + aNodes[6] = N2[3]; + aNodes[7] = N1[5]; + if( tr1->GetID() < tr2->GetID() ) { + GetMeshDS()->ChangeElementNodes( tr1, aNodes, 8 ); + myLastCreatedElems.Append(tr1); + GetMeshDS()->RemoveElement( tr3 ); + } + else { + GetMeshDS()->ChangeElementNodes( tr3, aNodes, 8 ); + myLastCreatedElems.Append(tr3); + GetMeshDS()->RemoveElement( tr1 ); + } + // remove middle node (9) + GetMeshDS()->RemoveNode( N1[4] ); + } + } + + // Next element to fuse: the rejected one + if ( tr3 ) + startElem = Ok12 ? tr3 : tr2; + + } // if ( startElem ) + } // while ( startElem || !startLinks.empty() ) + } // while ( ! mapEl_setLi.empty() ) + + return true; +} + + +/*#define DUMPSO(txt) \ +// cout << txt << endl; +//============================================================================= +// +// +// +//============================================================================= +static void swap( int i1, int i2, int idNodes[], gp_Pnt P[] ) +{ + if ( i1 == i2 ) + return; + int tmp = idNodes[ i1 ]; + idNodes[ i1 ] = idNodes[ i2 ]; + idNodes[ i2 ] = tmp; + gp_Pnt Ptmp = P[ i1 ]; + P[ i1 ] = P[ i2 ]; + P[ i2 ] = Ptmp; + DUMPSO( i1 << "(" << idNodes[ i2 ] << ") <-> " << i2 << "(" << idNodes[ i1 ] << ")"); +} + +//======================================================================= +//function : SortQuadNodes +//purpose : Set 4 nodes of a quadrangle face in a good order. +// Swap 1<->2 or 2<->3 nodes and correspondingly return +// 1 or 2 else 0. +//======================================================================= + +int SMESH_MeshEditor::SortQuadNodes (const SMDS_Mesh * theMesh, + int idNodes[] ) +{ + gp_Pnt P[4]; + int i; + for ( i = 0; i < 4; i++ ) { + const SMDS_MeshNode *n = theMesh->FindNode( idNodes[i] ); + if ( !n ) return 0; + P[ i ].SetCoord( n->X(), n->Y(), n->Z() ); + } + + gp_Vec V1(P[0], P[1]); + gp_Vec V2(P[0], P[2]); + gp_Vec V3(P[0], P[3]); + + gp_Vec Cross1 = V1 ^ V2; + gp_Vec Cross2 = V2 ^ V3; + + i = 0; + if (Cross1.Dot(Cross2) < 0) + { + Cross1 = V2 ^ V1; + Cross2 = V1 ^ V3; + + if (Cross1.Dot(Cross2) < 0) + i = 2; + else + i = 1; + swap ( i, i + 1, idNodes, P ); + +// for ( int ii = 0; ii < 4; ii++ ) { +// const SMDS_MeshNode *n = theMesh->FindNode( idNodes[ii] ); +// DUMPSO( ii << "(" << idNodes[ii] <<") : "<X()<<" "<Y()<<" "<Z()); +// } + } + return i; +} + +//======================================================================= +//function : SortHexaNodes +//purpose : Set 8 nodes of a hexahedron in a good order. +// Return success status +//======================================================================= + +bool SMESH_MeshEditor::SortHexaNodes (const SMDS_Mesh * theMesh, + int idNodes[] ) +{ + gp_Pnt P[8]; + int i; + DUMPSO( "INPUT: ========================================"); + for ( i = 0; i < 8; i++ ) { + const SMDS_MeshNode *n = theMesh->FindNode( idNodes[i] ); + if ( !n ) return false; + P[ i ].SetCoord( n->X(), n->Y(), n->Z() ); + DUMPSO( i << "(" << idNodes[i] <<") : "<X()<<" "<Y()<<" "<Z()); + } + DUMPSO( "========================================"); + + + set faceNodes; // ids of bottom face nodes, to be found + set checkedId1; // ids of tried 2-nd nodes + Standard_Real leastDist = DBL_MAX; // dist of the 4-th node from 123 plane + const Standard_Real tol = 1.e-6; // tolerance to find nodes in plane + int iMin, iLoop1 = 0; + + // Loop to try the 2-nd nodes + + while ( leastDist > DBL_MIN && ++iLoop1 < 8 ) + { + // Find not checked 2-nd node + for ( i = 1; i < 8; i++ ) + if ( checkedId1.find( idNodes[i] ) == checkedId1.end() ) { + int id1 = idNodes[i]; + swap ( 1, i, idNodes, P ); + checkedId1.insert ( id1 ); + break; + } + + // Find the 3-d node so that 1-2-3 triangle to be on a hexa face, + // ie that all but meybe one (id3 which is on the same face) nodes + // lay on the same side from the triangle plane. + + bool manyInPlane = false; // more than 4 nodes lay in plane + int iLoop2 = 0; + while ( ++iLoop2 < 6 ) { + + // get 1-2-3 plane coeffs + Standard_Real A, B, C, D; + gp_Vec N = gp_Vec (P[0], P[1]).Crossed( gp_Vec (P[0], P[2]) ); + if ( N.SquareMagnitude() > gp::Resolution() ) + { + gp_Pln pln ( P[0], N ); + pln.Coefficients( A, B, C, D ); + + // find the node (iMin) closest to pln + Standard_Real dist[ 8 ], minDist = DBL_MAX; + set idInPln; + for ( i = 3; i < 8; i++ ) { + dist[i] = A * P[i].X() + B * P[i].Y() + C * P[i].Z() + D; + if ( fabs( dist[i] ) < minDist ) { + minDist = fabs( dist[i] ); + iMin = i; + } + if ( fabs( dist[i] ) <= tol ) + idInPln.insert( idNodes[i] ); + } + + // there should not be more than 4 nodes in bottom plane + if ( idInPln.size() > 1 ) + { + DUMPSO( "### idInPln.size() = " << idInPln.size()); + // idInPlane does not contain the first 3 nodes + if ( manyInPlane || idInPln.size() == 5) + return false; // all nodes in one plane + manyInPlane = true; + + // set the 1-st node to be not in plane + for ( i = 3; i < 8; i++ ) { + if ( idInPln.find( idNodes[ i ] ) == idInPln.end() ) { + DUMPSO( "### Reset 0-th node"); + swap( 0, i, idNodes, P ); + break; + } + } + + // reset to re-check second nodes + leastDist = DBL_MAX; + faceNodes.clear(); + checkedId1.clear(); + iLoop1 = 0; + break; // from iLoop2; + } + + // check that the other 4 nodes are on the same side + bool sameSide = true; + bool isNeg = dist[ iMin == 3 ? 4 : 3 ] <= 0.; + for ( i = 3; sameSide && i < 8; i++ ) { + if ( i != iMin ) + sameSide = ( isNeg == dist[i] <= 0.); + } + + // keep best solution + if ( sameSide && minDist < leastDist ) { + leastDist = minDist; + faceNodes.clear(); + faceNodes.insert( idNodes[ 1 ] ); + faceNodes.insert( idNodes[ 2 ] ); + faceNodes.insert( idNodes[ iMin ] ); + DUMPSO( "loop " << iLoop2 << " id2 " << idNodes[ 1 ] << " id3 " << idNodes[ 2 ] + << " leastDist = " << leastDist); + if ( leastDist <= DBL_MIN ) + break; + } + } + + // set next 3-d node to check + int iNext = 2 + iLoop2; + if ( iNext < 8 ) { + DUMPSO( "Try 2-nd"); + swap ( 2, iNext, idNodes, P ); + } + } // while ( iLoop2 < 6 ) + } // iLoop1 + + if ( faceNodes.empty() ) return false; + + // Put the faceNodes in proper places + for ( i = 4; i < 8; i++ ) { + if ( faceNodes.find( idNodes[ i ] ) != faceNodes.end() ) { + // find a place to put + int iTo = 1; + while ( faceNodes.find( idNodes[ iTo ] ) != faceNodes.end() ) + iTo++; + DUMPSO( "Set faceNodes"); + swap ( iTo, i, idNodes, P ); + } + } + + + // Set nodes of the found bottom face in good order + DUMPSO( " Found bottom face: "); + i = SortQuadNodes( theMesh, idNodes ); + if ( i ) { + gp_Pnt Ptmp = P[ i ]; + P[ i ] = P[ i+1 ]; + P[ i+1 ] = Ptmp; + } +// else +// for ( int ii = 0; ii < 4; ii++ ) { +// const SMDS_MeshNode *n = theMesh->FindNode( idNodes[ii] ); +// DUMPSO( ii << "(" << idNodes[ii] <<") : "<X()<<" "<Y()<<" "<Z()); +// } + + // Gravity center of the top and bottom faces + gp_Pnt aGCb = ( P[0].XYZ() + P[1].XYZ() + P[2].XYZ() + P[3].XYZ() ) / 4.; + gp_Pnt aGCt = ( P[4].XYZ() + P[5].XYZ() + P[6].XYZ() + P[7].XYZ() ) / 4.; + + // Get direction from the bottom to the top face + gp_Vec upDir ( aGCb, aGCt ); + Standard_Real upDirSize = upDir.Magnitude(); + if ( upDirSize <= gp::Resolution() ) return false; + upDir / upDirSize; + + // Assure that the bottom face normal points up + gp_Vec Nb = gp_Vec (P[0], P[1]).Crossed( gp_Vec (P[0], P[2]) ); + Nb += gp_Vec (P[0], P[2]).Crossed( gp_Vec (P[0], P[3]) ); + if ( Nb.Dot( upDir ) < 0 ) { + DUMPSO( "Reverse bottom face"); + swap( 1, 3, idNodes, P ); + } + + // Find 5-th node - the one closest to the 1-st among the last 4 nodes. + Standard_Real minDist = DBL_MAX; + for ( i = 4; i < 8; i++ ) { + // projection of P[i] to the plane defined by P[0] and upDir + gp_Pnt Pp = P[i].Translated( upDir * ( upDir.Dot( gp_Vec( P[i], P[0] )))); + Standard_Real sqDist = P[0].SquareDistance( Pp ); + if ( sqDist < minDist ) { + minDist = sqDist; + iMin = i; + } + } + DUMPSO( "Set 4-th"); + swap ( 4, iMin, idNodes, P ); + + // Set nodes of the top face in good order + DUMPSO( "Sort top face"); + i = SortQuadNodes( theMesh, &idNodes[4] ); + if ( i ) { + i += 4; + gp_Pnt Ptmp = P[ i ]; + P[ i ] = P[ i+1 ]; + P[ i+1 ] = Ptmp; + } + + // Assure that direction of the top face normal is from the bottom face + gp_Vec Nt = gp_Vec (P[4], P[5]).Crossed( gp_Vec (P[4], P[6]) ); + Nt += gp_Vec (P[4], P[6]).Crossed( gp_Vec (P[4], P[7]) ); + if ( Nt.Dot( upDir ) < 0 ) { + DUMPSO( "Reverse top face"); + swap( 5, 7, idNodes, P ); + } + +// DUMPSO( "OUTPUT: ========================================"); +// for ( i = 0; i < 8; i++ ) { +// float *p = ugrid->GetPoint(idNodes[i]); +// DUMPSO( i << "(" << idNodes[i] << ") : " << p[0] << " " << p[1] << " " << p[2]); +// } + + return true; +}*/ + +//================================================================================ +/*! + * \brief Return nodes linked to the given one + * \param theNode - the node + * \param linkedNodes - the found nodes + * \param type - the type of elements to check + * + * Medium nodes are ignored + */ +//================================================================================ + +void SMESH_MeshEditor::GetLinkedNodes( const SMDS_MeshNode* theNode, + TIDSortedElemSet & linkedNodes, + SMDSAbs_ElementType type ) +{ + SMDS_ElemIteratorPtr elemIt = theNode->GetInverseElementIterator(type); + while ( elemIt->more() ) + { + const SMDS_MeshElement* elem = elemIt->next(); + SMDS_ElemIteratorPtr nodeIt = elem->nodesIterator(); + if ( elem->GetType() == SMDSAbs_Volume ) + { + SMDS_VolumeTool vol( elem ); + while ( nodeIt->more() ) { + const SMDS_MeshNode* n = cast2Node( nodeIt->next() ); + if ( theNode != n && vol.IsLinked( theNode, n )) + linkedNodes.insert( n ); + } + } + else + { + for ( int i = 0; nodeIt->more(); ++i ) { + const SMDS_MeshNode* n = cast2Node( nodeIt->next() ); + if ( n == theNode ) { + int iBefore = i - 1; + int iAfter = i + 1; + if ( elem->IsQuadratic() ) { + int nb = elem->NbNodes() / 2; + iAfter = SMESH_MesherHelper::WrapIndex( iAfter, nb ); + iBefore = SMESH_MesherHelper::WrapIndex( iBefore, nb ); + } + linkedNodes.insert( elem->GetNodeWrap( iAfter )); + linkedNodes.insert( elem->GetNodeWrap( iBefore )); + } + } + } + } +} + +//======================================================================= +//function : laplacianSmooth +//purpose : pulls theNode toward the center of surrounding nodes directly +// connected to that node along an element edge +//======================================================================= + +void laplacianSmooth(const SMDS_MeshNode* theNode, + const Handle(Geom_Surface)& theSurface, + map< const SMDS_MeshNode*, gp_XY* >& theUVMap) +{ + // find surrounding nodes + + TIDSortedElemSet nodeSet; + SMESH_MeshEditor::GetLinkedNodes( theNode, nodeSet, SMDSAbs_Face ); + + // compute new coodrs + + double coord[] = { 0., 0., 0. }; + TIDSortedElemSet::iterator nodeSetIt = nodeSet.begin(); + for ( ; nodeSetIt != nodeSet.end(); nodeSetIt++ ) { + const SMDS_MeshNode* node = cast2Node(*nodeSetIt); + if ( theSurface.IsNull() ) { // smooth in 3D + coord[0] += node->X(); + coord[1] += node->Y(); + coord[2] += node->Z(); + } + else { // smooth in 2D + ASSERT( theUVMap.find( node ) != theUVMap.end() ); + gp_XY* uv = theUVMap[ node ]; + coord[0] += uv->X(); + coord[1] += uv->Y(); + } + } + int nbNodes = nodeSet.size(); + if ( !nbNodes ) + return; + coord[0] /= nbNodes; + coord[1] /= nbNodes; + + if ( !theSurface.IsNull() ) { + ASSERT( theUVMap.find( theNode ) != theUVMap.end() ); + theUVMap[ theNode ]->SetCoord( coord[0], coord[1] ); + gp_Pnt p3d = theSurface->Value( coord[0], coord[1] ); + coord[0] = p3d.X(); + coord[1] = p3d.Y(); + coord[2] = p3d.Z(); + } + else + coord[2] /= nbNodes; + + // move node + + const_cast< SMDS_MeshNode* >( theNode )->setXYZ(coord[0],coord[1],coord[2]); +} + +//======================================================================= +//function : centroidalSmooth +//purpose : pulls theNode toward the element-area-weighted centroid of the +// surrounding elements +//======================================================================= + +void centroidalSmooth(const SMDS_MeshNode* theNode, + const Handle(Geom_Surface)& theSurface, + map< const SMDS_MeshNode*, gp_XY* >& theUVMap) +{ + gp_XYZ aNewXYZ(0.,0.,0.); + SMESH::Controls::Area anAreaFunc; + double totalArea = 0.; + int nbElems = 0; + + // compute new XYZ + + SMDS_ElemIteratorPtr elemIt = theNode->GetInverseElementIterator(SMDSAbs_Face); + while ( elemIt->more() ) + { + const SMDS_MeshElement* elem = elemIt->next(); + nbElems++; + + gp_XYZ elemCenter(0.,0.,0.); + SMESH::Controls::TSequenceOfXYZ aNodePoints; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int nn = elem->NbNodes(); + if(elem->IsQuadratic()) nn = nn/2; + int i=0; + //while ( itN->more() ) { + while ( i( itN->next() ); + i++; + gp_XYZ aP( aNode->X(), aNode->Y(), aNode->Z() ); + aNodePoints.push_back( aP ); + if ( !theSurface.IsNull() ) { // smooth in 2D + ASSERT( theUVMap.find( aNode ) != theUVMap.end() ); + gp_XY* uv = theUVMap[ aNode ]; + aP.SetCoord( uv->X(), uv->Y(), 0. ); + } + elemCenter += aP; + } + double elemArea = anAreaFunc.GetValue( aNodePoints ); + totalArea += elemArea; + elemCenter /= nn; + aNewXYZ += elemCenter * elemArea; + } + aNewXYZ /= totalArea; + if ( !theSurface.IsNull() ) { + theUVMap[ theNode ]->SetCoord( aNewXYZ.X(), aNewXYZ.Y() ); + aNewXYZ = theSurface->Value( aNewXYZ.X(), aNewXYZ.Y() ).XYZ(); + } + + // move node + + const_cast< SMDS_MeshNode* >( theNode )->setXYZ(aNewXYZ.X(),aNewXYZ.Y(),aNewXYZ.Z()); +} + +//======================================================================= +//function : getClosestUV +//purpose : return UV of closest projection +//======================================================================= + +static bool getClosestUV (Extrema_GenExtPS& projector, + const gp_Pnt& point, + gp_XY & result) +{ + projector.Perform( point ); + if ( projector.IsDone() ) { + double u, v, minVal = DBL_MAX; + for ( int i = projector.NbExt(); i > 0; i-- ) +#if OCC_VERSION_HEX >= 0x060500 + if ( projector.SquareDistance( i ) < minVal ) { + minVal = projector.SquareDistance( i ); +#else + if ( projector.Value( i ) < minVal ) { + minVal = projector.Value( i ); +#endif + projector.Point( i ).Parameter( u, v ); + } + result.SetCoord( u, v ); + return true; + } + return false; +} + +//======================================================================= +//function : Smooth +//purpose : Smooth theElements during theNbIterations or until a worst +// element has aspect ratio <= theTgtAspectRatio. +// Aspect Ratio varies in range [1.0, inf]. +// If theElements is empty, the whole mesh is smoothed. +// theFixedNodes contains additionally fixed nodes. Nodes built +// on edges and boundary nodes are always fixed. +//======================================================================= + +void SMESH_MeshEditor::Smooth (TIDSortedElemSet & theElems, + set & theFixedNodes, + const SmoothMethod theSmoothMethod, + const int theNbIterations, + double theTgtAspectRatio, + const bool the2D) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE((theSmoothMethod==LAPLACIAN ? "LAPLACIAN" : "CENTROIDAL") << "--::Smooth()"); + + if ( theTgtAspectRatio < 1.0 ) + theTgtAspectRatio = 1.0; + + const double disttol = 1.e-16; + + SMESH::Controls::AspectRatio aQualityFunc; + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + if ( theElems.empty() ) { + // add all faces to theElems + SMDS_FaceIteratorPtr fIt = aMesh->facesIterator(); + while ( fIt->more() ) { + const SMDS_MeshElement* face = fIt->next(); + theElems.insert( face ); + } + } + // get all face ids theElems are on + set< int > faceIdSet; + TIDSortedElemSet::iterator itElem; + if ( the2D ) + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + int fId = FindShape( *itElem ); + // check that corresponding submesh exists and a shape is face + if (fId && + faceIdSet.find( fId ) == faceIdSet.end() && + aMesh->MeshElements( fId )) { + TopoDS_Shape F = aMesh->IndexToShape( fId ); + if ( !F.IsNull() && F.ShapeType() == TopAbs_FACE ) + faceIdSet.insert( fId ); + } + } + faceIdSet.insert( 0 ); // to smooth elements that are not on any TopoDS_Face + + // =============================================== + // smooth elements on each TopoDS_Face separately + // =============================================== + + set< int >::reverse_iterator fId = faceIdSet.rbegin(); // treate 0 fId at the end + for ( ; fId != faceIdSet.rend(); ++fId ) { + // get face surface and submesh + Handle(Geom_Surface) surface; + SMESHDS_SubMesh* faceSubMesh = 0; + TopoDS_Face face; + double fToler2 = 0, vPeriod = 0., uPeriod = 0., f,l; + double u1 = 0, u2 = 0, v1 = 0, v2 = 0; + bool isUPeriodic = false, isVPeriodic = false; + if ( *fId ) { + face = TopoDS::Face( aMesh->IndexToShape( *fId )); + surface = BRep_Tool::Surface( face ); + faceSubMesh = aMesh->MeshElements( *fId ); + fToler2 = BRep_Tool::Tolerance( face ); + fToler2 *= fToler2 * 10.; + isUPeriodic = surface->IsUPeriodic(); + if ( isUPeriodic ) + vPeriod = surface->UPeriod(); + isVPeriodic = surface->IsVPeriodic(); + if ( isVPeriodic ) + uPeriod = surface->VPeriod(); + surface->Bounds( u1, u2, v1, v2 ); + } + // --------------------------------------------------------- + // for elements on a face, find movable and fixed nodes and + // compute UV for them + // --------------------------------------------------------- + bool checkBoundaryNodes = false; + bool isQuadratic = false; + set setMovableNodes; + map< const SMDS_MeshNode*, gp_XY* > uvMap, uvMap2; + list< gp_XY > listUV; // uvs the 2 uvMaps refer to + list< const SMDS_MeshElement* > elemsOnFace; + + Extrema_GenExtPS projector; + GeomAdaptor_Surface surfAdaptor; + if ( !surface.IsNull() ) { + surfAdaptor.Load( surface ); + projector.Initialize( surfAdaptor, 20,20, 1e-5,1e-5 ); + } + int nbElemOnFace = 0; + itElem = theElems.begin(); + // loop on not yet smoothed elements: look for elems on a face + while ( itElem != theElems.end() ) { + if ( faceSubMesh && nbElemOnFace == faceSubMesh->NbElements() ) + break; // all elements found + + const SMDS_MeshElement* elem = *itElem; + if ( !elem || elem->GetType() != SMDSAbs_Face || elem->NbNodes() < 3 || + ( faceSubMesh && !faceSubMesh->Contains( elem ))) { + ++itElem; + continue; + } + elemsOnFace.push_back( elem ); + theElems.erase( itElem++ ); + nbElemOnFace++; + + if ( !isQuadratic ) + isQuadratic = elem->IsQuadratic(); + + // get movable nodes of elem + const SMDS_MeshNode* node; + SMDS_TypeOfPosition posType; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + int nn = 0, nbn = elem->NbNodes(); + if(elem->IsQuadratic()) + nbn = nbn/2; + while ( nn++ < nbn ) { + node = static_cast( itN->next() ); + const SMDS_PositionPtr& pos = node->GetPosition(); + posType = pos.get() ? pos->GetTypeOfPosition() : SMDS_TOP_3DSPACE; + if (posType != SMDS_TOP_EDGE && + posType != SMDS_TOP_VERTEX && + theFixedNodes.find( node ) == theFixedNodes.end()) + { + // check if all faces around the node are on faceSubMesh + // because a node on edge may be bound to face + SMDS_ElemIteratorPtr eIt = node->GetInverseElementIterator(SMDSAbs_Face); + bool all = true; + if ( faceSubMesh ) { + while ( eIt->more() && all ) { + const SMDS_MeshElement* e = eIt->next(); + all = faceSubMesh->Contains( e ); + } + } + if ( all ) + setMovableNodes.insert( node ); + else + checkBoundaryNodes = true; + } + if ( posType == SMDS_TOP_3DSPACE ) + checkBoundaryNodes = true; + } + + if ( surface.IsNull() ) + continue; + + // get nodes to check UV + list< const SMDS_MeshNode* > uvCheckNodes; + itN = elem->nodesIterator(); + nn = 0; nbn = elem->NbNodes(); + if(elem->IsQuadratic()) + nbn = nbn/2; + while ( nn++ < nbn ) { + node = static_cast( itN->next() ); + if ( uvMap.find( node ) == uvMap.end() ) + uvCheckNodes.push_back( node ); + // add nodes of elems sharing node +// SMDS_ElemIteratorPtr eIt = node->GetInverseElementIterator(SMDSAbs_Face); +// while ( eIt->more() ) { +// const SMDS_MeshElement* e = eIt->next(); +// if ( e != elem ) { +// SMDS_ElemIteratorPtr nIt = e->nodesIterator(); +// while ( nIt->more() ) { +// const SMDS_MeshNode* n = +// static_cast( nIt->next() ); +// if ( uvMap.find( n ) == uvMap.end() ) +// uvCheckNodes.push_back( n ); +// } +// } +// } + } + // check UV on face + list< const SMDS_MeshNode* >::iterator n = uvCheckNodes.begin(); + for ( ; n != uvCheckNodes.end(); ++n ) { + node = *n; + gp_XY uv( 0, 0 ); + const SMDS_PositionPtr& pos = node->GetPosition(); + posType = pos.get() ? pos->GetTypeOfPosition() : SMDS_TOP_3DSPACE; + // get existing UV + switch ( posType ) { + case SMDS_TOP_FACE: { + SMDS_FacePosition* fPos = ( SMDS_FacePosition* ) pos.get(); + uv.SetCoord( fPos->GetUParameter(), fPos->GetVParameter() ); + break; + } + case SMDS_TOP_EDGE: { + TopoDS_Shape S = aMesh->IndexToShape( pos->GetShapeId() ); + Handle(Geom2d_Curve) pcurve; + if ( !S.IsNull() && S.ShapeType() == TopAbs_EDGE ) + pcurve = BRep_Tool::CurveOnSurface( TopoDS::Edge( S ), face, f,l ); + if ( !pcurve.IsNull() ) { + double u = (( SMDS_EdgePosition* ) pos.get() )->GetUParameter(); + uv = pcurve->Value( u ).XY(); + } + break; + } + case SMDS_TOP_VERTEX: { + TopoDS_Shape S = aMesh->IndexToShape( pos->GetShapeId() ); + if ( !S.IsNull() && S.ShapeType() == TopAbs_VERTEX ) + uv = BRep_Tool::Parameters( TopoDS::Vertex( S ), face ).XY(); + break; + } + default:; + } + // check existing UV + bool project = true; + gp_Pnt pNode ( node->X(), node->Y(), node->Z() ); + double dist1 = DBL_MAX, dist2 = 0; + if ( posType != SMDS_TOP_3DSPACE ) { + dist1 = pNode.SquareDistance( surface->Value( uv.X(), uv.Y() )); + project = dist1 > fToler2; + } + if ( project ) { // compute new UV + gp_XY newUV; + if ( !getClosestUV( projector, pNode, newUV )) { + MESSAGE("Node Projection Failed " << node); + } + else { + if ( isUPeriodic ) + newUV.SetX( ElCLib::InPeriod( newUV.X(), u1, u2 )); + if ( isVPeriodic ) + newUV.SetY( ElCLib::InPeriod( newUV.Y(), v1, v2 )); + // check new UV + if ( posType != SMDS_TOP_3DSPACE ) + dist2 = pNode.SquareDistance( surface->Value( newUV.X(), newUV.Y() )); + if ( dist2 < dist1 ) + uv = newUV; + } + } + // store UV in the map + listUV.push_back( uv ); + uvMap.insert( make_pair( node, &listUV.back() )); + } + } // loop on not yet smoothed elements + + if ( !faceSubMesh || nbElemOnFace != faceSubMesh->NbElements() ) + checkBoundaryNodes = true; + + // fix nodes on mesh boundary + + if ( checkBoundaryNodes ) { + map< NLink, int > linkNbMap; // how many times a link encounters in elemsOnFace + map< NLink, int >::iterator link_nb; + // put all elements links to linkNbMap + list< const SMDS_MeshElement* >::iterator elemIt = elemsOnFace.begin(); + for ( ; elemIt != elemsOnFace.end(); ++elemIt ) { + const SMDS_MeshElement* elem = (*elemIt); + int nbn = elem->NbNodes(); + if(elem->IsQuadratic()) + nbn = nbn/2; + // loop on elem links: insert them in linkNbMap + const SMDS_MeshNode* curNode, *prevNode = elem->GetNodeWrap( nbn ); + for ( int iN = 0; iN < nbn; ++iN ) { + curNode = elem->GetNode( iN ); + NLink link; + if ( curNode < prevNode ) link = make_pair( curNode , prevNode ); + else link = make_pair( prevNode , curNode ); + prevNode = curNode; + link_nb = linkNbMap.find( link ); + if ( link_nb == linkNbMap.end() ) + linkNbMap.insert( make_pair ( link, 1 )); + else + link_nb->second++; + } + } + // remove nodes that are in links encountered only once from setMovableNodes + for ( link_nb = linkNbMap.begin(); link_nb != linkNbMap.end(); ++link_nb ) { + if ( link_nb->second == 1 ) { + setMovableNodes.erase( link_nb->first.first ); + setMovableNodes.erase( link_nb->first.second ); + } + } + } + + // ----------------------------------------------------- + // for nodes on seam edge, compute one more UV ( uvMap2 ); + // find movable nodes linked to nodes on seam and which + // are to be smoothed using the second UV ( uvMap2 ) + // ----------------------------------------------------- + + set nodesNearSeam; // to smooth using uvMap2 + if ( !surface.IsNull() ) { + TopExp_Explorer eExp( face, TopAbs_EDGE ); + for ( ; eExp.More(); eExp.Next() ) { + TopoDS_Edge edge = TopoDS::Edge( eExp.Current() ); + if ( !BRep_Tool::IsClosed( edge, face )) + continue; + SMESHDS_SubMesh* sm = aMesh->MeshElements( edge ); + if ( !sm ) continue; + // find out which parameter varies for a node on seam + double f,l; + gp_Pnt2d uv1, uv2; + Handle(Geom2d_Curve) pcurve = BRep_Tool::CurveOnSurface( edge, face, f, l ); + if ( pcurve.IsNull() ) continue; + uv1 = pcurve->Value( f ); + edge.Reverse(); + pcurve = BRep_Tool::CurveOnSurface( edge, face, f, l ); + if ( pcurve.IsNull() ) continue; + uv2 = pcurve->Value( f ); + int iPar = Abs( uv1.X() - uv2.X() ) > Abs( uv1.Y() - uv2.Y() ) ? 1 : 2; + // assure uv1 < uv2 + if ( uv1.Coord( iPar ) > uv2.Coord( iPar )) { + gp_Pnt2d tmp = uv1; uv1 = uv2; uv2 = tmp; + } + // get nodes on seam and its vertices + list< const SMDS_MeshNode* > seamNodes; + SMDS_NodeIteratorPtr nSeamIt = sm->GetNodes(); + while ( nSeamIt->more() ) { + const SMDS_MeshNode* node = nSeamIt->next(); + if ( !isQuadratic || !IsMedium( node )) + seamNodes.push_back( node ); + } + TopExp_Explorer vExp( edge, TopAbs_VERTEX ); + for ( ; vExp.More(); vExp.Next() ) { + sm = aMesh->MeshElements( vExp.Current() ); + if ( sm ) { + nSeamIt = sm->GetNodes(); + while ( nSeamIt->more() ) + seamNodes.push_back( nSeamIt->next() ); + } + } + // loop on nodes on seam + list< const SMDS_MeshNode* >::iterator noSeIt = seamNodes.begin(); + for ( ; noSeIt != seamNodes.end(); ++noSeIt ) { + const SMDS_MeshNode* nSeam = *noSeIt; + map< const SMDS_MeshNode*, gp_XY* >::iterator n_uv = uvMap.find( nSeam ); + if ( n_uv == uvMap.end() ) + continue; + // set the first UV + n_uv->second->SetCoord( iPar, uv1.Coord( iPar )); + // set the second UV + listUV.push_back( *n_uv->second ); + listUV.back().SetCoord( iPar, uv2.Coord( iPar )); + if ( uvMap2.empty() ) + uvMap2 = uvMap; // copy the uvMap contents + uvMap2[ nSeam ] = &listUV.back(); + + // collect movable nodes linked to ones on seam in nodesNearSeam + SMDS_ElemIteratorPtr eIt = nSeam->GetInverseElementIterator(SMDSAbs_Face); + while ( eIt->more() ) { + const SMDS_MeshElement* e = eIt->next(); + int nbUseMap1 = 0, nbUseMap2 = 0; + SMDS_ElemIteratorPtr nIt = e->nodesIterator(); + int nn = 0, nbn = e->NbNodes(); + if(e->IsQuadratic()) nbn = nbn/2; + while ( nn++ < nbn ) + { + const SMDS_MeshNode* n = + static_cast( nIt->next() ); + if (n == nSeam || + setMovableNodes.find( n ) == setMovableNodes.end() ) + continue; + // add only nodes being closer to uv2 than to uv1 + gp_Pnt pMid (0.5 * ( n->X() + nSeam->X() ), + 0.5 * ( n->Y() + nSeam->Y() ), + 0.5 * ( n->Z() + nSeam->Z() )); + gp_XY uv; + getClosestUV( projector, pMid, uv ); + if ( uv.Coord( iPar ) > uvMap[ n ]->Coord( iPar ) ) { + nodesNearSeam.insert( n ); + nbUseMap2++; + } + else + nbUseMap1++; + } + // for centroidalSmooth all element nodes must + // be on one side of a seam + if ( theSmoothMethod == CENTROIDAL && nbUseMap1 && nbUseMap2 ) { + SMDS_ElemIteratorPtr nIt = e->nodesIterator(); + nn = 0; + while ( nn++ < nbn ) { + const SMDS_MeshNode* n = + static_cast( nIt->next() ); + setMovableNodes.erase( n ); + } + } + } + } // loop on nodes on seam + } // loop on edge of a face + } // if ( !face.IsNull() ) + + if ( setMovableNodes.empty() ) { + MESSAGE( "Face id : " << *fId << " - NO SMOOTHING: no nodes to move!!!"); + continue; // goto next face + } + + // ------------- + // SMOOTHING // + // ------------- + + int it = -1; + double maxRatio = -1., maxDisplacement = -1.; + set::iterator nodeToMove; + for ( it = 0; it < theNbIterations; it++ ) { + maxDisplacement = 0.; + nodeToMove = setMovableNodes.begin(); + for ( ; nodeToMove != setMovableNodes.end(); nodeToMove++ ) { + const SMDS_MeshNode* node = (*nodeToMove); + gp_XYZ aPrevPos ( node->X(), node->Y(), node->Z() ); + + // smooth + bool map2 = ( nodesNearSeam.find( node ) != nodesNearSeam.end() ); + if ( theSmoothMethod == LAPLACIAN ) + laplacianSmooth( node, surface, map2 ? uvMap2 : uvMap ); + else + centroidalSmooth( node, surface, map2 ? uvMap2 : uvMap ); + + // node displacement + gp_XYZ aNewPos ( node->X(), node->Y(), node->Z() ); + Standard_Real aDispl = (aPrevPos - aNewPos).SquareModulus(); + if ( aDispl > maxDisplacement ) + maxDisplacement = aDispl; + } + // no node movement => exit + //if ( maxDisplacement < 1.e-16 ) { + if ( maxDisplacement < disttol ) { + MESSAGE("-- no node movement --"); + break; + } + + // check elements quality + maxRatio = 0; + list< const SMDS_MeshElement* >::iterator elemIt = elemsOnFace.begin(); + for ( ; elemIt != elemsOnFace.end(); ++elemIt ) { + const SMDS_MeshElement* elem = (*elemIt); + if ( !elem || elem->GetType() != SMDSAbs_Face ) + continue; + SMESH::Controls::TSequenceOfXYZ aPoints; + if ( aQualityFunc.GetPoints( elem, aPoints )) { + double aValue = aQualityFunc.GetValue( aPoints ); + if ( aValue > maxRatio ) + maxRatio = aValue; + } + } + if ( maxRatio <= theTgtAspectRatio ) { + MESSAGE("-- quality achived --"); + break; + } + if (it+1 == theNbIterations) { + MESSAGE("-- Iteration limit exceeded --"); + } + } // smoothing iterations + + MESSAGE(" Face id: " << *fId << + " Nb iterstions: " << it << + " Displacement: " << maxDisplacement << + " Aspect Ratio " << maxRatio); + + // --------------------------------------- + // new nodes positions are computed, + // record movement in DS and set new UV + // --------------------------------------- + nodeToMove = setMovableNodes.begin(); + for ( ; nodeToMove != setMovableNodes.end(); nodeToMove++ ) { + SMDS_MeshNode* node = const_cast< SMDS_MeshNode* > (*nodeToMove); + aMesh->MoveNode( node, node->X(), node->Y(), node->Z() ); + map< const SMDS_MeshNode*, gp_XY* >::iterator node_uv = uvMap.find( node ); + if ( node_uv != uvMap.end() ) { + gp_XY* uv = node_uv->second; + node->SetPosition + ( SMDS_PositionPtr( new SMDS_FacePosition( *fId, uv->X(), uv->Y() ))); + } + } + + // move medium nodes of quadratic elements + if ( isQuadratic ) + { + SMESH_MesherHelper helper( *GetMesh() ); + if ( !face.IsNull() ) + helper.SetSubShape( face ); + list< const SMDS_MeshElement* >::iterator elemIt = elemsOnFace.begin(); + for ( ; elemIt != elemsOnFace.end(); ++elemIt ) { + const SMDS_QuadraticFaceOfNodes* QF = + dynamic_cast (*elemIt); + if(QF) { + vector Ns; + Ns.reserve(QF->NbNodes()+1); + SMDS_NodeIteratorPtr anIter = QF->interlacedNodesIterator(); + while ( anIter->more() ) + Ns.push_back( anIter->next() ); + Ns.push_back( Ns[0] ); + double x, y, z; + for(int i=0; iNbNodes(); i=i+2) { + if ( !surface.IsNull() ) { + gp_XY uv1 = helper.GetNodeUV( face, Ns[i], Ns[i+2] ); + gp_XY uv2 = helper.GetNodeUV( face, Ns[i+2], Ns[i] ); + gp_XY uv = ( uv1 + uv2 ) / 2.; + gp_Pnt xyz = surface->Value( uv.X(), uv.Y() ); + x = xyz.X(); y = xyz.Y(); z = xyz.Z(); + } + else { + x = (Ns[i]->X() + Ns[i+2]->X())/2; + y = (Ns[i]->Y() + Ns[i+2]->Y())/2; + z = (Ns[i]->Z() + Ns[i+2]->Z())/2; + } + if( fabs( Ns[i+1]->X() - x ) > disttol || + fabs( Ns[i+1]->Y() - y ) > disttol || + fabs( Ns[i+1]->Z() - z ) > disttol ) { + // we have to move i+1 node + aMesh->MoveNode( Ns[i+1], x, y, z ); + } + } + } + } + } + + } // loop on face ids + +} + +//======================================================================= +//function : isReverse +//purpose : Return true if normal of prevNodes is not co-directied with +// gp_Vec(prevNodes[iNotSame],nextNodes[iNotSame]). +// iNotSame is where prevNodes and nextNodes are different +//======================================================================= + +static bool isReverse(vector prevNodes, + vector nextNodes, + const int nbNodes, + const int iNotSame) +{ + int iBeforeNotSame = ( iNotSame == 0 ? nbNodes - 1 : iNotSame - 1 ); + int iAfterNotSame = ( iNotSame + 1 == nbNodes ? 0 : iNotSame + 1 ); + + const SMDS_MeshNode* nB = prevNodes[ iBeforeNotSame ]; + const SMDS_MeshNode* nA = prevNodes[ iAfterNotSame ]; + const SMDS_MeshNode* nP = prevNodes[ iNotSame ]; + const SMDS_MeshNode* nN = nextNodes[ iNotSame ]; + + gp_Pnt pB ( nB->X(), nB->Y(), nB->Z() ); + gp_Pnt pA ( nA->X(), nA->Y(), nA->Z() ); + gp_Pnt pP ( nP->X(), nP->Y(), nP->Z() ); + gp_Pnt pN ( nN->X(), nN->Y(), nN->Z() ); + + gp_Vec vB ( pP, pB ), vA ( pP, pA ), vN ( pP, pN ); + + return (vA ^ vB) * vN < 0.0; +} + +//======================================================================= +/*! + * \brief Create elements by sweeping an element + * \param elem - element to sweep + * \param newNodesItVec - nodes generated from each node of the element + * \param newElems - generated elements + * \param nbSteps - number of sweeping steps + * \param srcElements - to append elem for each generated element + */ +//======================================================================= + +void SMESH_MeshEditor::sweepElement(const SMDS_MeshElement* elem, + const vector & newNodesItVec, + list& newElems, + const int nbSteps, + SMESH_SequenceOfElemPtr& srcElements) +{ + SMESHDS_Mesh* aMesh = GetMeshDS(); + + // Loop on elem nodes: + // find new nodes and detect same nodes indices + int nbNodes = elem->NbNodes(); + vector < list< const SMDS_MeshNode* >::const_iterator > itNN( nbNodes ); + vector prevNod( nbNodes ); + vector nextNod( nbNodes ); + vector midlNod( nbNodes ); + + int iNode, nbSame = 0, iNotSameNode = 0, iSameNode = 0; + vector sames(nbNodes); + vector issimple(nbNodes); + + for ( iNode = 0; iNode < nbNodes; iNode++ ) { + TNodeOfNodeListMapItr nnIt = newNodesItVec[ iNode ]; + const SMDS_MeshNode* node = nnIt->first; + const list< const SMDS_MeshNode* > & listNewNodes = nnIt->second; + if ( listNewNodes.empty() ) + return; + + issimple[iNode] = (listNewNodes.size()==nbSteps); + + itNN[ iNode ] = listNewNodes.begin(); + prevNod[ iNode ] = node; + nextNod[ iNode ] = listNewNodes.front(); +//cout<<"iNode="<GetID() ); + return; + } + +// if( elem->IsQuadratic() && nbSame>0 ) { +// MESSAGE( "Can not rotate quadratic element " << elem->GetID() ); +// return; +// } + + int iBeforeSame = 0, iAfterSame = 0, iOpposSame = 0; + if ( nbSame > 0 ) { + iBeforeSame = ( iSameNode == 0 ? nbNodes - 1 : iSameNode - 1 ); + iAfterSame = ( iSameNode + 1 == nbNodes ? 0 : iSameNode + 1 ); + iOpposSame = ( iSameNode - 2 < 0 ? iSameNode + 2 : iSameNode - 2 ); + } + +//if(nbNodes==8) +//cout<<" prevNod[0]="<< prevNod[0]<<" prevNod[1]="<< prevNod[1] +// <<" prevNod[2]="<< prevNod[2]<<" prevNod[3]="<< prevNod[4] +// <<" prevNod[4]="<< prevNod[4]<<" prevNod[5]="<< prevNod[5] +// <<" prevNod[6]="<< prevNod[6]<<" prevNod[7]="<< prevNod[7]< 2 && !isReverse( prevNod, nextNod, nbNodes, iNotSameNode )) { + //MESSAGE("Reversed elem " << elem ); + i0 = 2; + i2 = 0; + if ( nbSame > 0 ) + std::swap( iBeforeSame, iAfterSame ); + } + + // make new elements + for (int iStep = 0; iStep < nbSteps; iStep++ ) { + // get next nodes + for ( iNode = 0; iNode < nbNodes; iNode++ ) { + if(issimple[iNode]) { + nextNod[ iNode ] = *itNN[ iNode ]; + itNN[ iNode ]++; + } + else { + if( elem->GetType()==SMDSAbs_Node ) { + // we have to use two nodes + midlNod[ iNode ] = *itNN[ iNode ]; + itNN[ iNode ]++; + nextNod[ iNode ] = *itNN[ iNode ]; + itNN[ iNode ]++; + } + else if(!elem->IsQuadratic() || elem->IsMediumNode(prevNod[iNode]) ) { + // we have to use each second node + itNN[ iNode ]++; + nextNod[ iNode ] = *itNN[ iNode ]; + itNN[ iNode ]++; + } + else { + // we have to use two nodes + midlNod[ iNode ] = *itNN[ iNode ]; + itNN[ iNode ]++; + nextNod[ iNode ] = *itNN[ iNode ]; + itNN[ iNode ]++; + } + } + } + SMDS_MeshElement* aNewElem = 0; + if(!elem->IsPoly()) { + switch ( nbNodes ) { + case 0: + return; + case 1: { // NODE + if ( nbSame == 0 ) { + if(issimple[0]) + aNewElem = aMesh->AddEdge( prevNod[ 0 ], nextNod[ 0 ] ); + else + aNewElem = aMesh->AddEdge( prevNod[ 0 ], nextNod[ 0 ], midlNod[ 0 ] ); + } + break; + } + case 2: { // EDGE + if ( nbSame == 0 ) + aNewElem = aMesh->AddFace(prevNod[ 0 ], prevNod[ 1 ], + nextNod[ 1 ], nextNod[ 0 ] ); + else + aNewElem = aMesh->AddFace(prevNod[ 0 ], prevNod[ 1 ], + nextNod[ iNotSameNode ] ); + break; + } + + case 3: { // TRIANGLE or quadratic edge + if(elem->GetType() == SMDSAbs_Face) { // TRIANGLE + + if ( nbSame == 0 ) // --- pentahedron + aNewElem = aMesh->AddVolume (prevNod[ i0 ], prevNod[ 1 ], prevNod[ i2 ], + nextNod[ i0 ], nextNod[ 1 ], nextNod[ i2 ] ); + + else if ( nbSame == 1 ) // --- pyramid + aNewElem = aMesh->AddVolume (prevNod[ iBeforeSame ], prevNod[ iAfterSame ], + nextNod[ iAfterSame ], nextNod[ iBeforeSame ], + nextNod[ iSameNode ]); + + else // 2 same nodes: --- tetrahedron + aNewElem = aMesh->AddVolume (prevNod[ i0 ], prevNod[ 1 ], prevNod[ i2 ], + nextNod[ iNotSameNode ]); + } + else { // quadratic edge + if(nbSame==0) { // quadratic quadrangle + aNewElem = aMesh->AddFace(prevNod[0], nextNod[0], nextNod[1], prevNod[1], + midlNod[0], nextNod[2], midlNod[1], prevNod[2]); + } + else if(nbSame==1) { // quadratic triangle + if(sames[0]==2) + return; // medium node on axis + else if(sames[0]==0) { + aNewElem = aMesh->AddFace(prevNod[0], nextNod[1], prevNod[1], + nextNod[2], midlNod[1], prevNod[2]); + } + else { // sames[0]==1 + aNewElem = aMesh->AddFace(prevNod[0], nextNod[0], prevNod[1], + midlNod[0], nextNod[2], prevNod[2]); + } + } + else + return; + } + break; + } + case 4: { // QUADRANGLE + + if ( nbSame == 0 ) // --- hexahedron + aNewElem = aMesh->AddVolume (prevNod[ i0 ], prevNod[ 1 ], prevNod[ i2 ], prevNod[ 3 ], + nextNod[ i0 ], nextNod[ 1 ], nextNod[ i2 ], nextNod[ 3 ]); + + else if ( nbSame == 1 ) { // --- pyramid + pentahedron + aNewElem = aMesh->AddVolume (prevNod[ iBeforeSame ], prevNod[ iAfterSame ], + nextNod[ iAfterSame ], nextNod[ iBeforeSame ], + nextNod[ iSameNode ]); + newElems.push_back( aNewElem ); + aNewElem = aMesh->AddVolume (prevNod[ iAfterSame ], prevNod[ iOpposSame ], + prevNod[ iBeforeSame ], nextNod[ iAfterSame ], + nextNod[ iOpposSame ], nextNod[ iBeforeSame ] ); + } + else if ( nbSame == 2 ) { // pentahedron + if ( prevNod[ iBeforeSame ] == nextNod[ iBeforeSame ] ) + // iBeforeSame is same too + aNewElem = aMesh->AddVolume (prevNod[ iBeforeSame ], prevNod[ iOpposSame ], + nextNod[ iOpposSame ], prevNod[ iSameNode ], + prevNod[ iAfterSame ], nextNod[ iAfterSame ]); + else + // iAfterSame is same too + aNewElem = aMesh->AddVolume (prevNod[ iSameNode ], prevNod[ iBeforeSame ], + nextNod[ iBeforeSame ], prevNod[ iAfterSame ], + prevNod[ iOpposSame ], nextNod[ iOpposSame ]); + } + break; + } + case 6: { // quadratic triangle + // create pentahedron with 15 nodes + if(i0>0) { // reversed case + aNewElem = aMesh->AddVolume (prevNod[0], prevNod[2], prevNod[1], + nextNod[0], nextNod[2], nextNod[1], + prevNod[5], prevNod[4], prevNod[3], + nextNod[5], nextNod[4], nextNod[3], + midlNod[0], midlNod[2], midlNod[1]); + } + else { // not reversed case + aNewElem = aMesh->AddVolume (prevNod[0], prevNod[1], prevNod[2], + nextNod[0], nextNod[1], nextNod[2], + prevNod[3], prevNod[4], prevNod[5], + nextNod[3], nextNod[4], nextNod[5], + midlNod[0], midlNod[1], midlNod[2]); + } + break; + } + case 8: { // quadratic quadrangle + // create hexahedron with 20 nodes + if(i0>0) { // reversed case + aNewElem = aMesh->AddVolume (prevNod[0], prevNod[3], prevNod[2], prevNod[1], + nextNod[0], nextNod[3], nextNod[2], nextNod[1], + prevNod[7], prevNod[6], prevNod[5], prevNod[4], + nextNod[7], nextNod[6], nextNod[5], nextNod[4], + midlNod[0], midlNod[3], midlNod[2], midlNod[1]); + } + else { // not reversed case + aNewElem = aMesh->AddVolume (prevNod[0], prevNod[1], prevNod[2], prevNod[3], + nextNod[0], nextNod[1], nextNod[2], nextNod[3], + prevNod[4], prevNod[5], prevNod[6], prevNod[7], + nextNod[4], nextNod[5], nextNod[6], nextNod[7], + midlNod[0], midlNod[1], midlNod[2], midlNod[3]); + } + break; + } + default: { + // realized for extrusion only + //vector polyedre_nodes (nbNodes*2 + 4*nbNodes); + //vector quantities (nbNodes + 2); + + //quantities[0] = nbNodes; // bottom of prism + //for (int inode = 0; inode < nbNodes; inode++) { + // polyedre_nodes[inode] = prevNod[inode]; + //} + + //quantities[1] = nbNodes; // top of prism + //for (int inode = 0; inode < nbNodes; inode++) { + // polyedre_nodes[nbNodes + inode] = nextNod[inode]; + //} + + //for (int iface = 0; iface < nbNodes; iface++) { + // quantities[iface + 2] = 4; + // int inextface = (iface == nbNodes - 1) ? 0 : iface + 1; + // polyedre_nodes[2*nbNodes + 4*iface + 0] = prevNod[iface]; + // polyedre_nodes[2*nbNodes + 4*iface + 1] = prevNod[inextface]; + // polyedre_nodes[2*nbNodes + 4*iface + 2] = nextNod[inextface]; + // polyedre_nodes[2*nbNodes + 4*iface + 3] = nextNod[iface]; + //} + //aNewElem = aMesh->AddPolyhedralVolume (polyedre_nodes, quantities); + break; + } + } + } + + if(!aNewElem) { + // realized for extrusion only + vector polyedre_nodes (nbNodes*2 + 4*nbNodes); + vector quantities (nbNodes + 2); + + quantities[0] = nbNodes; // bottom of prism + for (int inode = 0; inode < nbNodes; inode++) { + polyedre_nodes[inode] = prevNod[inode]; + } + + quantities[1] = nbNodes; // top of prism + for (int inode = 0; inode < nbNodes; inode++) { + polyedre_nodes[nbNodes + inode] = nextNod[inode]; + } + + for (int iface = 0; iface < nbNodes; iface++) { + quantities[iface + 2] = 4; + int inextface = (iface == nbNodes - 1) ? 0 : iface + 1; + polyedre_nodes[2*nbNodes + 4*iface + 0] = prevNod[iface]; + polyedre_nodes[2*nbNodes + 4*iface + 1] = prevNod[inextface]; + polyedre_nodes[2*nbNodes + 4*iface + 2] = nextNod[inextface]; + polyedre_nodes[2*nbNodes + 4*iface + 3] = nextNod[iface]; + } + aNewElem = aMesh->AddPolyhedralVolume (polyedre_nodes, quantities); + } + + if ( aNewElem ) { + newElems.push_back( aNewElem ); + myLastCreatedElems.Append(aNewElem); + srcElements.Append( elem ); + } + + // set new prev nodes + for ( iNode = 0; iNode < nbNodes; iNode++ ) + prevNod[ iNode ] = nextNod[ iNode ]; + + } // for steps +} + +//======================================================================= +/*! + * \brief Create 1D and 2D elements around swept elements + * \param mapNewNodes - source nodes and ones generated from them + * \param newElemsMap - source elements and ones generated from them + * \param elemNewNodesMap - nodes generated from each node of each element + * \param elemSet - all swept elements + * \param nbSteps - number of sweeping steps + * \param srcElements - to append elem for each generated element + */ +//======================================================================= + +void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes, + TElemOfElemListMap & newElemsMap, + TElemOfVecOfNnlmiMap & elemNewNodesMap, + TIDSortedElemSet& elemSet, + const int nbSteps, + SMESH_SequenceOfElemPtr& srcElements) +{ + ASSERT( newElemsMap.size() == elemNewNodesMap.size() ); + SMESHDS_Mesh* aMesh = GetMeshDS(); + + // Find nodes belonging to only one initial element - sweep them to get edges. + + TNodeOfNodeListMapItr nList = mapNewNodes.begin(); + for ( ; nList != mapNewNodes.end(); nList++ ) { + const SMDS_MeshNode* node = + static_cast( nList->first ); + SMDS_ElemIteratorPtr eIt = node->GetInverseElementIterator(); + int nbInitElems = 0; + const SMDS_MeshElement* el = 0; + SMDSAbs_ElementType highType = SMDSAbs_Edge; // count most complex elements only + while ( eIt->more() && nbInitElems < 2 ) { + el = eIt->next(); + SMDSAbs_ElementType type = el->GetType(); + if ( type == SMDSAbs_Volume || type < highType ) continue; + if ( type > highType ) { + nbInitElems = 0; + highType = type; + } + if ( elemSet.find(el) != elemSet.end() ) + nbInitElems++; + } + if ( nbInitElems < 2 ) { + bool NotCreateEdge = el && el->IsQuadratic() && el->IsMediumNode(node); + if(!NotCreateEdge) { + vector newNodesItVec( 1, nList ); + list newEdges; + sweepElement( node, newNodesItVec, newEdges, nbSteps, srcElements ); + } + } + } + + // Make a ceiling for each element ie an equal element of last new nodes. + // Find free links of faces - make edges and sweep them into faces. + + TElemOfElemListMap::iterator itElem = newElemsMap.begin(); + TElemOfVecOfNnlmiMap::iterator itElemNodes = elemNewNodesMap.begin(); + for ( ; itElem != newElemsMap.end(); itElem++, itElemNodes++ ) { + const SMDS_MeshElement* elem = itElem->first; + vector& vecNewNodes = itElemNodes->second; + + if ( elem->GetType() == SMDSAbs_Edge ) { + // create a ceiling edge + if (!elem->IsQuadratic()) { + if ( !aMesh->FindEdge( vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back())) { + myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back())); + srcElements.Append( myLastCreatedElems.Last() ); + } + } + else { + if ( !aMesh->FindEdge( vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back(), + vecNewNodes[ 2 ]->second.back())) { + myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), + vecNewNodes[ 1 ]->second.back(), + vecNewNodes[ 2 ]->second.back())); + srcElements.Append( myLastCreatedElems.Last() ); + } + } + } + if ( elem->GetType() != SMDSAbs_Face ) + continue; + + if(itElem->second.size()==0) continue; + + bool hasFreeLinks = false; + + TIDSortedElemSet avoidSet; + avoidSet.insert( elem ); + + set aFaceLastNodes; + int iNode, nbNodes = vecNewNodes.size(); + if(!elem->IsQuadratic()) { + // loop on the face nodes + for ( iNode = 0; iNode < nbNodes; iNode++ ) { + aFaceLastNodes.insert( vecNewNodes[ iNode ]->second.back() ); + // look for free links of the face + int iNext = ( iNode + 1 == nbNodes ) ? 0 : iNode + 1; + const SMDS_MeshNode* n1 = vecNewNodes[ iNode ]->first; + const SMDS_MeshNode* n2 = vecNewNodes[ iNext ]->first; + // check if a link is free + if ( ! SMESH_MeshEditor::FindFaceInSet ( n1, n2, elemSet, avoidSet )) { + hasFreeLinks = true; + // make an edge and a ceiling for a new edge + if ( !aMesh->FindEdge( n1, n2 )) { + myLastCreatedElems.Append(aMesh->AddEdge( n1, n2 )); // free link edge + srcElements.Append( myLastCreatedElems.Last() ); + } + n1 = vecNewNodes[ iNode ]->second.back(); + n2 = vecNewNodes[ iNext ]->second.back(); + if ( !aMesh->FindEdge( n1, n2 )) { + myLastCreatedElems.Append(aMesh->AddEdge( n1, n2 )); // ceiling edge + srcElements.Append( myLastCreatedElems.Last() ); + } + } + } + } + else { // elem is quadratic face + int nbn = nbNodes/2; + for ( iNode = 0; iNode < nbn; iNode++ ) { + aFaceLastNodes.insert( vecNewNodes[ iNode ]->second.back() ); + int iNext = ( iNode + 1 == nbn ) ? 0 : iNode + 1; + const SMDS_MeshNode* n1 = vecNewNodes[ iNode ]->first; + const SMDS_MeshNode* n2 = vecNewNodes[ iNext ]->first; + // check if a link is free + if ( ! SMESH_MeshEditor::FindFaceInSet ( n1, n2, elemSet, avoidSet )) { + hasFreeLinks = true; + // make an edge and a ceiling for a new edge + // find medium node + const SMDS_MeshNode* n3 = vecNewNodes[ iNode+nbn ]->first; + if ( !aMesh->FindEdge( n1, n2, n3 )) { + myLastCreatedElems.Append(aMesh->AddEdge( n1, n2, n3 )); // free link edge + srcElements.Append( myLastCreatedElems.Last() ); + } + n1 = vecNewNodes[ iNode ]->second.back(); + n2 = vecNewNodes[ iNext ]->second.back(); + n3 = vecNewNodes[ iNode+nbn ]->second.back(); + if ( !aMesh->FindEdge( n1, n2, n3 )) { + myLastCreatedElems.Append(aMesh->AddEdge( n1, n2, n3 )); // ceiling edge + srcElements.Append( myLastCreatedElems.Last() ); + } + } + } + for ( iNode = nbn; iNode < 2*nbn; iNode++ ) { + aFaceLastNodes.insert( vecNewNodes[ iNode ]->second.back() ); + } + } + + // sweep free links into faces + + if ( hasFreeLinks ) { + list & newVolumes = itElem->second; + int iVol, volNb, nbVolumesByStep = newVolumes.size() / nbSteps; + + set initNodeSet, topNodeSet, faceNodeSet; + for ( iNode = 0; iNode < nbNodes; iNode++ ) { + initNodeSet.insert( vecNewNodes[ iNode ]->first ); + topNodeSet .insert( vecNewNodes[ iNode ]->second.back() ); + } + for ( volNb = 0; volNb < nbVolumesByStep; volNb++ ) { + list::iterator v = newVolumes.begin(); + iVol = 0; + while ( iVol++ < volNb ) v++; + // find indices of free faces of a volume and their source edges + list< int > freeInd; + list< const SMDS_MeshElement* > srcEdges; // source edges of free faces + SMDS_VolumeTool vTool( *v ); + int iF, nbF = vTool.NbFaces(); + for ( iF = 0; iF < nbF; iF ++ ) { + if (vTool.IsFreeFace( iF ) && + vTool.GetFaceNodes( iF, faceNodeSet ) && + initNodeSet != faceNodeSet) // except an initial face + { + if ( nbSteps == 1 && faceNodeSet == topNodeSet ) + continue; + freeInd.push_back( iF ); + // find source edge of a free face iF + vector commonNodes; // shared by the initial and free faces + commonNodes.resize( initNodeSet.size(), NULL ); // avoid spoiling memory + std::set_intersection( faceNodeSet.begin(), faceNodeSet.end(), + initNodeSet.begin(), initNodeSet.end(), + commonNodes.begin()); + if ( (*v)->IsQuadratic() ) + srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1],commonNodes[2])); + else + srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1])); +#ifdef _DEBUG_ + if ( !srcEdges.back() ) + { + cout << "SMESH_MeshEditor::makeWalls(), no source edge found for a free face #" + << iF << " of volume #" << vTool.ID() << endl; + } +#endif + } + } + if ( freeInd.empty() ) + continue; + + // create faces for all steps; + // if such a face has been already created by sweep of edge, + // assure that its orientation is OK + for ( int iStep = 0; iStep < nbSteps; iStep++ ) { + vTool.Set( *v ); + vTool.SetExternalNormal(); + list< int >::iterator ind = freeInd.begin(); + list< const SMDS_MeshElement* >::iterator srcEdge = srcEdges.begin(); + for ( ; ind != freeInd.end(); ++ind, ++srcEdge ) // loop on free faces + { + const SMDS_MeshNode** nodes = vTool.GetFaceNodes( *ind ); + int nbn = vTool.NbFaceNodes( *ind ); + switch ( nbn ) { + case 3: { ///// triangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ]); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] )); + else if ( nodes[ 1 ] != f->GetNodeWrap( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + break; + } + case 4: { ///// quadrangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ]); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ] )); + else if ( nodes[ 1 ] != f->GetNodeWrap( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + break; + } + default: + if( (*v)->IsQuadratic() ) { + if(nbn==6) { /////// quadratic triangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5] ); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5])); + else if ( nodes[ 2 ] != f->GetNodeWrap( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + } + else { /////// quadratic quadrangle + const SMDS_MeshFace * f = aMesh->FindFace( nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7] ); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7])); + else if ( nodes[ 2 ] != f->GetNodeWrap( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + } + } + else { //////// polygon + vector polygon_nodes ( nodes, &nodes[nbn] ); + const SMDS_MeshFace * f = aMesh->FindFace( polygon_nodes ); + if ( !f ) + myLastCreatedElems.Append(aMesh->AddPolygonalFace(polygon_nodes)); + else if ( nodes[ 1 ] != f->GetNodeWrap( f->GetNodeIndex( nodes[ 0 ] ) + 1 )) + aMesh->ChangeElementNodes( f, nodes, nbn ); + } + } + while ( srcElements.Length() < myLastCreatedElems.Length() ) + srcElements.Append( *srcEdge ); + + } // loop on free faces + + // go to the next volume + iVol = 0; + while ( iVol++ < nbVolumesByStep ) v++; + } + } + } // sweep free links into faces + + // Make a ceiling face with a normal external to a volume + + SMDS_VolumeTool lastVol( itElem->second.back() ); + + int iF = lastVol.GetFaceIndex( aFaceLastNodes ); + if ( iF >= 0 ) { + lastVol.SetExternalNormal(); + const SMDS_MeshNode** nodes = lastVol.GetFaceNodes( iF ); + int nbn = lastVol.NbFaceNodes( iF ); + switch ( nbn ) { + case 3: + if (!hasFreeLinks || + !aMesh->FindFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ])) + myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] )); + break; + case 4: + if (!hasFreeLinks || + !aMesh->FindFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ])) + myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ], nodes[ 3 ] )); + break; + default: + if(itElem->second.back()->IsQuadratic()) { + if(nbn==6) { + if (!hasFreeLinks || + !aMesh->FindFace(nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5]) ) { + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], + nodes[1], nodes[3], nodes[5])); + } + } + else { // nbn==8 + if (!hasFreeLinks || + !aMesh->FindFace(nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7]) ) + myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[2], nodes[4], nodes[6], + nodes[1], nodes[3], nodes[5], nodes[7])); + } + } + else { + vector polygon_nodes ( nodes, &nodes[nbn] ); + if (!hasFreeLinks || !aMesh->FindFace(polygon_nodes)) + myLastCreatedElems.Append(aMesh->AddPolygonalFace(polygon_nodes)); + } + } // switch + + while ( srcElements.Length() < myLastCreatedElems.Length() ) + srcElements.Append( myLastCreatedElems.Last() ); + } + } // loop on swept elements +} + +//======================================================================= +//function : RotationSweep +//purpose : +//======================================================================= + +SMESH_MeshEditor::PGroupIDs +SMESH_MeshEditor::RotationSweep(TIDSortedElemSet & theElems, + const gp_Ax1& theAxis, + const double theAngle, + const int theNbSteps, + const double theTol, + const bool theMakeGroups, + const bool theMakeWalls) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + // source elements for each generated one + SMESH_SequenceOfElemPtr srcElems, srcNodes; + + MESSAGE( "RotationSweep()"); + gp_Trsf aTrsf; + aTrsf.SetRotation( theAxis, theAngle ); + gp_Trsf aTrsf2; + aTrsf2.SetRotation( theAxis, theAngle/2. ); + + gp_Lin aLine( theAxis ); + double aSqTol = theTol * theTol; + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + TNodeOfNodeListMap mapNewNodes; + TElemOfVecOfNnlmiMap mapElemNewNodes; + TElemOfElemListMap newElemsMap; + + // loop on theElems + TIDSortedElemSet::iterator itElem; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + const SMDS_MeshElement* elem = *itElem; + if ( !elem || elem->GetType() == SMDSAbs_Volume ) + continue; + vector & newNodesItVec = mapElemNewNodes[ elem ]; + newNodesItVec.reserve( elem->NbNodes() ); + + // loop on elem nodes + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) + { + // check if a node has been already sweeped + const SMDS_MeshNode* node = cast2Node( itN->next() ); + TNodeOfNodeListMapItr nIt = mapNewNodes.find( node ); + if ( nIt == mapNewNodes.end() ) { + nIt = mapNewNodes.insert( make_pair( node, list() )).first; + list& listNewNodes = nIt->second; + + // make new nodes + gp_XYZ aXYZ( node->X(), node->Y(), node->Z() ); + double coord[3]; + aXYZ.Coord( coord[0], coord[1], coord[2] ); + bool isOnAxis = ( aLine.SquareDistance( aXYZ ) <= aSqTol ); + const SMDS_MeshNode * newNode = node; + for ( int i = 0; i < theNbSteps; i++ ) { + if ( !isOnAxis ) { + if( elem->IsQuadratic() && !elem->IsMediumNode(node) ) { + // create two nodes + aTrsf2.Transforms( coord[0], coord[1], coord[2] ); + //aTrsf.Transforms( coord[0], coord[1], coord[2] ); + newNode = aMesh->AddNode( coord[0], coord[1], coord[2] ); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + aTrsf2.Transforms( coord[0], coord[1], coord[2] ); + //aTrsf.Transforms( coord[0], coord[1], coord[2] ); + } + else { + aTrsf.Transforms( coord[0], coord[1], coord[2] ); + } + newNode = aMesh->AddNode( coord[0], coord[1], coord[2] ); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + } + listNewNodes.push_back( newNode ); + } + } + else { + // if current elem is quadratic and current node is not medium + // we have to check - may be it is needed to insert additional nodes + if( elem->IsQuadratic() && !elem->IsMediumNode(node) ) { + list< const SMDS_MeshNode* > & listNewNodes = nIt->second; + if(listNewNodes.size()==theNbSteps) { + listNewNodes.clear(); + // make new nodes + gp_XYZ aXYZ( node->X(), node->Y(), node->Z() ); + double coord[3]; + aXYZ.Coord( coord[0], coord[1], coord[2] ); + const SMDS_MeshNode * newNode = node; + for(int i = 0; iAddNode( coord[0], coord[1], coord[2] ); + myLastCreatedNodes.Append(newNode); + listNewNodes.push_back( newNode ); + srcNodes.Append( node ); + aTrsf2.Transforms( coord[0], coord[1], coord[2] ); + newNode = aMesh->AddNode( coord[0], coord[1], coord[2] ); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + } + } + } + } + newNodesItVec.push_back( nIt ); + } + // make new elements + sweepElement( elem, newNodesItVec, newElemsMap[elem], theNbSteps, srcElems ); + } + + if ( theMakeWalls ) + makeWalls( mapNewNodes, newElemsMap, mapElemNewNodes, theElems, theNbSteps, srcElems ); + + PGroupIDs newGroupIDs; + if ( theMakeGroups ) + newGroupIDs = generateGroups( srcNodes, srcElems, "rotated"); + + return newGroupIDs; +} + + +//======================================================================= +//function : CreateNode +//purpose : +//======================================================================= +const SMDS_MeshNode* SMESH_MeshEditor::CreateNode(const double x, + const double y, + const double z, + const double tolnode, + SMESH_SequenceOfNode& aNodes) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + gp_Pnt P1(x,y,z); + SMESHDS_Mesh * aMesh = myMesh->GetMeshDS(); + + // try to search in sequence of existing nodes + // if aNodes.Length()>0 we 'nave to use given sequence + // else - use all nodes of mesh + if(aNodes.Length()>0) { + int i; + for(i=1; i<=aNodes.Length(); i++) { + gp_Pnt P2(aNodes.Value(i)->X(),aNodes.Value(i)->Y(),aNodes.Value(i)->Z()); + if(P1.Distance(P2)nodesIterator(); + while(itn->more()) { + const SMDS_MeshNode* aN = static_cast (itn->next()); + gp_Pnt P2(aN->X(),aN->Y(),aN->Z()); + if(P1.Distance(P2)>>>>>> c5d257d... SMESH: Make it compatibel to VTK 6.0 + } +#endif + + // create new node and return it + const SMDS_MeshNode* NewNode = aMesh->AddNode(x,y,z); + myLastCreatedNodes.Append(NewNode); + return NewNode; +} + + +//======================================================================= +//function : ExtrusionSweep +//purpose : +//======================================================================= + +SMESH_MeshEditor::PGroupIDs +SMESH_MeshEditor::ExtrusionSweep (TIDSortedElemSet & theElems, + const gp_Vec& theStep, + const int theNbSteps, + TElemOfElemListMap& newElemsMap, + const bool theMakeGroups, + const int theFlags, + const double theTolerance) +{ + ExtrusParam aParams; + aParams.myDir = gp_Dir(theStep); + aParams.myNodes.Clear(); + aParams.mySteps = new TColStd_HSequenceOfReal; + int i; + for(i=1; i<=theNbSteps; i++) + aParams.mySteps->Append(theStep.Magnitude()); + + return + ExtrusionSweep(theElems,aParams,newElemsMap,theMakeGroups,theFlags,theTolerance); +} + + +//======================================================================= +//function : ExtrusionSweep +//purpose : +//======================================================================= + +SMESH_MeshEditor::PGroupIDs +SMESH_MeshEditor::ExtrusionSweep (TIDSortedElemSet & theElems, + ExtrusParam& theParams, + TElemOfElemListMap& newElemsMap, + const bool theMakeGroups, + const int theFlags, + const double theTolerance) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + // source elements for each generated one + SMESH_SequenceOfElemPtr srcElems, srcNodes; + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + int nbsteps = theParams.mySteps->Length(); + + TNodeOfNodeListMap mapNewNodes; + //TNodeOfNodeVecMap mapNewNodes; + TElemOfVecOfNnlmiMap mapElemNewNodes; + //TElemOfVecOfMapNodesMap mapElemNewNodes; + + // loop on theElems + TIDSortedElemSet::iterator itElem; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + // check element type + const SMDS_MeshElement* elem = *itElem; + if ( !elem || elem->GetType() == SMDSAbs_Volume ) + continue; + + vector & newNodesItVec = mapElemNewNodes[ elem ]; + //vector & newNodesItVec = mapElemNewNodes[ elem ]; + newNodesItVec.reserve( elem->NbNodes() ); + + // loop on elem nodes + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) + { + // check if a node has been already sweeped + const SMDS_MeshNode* node = cast2Node( itN->next() ); + TNodeOfNodeListMap::iterator nIt = mapNewNodes.find( node ); + //TNodeOfNodeVecMap::iterator nIt = mapNewNodes.find( node ); + if ( nIt == mapNewNodes.end() ) { + nIt = mapNewNodes.insert( make_pair( node, list() )).first; + //nIt = mapNewNodes.insert( make_pair( node, vector() )).first; + list& listNewNodes = nIt->second; + //vector& vecNewNodes = nIt->second; + //vecNewNodes.reserve(nbsteps); + + // make new nodes + double coord[] = { node->X(), node->Y(), node->Z() }; + //int nbsteps = theParams.mySteps->Length(); + for ( int i = 0; i < nbsteps; i++ ) { + if( elem->IsQuadratic() && !elem->IsMediumNode(node) ) { + // create additional node + double x = coord[0] + theParams.myDir.X()*theParams.mySteps->Value(i+1)/2.; + double y = coord[1] + theParams.myDir.Y()*theParams.mySteps->Value(i+1)/2.; + double z = coord[2] + theParams.myDir.Z()*theParams.mySteps->Value(i+1)/2.; + if( theFlags & EXTRUSION_FLAG_SEW ) { + const SMDS_MeshNode * newNode = CreateNode(x, y, z, + theTolerance, theParams.myNodes); + listNewNodes.push_back( newNode ); + } + else { + const SMDS_MeshNode * newNode = aMesh->AddNode(x, y, z); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + } + } + //aTrsf.Transforms( coord[0], coord[1], coord[2] ); + coord[0] = coord[0] + theParams.myDir.X()*theParams.mySteps->Value(i+1); + coord[1] = coord[1] + theParams.myDir.Y()*theParams.mySteps->Value(i+1); + coord[2] = coord[2] + theParams.myDir.Z()*theParams.mySteps->Value(i+1); + if( theFlags & EXTRUSION_FLAG_SEW ) { + const SMDS_MeshNode * newNode = CreateNode(coord[0], coord[1], coord[2], + theTolerance, theParams.myNodes); + listNewNodes.push_back( newNode ); + //vecNewNodes[i]=newNode; + } + else { + const SMDS_MeshNode * newNode = aMesh->AddNode( coord[0], coord[1], coord[2] ); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + //vecNewNodes[i]=newNode; + } + } + } + else { + // if current elem is quadratic and current node is not medium + // we have to check - may be it is needed to insert additional nodes + if( elem->IsQuadratic() && !elem->IsMediumNode(node) ) { + list< const SMDS_MeshNode* > & listNewNodes = nIt->second; + if(listNewNodes.size()==nbsteps) { + listNewNodes.clear(); + double coord[] = { node->X(), node->Y(), node->Z() }; + for ( int i = 0; i < nbsteps; i++ ) { + double x = coord[0] + theParams.myDir.X()*theParams.mySteps->Value(i+1); + double y = coord[1] + theParams.myDir.Y()*theParams.mySteps->Value(i+1); + double z = coord[2] + theParams.myDir.Z()*theParams.mySteps->Value(i+1); + if( theFlags & EXTRUSION_FLAG_SEW ) { + const SMDS_MeshNode * newNode = CreateNode(x, y, z, + theTolerance, theParams.myNodes); + listNewNodes.push_back( newNode ); + } + else { + const SMDS_MeshNode * newNode = aMesh->AddNode(x, y, z); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + } + coord[0] = coord[0] + theParams.myDir.X()*theParams.mySteps->Value(i+1); + coord[1] = coord[1] + theParams.myDir.Y()*theParams.mySteps->Value(i+1); + coord[2] = coord[2] + theParams.myDir.Z()*theParams.mySteps->Value(i+1); + if( theFlags & EXTRUSION_FLAG_SEW ) { + const SMDS_MeshNode * newNode = CreateNode(coord[0], coord[1], coord[2], + theTolerance, theParams.myNodes); + listNewNodes.push_back( newNode ); + } + else { + const SMDS_MeshNode * newNode = aMesh->AddNode( coord[0], coord[1], coord[2] ); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + } + } + } + } + } + newNodesItVec.push_back( nIt ); + } + // make new elements + sweepElement( elem, newNodesItVec, newElemsMap[elem], nbsteps, srcElems ); + } + + if( theFlags & EXTRUSION_FLAG_BOUNDARY ) { + makeWalls( mapNewNodes, newElemsMap, mapElemNewNodes, theElems, nbsteps, srcElems ); + } + PGroupIDs newGroupIDs; + if ( theMakeGroups ) + newGroupIDs = generateGroups( srcNodes, srcElems, "extruded"); + + return newGroupIDs; +} + + +//======================================================================= +//class : SMESH_MeshEditor_PathPoint +//purpose : auxiliary class +//======================================================================= +class SMESH_MeshEditor_PathPoint { +public: + SMESH_MeshEditor_PathPoint() { + myPnt.SetCoord(99., 99., 99.); + myTgt.SetCoord(1.,0.,0.); + myAngle=0.; + myPrm=0.; + } + void SetPnt(const gp_Pnt& aP3D){ + myPnt=aP3D; + } + void SetTangent(const gp_Dir& aTgt){ + myTgt=aTgt; + } + void SetAngle(const double& aBeta){ + myAngle=aBeta; + } + void SetParameter(const double& aPrm){ + myPrm=aPrm; + } + const gp_Pnt& Pnt()const{ + return myPnt; + } + const gp_Dir& Tangent()const{ + return myTgt; + } + double Angle()const{ + return myAngle; + } + double Parameter()const{ + return myPrm; + } + +protected: + gp_Pnt myPnt; + gp_Dir myTgt; + double myAngle; + double myPrm; +}; + +//======================================================================= +//function : ExtrusionAlongTrack +//purpose : +//======================================================================= +SMESH_MeshEditor::Extrusion_Error + SMESH_MeshEditor::ExtrusionAlongTrack (TIDSortedElemSet & theElements, + SMESH_subMesh* theTrack, + const SMDS_MeshNode* theN1, + const bool theHasAngles, + list& theAngles, + const bool theHasRefPoint, + const gp_Pnt& theRefPoint, + const bool theMakeGroups) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + // source elements for each generated one + SMESH_SequenceOfElemPtr srcElems, srcNodes; + + int j, aNbTP, aNbE, aNb; + double aT1, aT2, aT, aAngle, aX, aY, aZ; + std::list aPrms; + std::list::iterator aItD; + TIDSortedElemSet::iterator itElem; + + Standard_Real aTx1, aTx2, aL2, aTolVec, aTolVec2; + gp_Pnt aP3D, aV0; + gp_Vec aVec; + gp_XYZ aGC; + Handle(Geom_Curve) aC3D; + TopoDS_Edge aTrackEdge; + TopoDS_Vertex aV1, aV2; + + SMDS_ElemIteratorPtr aItE; + SMDS_NodeIteratorPtr aItN; + SMDSAbs_ElementType aTypeE; + + TNodeOfNodeListMap mapNewNodes; + TElemOfVecOfNnlmiMap mapElemNewNodes; + TElemOfElemListMap newElemsMap; + + aTolVec=1.e-7; + aTolVec2=aTolVec*aTolVec; + + // 1. Check data + aNbE = theElements.size(); + // nothing to do + if ( !aNbE ) + return EXTR_NO_ELEMENTS; + + // 1.1 Track Pattern + ASSERT( theTrack ); + + SMESHDS_SubMesh* pSubMeshDS=theTrack->GetSubMeshDS(); + + aItE = pSubMeshDS->GetElements(); + while ( aItE->more() ) { + const SMDS_MeshElement* pE = aItE->next(); + aTypeE = pE->GetType(); + // Pattern must contain links only + if ( aTypeE != SMDSAbs_Edge ) + return EXTR_PATH_NOT_EDGE; + } + + const TopoDS_Shape& aS = theTrack->GetSubShape(); + // Sub shape for the Pattern must be an Edge + if ( aS.ShapeType() != TopAbs_EDGE ) + return EXTR_BAD_PATH_SHAPE; + + aTrackEdge = TopoDS::Edge( aS ); + // the Edge must not be degenerated + if ( BRep_Tool::Degenerated( aTrackEdge ) ) + return EXTR_BAD_PATH_SHAPE; + + TopExp::Vertices( aTrackEdge, aV1, aV2 ); + aT1=BRep_Tool::Parameter( aV1, aTrackEdge ); + aT2=BRep_Tool::Parameter( aV2, aTrackEdge ); + + aItN = theTrack->GetFather()->GetSubMesh( aV1 )->GetSubMeshDS()->GetNodes(); + const SMDS_MeshNode* aN1 = aItN->next(); + + aItN = theTrack->GetFather()->GetSubMesh( aV2 )->GetSubMeshDS()->GetNodes(); + const SMDS_MeshNode* aN2 = aItN->next(); + + // starting node must be aN1 or aN2 + if ( !( aN1 == theN1 || aN2 == theN1 ) ) + return EXTR_BAD_STARTING_NODE; + + aNbTP = pSubMeshDS->NbNodes() + 2; + + // 1.2. Angles + vector aAngles( aNbTP ); + + for ( j=0; j < aNbTP; ++j ) { + aAngles[j] = 0.; + } + + if ( theHasAngles ) { + aItD = theAngles.begin(); + for ( j=1; (aItD != theAngles.end()) && (jGetNodes(); + while ( aItN->more() ) { + const SMDS_MeshNode* pNode = aItN->next(); + const SMDS_EdgePosition* pEPos = + static_cast( pNode->GetPosition().get() ); + aT = pEPos->GetUParameter(); + aPrms.push_back( aT ); + } + + // sort parameters + aPrms.sort(); + if ( aN1 == theN1 ) { + if ( aT1 > aT2 ) { + aPrms.reverse(); + } + } + else { + if ( aT2 > aT1 ) { + aPrms.reverse(); + } + } + + // 3. Path Points + SMESH_MeshEditor_PathPoint aPP; + vector aPPs( aNbTP ); + // + aC3D = BRep_Tool::Curve( aTrackEdge, aTx1, aTx2 ); + // + aItD = aPrms.begin(); + for ( j=0; aItD != aPrms.end(); ++aItD, ++j ) { + aT = *aItD; + aC3D->D1( aT, aP3D, aVec ); + aL2 = aVec.SquareMagnitude(); + if ( aL2 < aTolVec2 ) + return EXTR_CANT_GET_TANGENT; + + gp_Dir aTgt( aVec ); + aAngle = aAngles[j]; + + aPP.SetPnt( aP3D ); + aPP.SetTangent( aTgt ); + aPP.SetAngle( aAngle ); + aPP.SetParameter( aT ); + aPPs[j]=aPP; + } + + // 3. Center of rotation aV0 + aV0 = theRefPoint; + if ( !theHasRefPoint ) { + aNb = 0; + aGC.SetCoord( 0.,0.,0. ); + + itElem = theElements.begin(); + for ( ; itElem != theElements.end(); itElem++ ) { + const SMDS_MeshElement* elem = *itElem; + + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) { + const SMDS_MeshNode* node = static_cast( itN->next() ); + aX = node->X(); + aY = node->Y(); + aZ = node->Z(); + + if ( mapNewNodes.find( node ) == mapNewNodes.end() ) { + list aLNx; + mapNewNodes[node] = aLNx; + // + gp_XYZ aXYZ( aX, aY, aZ ); + aGC += aXYZ; + ++aNb; + } + } + } + aGC /= aNb; + aV0.SetXYZ( aGC ); + } // if (!theHasRefPoint) { + mapNewNodes.clear(); + + // 4. Processing the elements + SMESHDS_Mesh* aMesh = GetMeshDS(); + + for ( itElem = theElements.begin(); itElem != theElements.end(); itElem++ ) { + // check element type + const SMDS_MeshElement* elem = *itElem; + aTypeE = elem->GetType(); + if ( !elem || ( aTypeE != SMDSAbs_Face && aTypeE != SMDSAbs_Edge ) ) + continue; + + vector & newNodesItVec = mapElemNewNodes[ elem ]; + newNodesItVec.reserve( elem->NbNodes() ); + + // loop on elem nodes + int nodeIndex = -1; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) + { + ++nodeIndex; + // check if a node has been already processed + const SMDS_MeshNode* node = + static_cast( itN->next() ); + TNodeOfNodeListMap::iterator nIt = mapNewNodes.find( node ); + if ( nIt == mapNewNodes.end() ) { + nIt = mapNewNodes.insert( make_pair( node, list() )).first; + list& listNewNodes = nIt->second; + + // make new nodes + aX = node->X(); aY = node->Y(); aZ = node->Z(); + + Standard_Real aAngle1x, aAngleT1T0, aTolAng; + gp_Pnt aP0x, aP1x, aPN0, aPN1, aV0x, aV1x; + gp_Ax1 anAx1, anAxT1T0; + gp_Dir aDT1x, aDT0x, aDT1T0; + + aTolAng=1.e-4; + + aV0x = aV0; + aPN0.SetCoord(aX, aY, aZ); + + const SMESH_MeshEditor_PathPoint& aPP0 = aPPs[0]; + aP0x = aPP0.Pnt(); + aDT0x= aPP0.Tangent(); + + for ( j = 1; j < aNbTP; ++j ) { + const SMESH_MeshEditor_PathPoint& aPP1 = aPPs[j]; + aP1x = aPP1.Pnt(); + aDT1x = aPP1.Tangent(); + aAngle1x = aPP1.Angle(); + + gp_Trsf aTrsf, aTrsfRot, aTrsfRotT1T0; + // Translation + gp_Vec aV01x( aP0x, aP1x ); + aTrsf.SetTranslation( aV01x ); + + // traslated point + aV1x = aV0x.Transformed( aTrsf ); + aPN1 = aPN0.Transformed( aTrsf ); + + // rotation 1 [ T1,T0 ] + aAngleT1T0=-aDT1x.Angle( aDT0x ); + if (fabs(aAngleT1T0) > aTolAng) { + aDT1T0=aDT1x^aDT0x; + anAxT1T0.SetLocation( aV1x ); + anAxT1T0.SetDirection( aDT1T0 ); + aTrsfRotT1T0.SetRotation( anAxT1T0, aAngleT1T0 ); + + aPN1 = aPN1.Transformed( aTrsfRotT1T0 ); + } + + // rotation 2 + if ( theHasAngles ) { + anAx1.SetLocation( aV1x ); + anAx1.SetDirection( aDT1x ); + aTrsfRot.SetRotation( anAx1, aAngle1x ); + + aPN1 = aPN1.Transformed( aTrsfRot ); + } + + // make new node + if( elem->IsQuadratic() && !elem->IsMediumNode(node) ) { + // create additional node + double x = ( aPN1.X() + aPN0.X() )/2.; + double y = ( aPN1.Y() + aPN0.Y() )/2.; + double z = ( aPN1.Z() + aPN0.Z() )/2.; + const SMDS_MeshNode* newNode = aMesh->AddNode(x,y,z); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + } + aX = aPN1.X(); + aY = aPN1.Y(); + aZ = aPN1.Z(); + const SMDS_MeshNode* newNode = aMesh->AddNode( aX, aY, aZ ); + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + listNewNodes.push_back( newNode ); + + aPN0 = aPN1; + aP0x = aP1x; + aV0x = aV1x; + aDT0x = aDT1x; + } + } + + else { + // if current elem is quadratic and current node is not medium + // we have to check - may be it is needed to insert additional nodes + if( elem->IsQuadratic() && !elem->IsMediumNode(node) ) { + list< const SMDS_MeshNode* > & listNewNodes = nIt->second; + if(listNewNodes.size()==aNbTP-1) { + vector aNodes(2*(aNbTP-1)); + gp_XYZ P(node->X(), node->Y(), node->Z()); + list< const SMDS_MeshNode* >::iterator it = listNewNodes.begin(); + int i; + for(i=0; iX() + P.X() )/2.; + double y = ( N->Y() + P.Y() )/2.; + double z = ( N->Z() + P.Z() )/2.; + const SMDS_MeshNode* newN = aMesh->AddNode(x,y,z); + srcNodes.Append( node ); + myLastCreatedNodes.Append(newN); + aNodes[2*i] = newN; + aNodes[2*i+1] = N; + P = gp_XYZ(N->X(),N->Y(),N->Z()); + } + listNewNodes.clear(); + for(i=0; i<2*(aNbTP-1); i++) { + listNewNodes.push_back(aNodes[i]); + } + } + } + } + + newNodesItVec.push_back( nIt ); + } + // make new elements + //sweepElement( aMesh, elem, newNodesItVec, newElemsMap[elem], + // newNodesItVec[0]->second.size(), myLastCreatedElems ); + sweepElement( elem, newNodesItVec, newElemsMap[elem], aNbTP-1, srcElems ); + } + + makeWalls( mapNewNodes, newElemsMap, mapElemNewNodes, theElements, aNbTP-1, srcElems ); + + if ( theMakeGroups ) + generateGroups( srcNodes, srcElems, "extruded"); + + return EXTR_OK; +} + +//======================================================================= +//function : Transform +//purpose : +//======================================================================= + +SMESH_MeshEditor::PGroupIDs +SMESH_MeshEditor::Transform (TIDSortedElemSet & theElems, + const gp_Trsf& theTrsf, + const bool theCopy, + const bool theMakeGroups, + SMESH_Mesh* theTargetMesh) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + bool needReverse = false; + string groupPostfix; + switch ( theTrsf.Form() ) { + case gp_PntMirror: + case gp_Ax1Mirror: + case gp_Ax2Mirror: + needReverse = true; + groupPostfix = "mirrored"; + break; + case gp_Rotation: + groupPostfix = "rotated"; + break; + case gp_Translation: + groupPostfix = "translated"; + break; + case gp_Scale: + groupPostfix = "scaled"; + break; + default: + needReverse = false; + groupPostfix = "transformed"; + } + + SMESH_MeshEditor targetMeshEditor( theTargetMesh ); + SMESHDS_Mesh* aTgtMesh = theTargetMesh ? theTargetMesh->GetMeshDS() : 0; + SMESHDS_Mesh* aMesh = GetMeshDS(); + + + // map old node to new one + TNodeNodeMap nodeMap; + + // elements sharing moved nodes; those of them which have all + // nodes mirrored but are not in theElems are to be reversed + TIDSortedElemSet inverseElemSet; + + // source elements for each generated one + SMESH_SequenceOfElemPtr srcElems, srcNodes; + + // loop on theElems + TIDSortedElemSet::iterator itElem; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) { + const SMDS_MeshElement* elem = *itElem; + if ( !elem ) + continue; + + // loop on elem nodes + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) { + + // check if a node has been already transformed + const SMDS_MeshNode* node = cast2Node( itN->next() ); + pair n2n_isnew = + nodeMap.insert( make_pair ( node, node )); + if ( !n2n_isnew.second ) + continue; + + double coord[3]; + coord[0] = node->X(); + coord[1] = node->Y(); + coord[2] = node->Z(); + theTrsf.Transforms( coord[0], coord[1], coord[2] ); + if ( theTargetMesh ) { + const SMDS_MeshNode * newNode = aTgtMesh->AddNode( coord[0], coord[1], coord[2] ); + n2n_isnew.first->second = newNode; + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + } + else if ( theCopy ) { + const SMDS_MeshNode * newNode = aMesh->AddNode( coord[0], coord[1], coord[2] ); + n2n_isnew.first->second = newNode; + myLastCreatedNodes.Append(newNode); + srcNodes.Append( node ); + } + else { + aMesh->MoveNode( node, coord[0], coord[1], coord[2] ); + // node position on shape becomes invalid + const_cast< SMDS_MeshNode* > ( node )->SetPosition + ( SMDS_SpacePosition::originSpacePosition() ); + } + + // keep inverse elements + if ( !theCopy && !theTargetMesh && needReverse ) { + SMDS_ElemIteratorPtr invElemIt = node->GetInverseElementIterator(); + while ( invElemIt->more() ) { + const SMDS_MeshElement* iel = invElemIt->next(); + inverseElemSet.insert( iel ); + } + } + } + } + + // either create new elements or reverse mirrored ones + if ( !theCopy && !needReverse && !theTargetMesh ) + return PGroupIDs(); + + TIDSortedElemSet::iterator invElemIt = inverseElemSet.begin(); + for ( ; invElemIt != inverseElemSet.end(); invElemIt++ ) + theElems.insert( *invElemIt ); + + // replicate or reverse elements + + enum { + REV_TETRA = 0, // = nbNodes - 4 + REV_PYRAMID = 1, // = nbNodes - 4 + REV_PENTA = 2, // = nbNodes - 4 + REV_FACE = 3, + REV_HEXA = 4, // = nbNodes - 4 + FORWARD = 5 + }; + int index[][8] = { + { 2, 1, 0, 3, 4, 0, 0, 0 }, // REV_TETRA + { 2, 1, 0, 3, 4, 0, 0, 0 }, // REV_PYRAMID + { 2, 1, 0, 5, 4, 3, 0, 0 }, // REV_PENTA + { 2, 1, 0, 3, 0, 0, 0, 0 }, // REV_FACE + { 2, 1, 0, 3, 6, 5, 4, 7 }, // REV_HEXA + { 0, 1, 2, 3, 4, 5, 6, 7 } // FORWARD + }; + + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) + { + const SMDS_MeshElement* elem = *itElem; + if ( !elem || elem->GetType() == SMDSAbs_Node ) + continue; + + int nbNodes = elem->NbNodes(); + int elemType = elem->GetType(); + + if (elem->IsPoly()) { + // Polygon or Polyhedral Volume + switch ( elemType ) { + case SMDSAbs_Face: + { + vector poly_nodes (nbNodes); + int iNode = 0; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while (itN->more()) { + const SMDS_MeshNode* node = + static_cast(itN->next()); + TNodeNodeMap::iterator nodeMapIt = nodeMap.find(node); + if (nodeMapIt == nodeMap.end()) + break; // not all nodes transformed + if (needReverse) { + // reverse mirrored faces and volumes + poly_nodes[nbNodes - iNode - 1] = (*nodeMapIt).second; + } else { + poly_nodes[iNode] = (*nodeMapIt).second; + } + iNode++; + } + if ( iNode != nbNodes ) + continue; // not all nodes transformed + + if ( theTargetMesh ) { + myLastCreatedElems.Append(aTgtMesh->AddPolygonalFace(poly_nodes)); + srcElems.Append( elem ); + } + else if ( theCopy ) { + myLastCreatedElems.Append(aMesh->AddPolygonalFace(poly_nodes)); + srcElems.Append( elem ); + } + else { + aMesh->ChangePolygonNodes(elem, poly_nodes); + } + } + break; + case SMDSAbs_Volume: + { + // ATTENTION: Reversing is not yet done!!! + const SMDS_PolyhedralVolumeOfNodes* aPolyedre = + dynamic_cast( elem ); + if (!aPolyedre) { + MESSAGE("Warning: bad volumic element"); + continue; + } + + vector poly_nodes; + vector quantities; + + bool allTransformed = true; + int nbFaces = aPolyedre->NbFaces(); + for (int iface = 1; iface <= nbFaces && allTransformed; iface++) { + int nbFaceNodes = aPolyedre->NbFaceNodes(iface); + for (int inode = 1; inode <= nbFaceNodes && allTransformed; inode++) { + const SMDS_MeshNode* node = aPolyedre->GetFaceNode(iface, inode); + TNodeNodeMap::iterator nodeMapIt = nodeMap.find(node); + if (nodeMapIt == nodeMap.end()) { + allTransformed = false; // not all nodes transformed + } else { + poly_nodes.push_back((*nodeMapIt).second); + } + } + quantities.push_back(nbFaceNodes); + } + if ( !allTransformed ) + continue; // not all nodes transformed + + if ( theTargetMesh ) { + myLastCreatedElems.Append(aTgtMesh->AddPolyhedralVolume(poly_nodes, quantities)); + srcElems.Append( elem ); + } + else if ( theCopy ) { + myLastCreatedElems.Append(aMesh->AddPolyhedralVolume(poly_nodes, quantities)); + srcElems.Append( elem ); + } + else { + aMesh->ChangePolyhedronNodes(elem, poly_nodes, quantities); + } + } + break; + default:; + } + continue; + } + + // Regular elements + int* i = index[ FORWARD ]; + if ( needReverse && nbNodes > 2) { // reverse mirrored faces and volumes + if ( elemType == SMDSAbs_Face ) + i = index[ REV_FACE ]; + else + i = index[ nbNodes - 4 ]; + } + + if(elem->IsQuadratic()) { + static int anIds[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19}; + i = anIds; + if(needReverse) { + if(nbNodes==3) { // quadratic edge + static int anIds[] = {1,0,2}; + i = anIds; + } + else if(nbNodes==6) { // quadratic triangle + static int anIds[] = {0,2,1,5,4,3}; + i = anIds; + } + else if(nbNodes==8) { // quadratic quadrangle + static int anIds[] = {0,3,2,1,7,6,5,4}; + i = anIds; + } + else if(nbNodes==10) { // quadratic tetrahedron of 10 nodes + static int anIds[] = {0,2,1,3,6,5,4,7,9,8}; + i = anIds; + } + else if(nbNodes==13) { // quadratic pyramid of 13 nodes + static int anIds[] = {0,3,2,1,4,8,7,6,5,9,12,11,10}; + i = anIds; + } + else if(nbNodes==15) { // quadratic pentahedron with 15 nodes + static int anIds[] = {0,2,1,3,5,4,8,7,6,11,10,9,12,14,13}; + i = anIds; + } + else { // nbNodes==20 - quadratic hexahedron with 20 nodes + static int anIds[] = {0,3,2,1,4,7,6,5,11,10,9,8,15,14,13,12,16,19,18,17}; + i = anIds; + } + } + } + + // find transformed nodes + vector nodes(nbNodes); + int iNode = 0; + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) { + const SMDS_MeshNode* node = + static_cast( itN->next() ); + TNodeNodeMap::iterator nodeMapIt = nodeMap.find( node ); + if ( nodeMapIt == nodeMap.end() ) + break; // not all nodes transformed + nodes[ i [ iNode++ ]] = (*nodeMapIt).second; + } + if ( iNode != nbNodes ) + continue; // not all nodes transformed + + if ( theTargetMesh ) { + if ( SMDS_MeshElement* copy = + targetMeshEditor.AddElement( nodes, elem->GetType(), elem->IsPoly() )) { + myLastCreatedElems.Append( copy ); + srcElems.Append( elem ); + } + } + else if ( theCopy ) { + if ( SMDS_MeshElement* copy = AddElement( nodes, elem->GetType(), elem->IsPoly() )) { + myLastCreatedElems.Append( copy ); + srcElems.Append( elem ); + } + } + else { + // reverse element as it was reversed by transformation + if ( nbNodes > 2 ) + aMesh->ChangeElementNodes( elem, &nodes[0], nbNodes ); + } + } + + PGroupIDs newGroupIDs; + + if ( (theMakeGroups && theCopy) || + (theMakeGroups && theTargetMesh) ) + newGroupIDs = generateGroups( srcNodes, srcElems, groupPostfix, theTargetMesh ); + + return newGroupIDs; +} + +//======================================================================= +/*! + * \brief Create groups of elements made during transformation + * \param nodeGens - nodes making corresponding myLastCreatedNodes + * \param elemGens - elements making corresponding myLastCreatedElems + * \param postfix - to append to names of new groups + */ +//======================================================================= + +SMESH_MeshEditor::PGroupIDs +SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens, + const SMESH_SequenceOfElemPtr& elemGens, + const std::string& postfix, + SMESH_Mesh* targetMesh) +{ + PGroupIDs newGroupIDs( new list ); + SMESH_Mesh* mesh = targetMesh ? targetMesh : GetMesh(); + + // Sort existing groups by types and collect their names + + // to store an old group and a generated new one + typedef pair< SMESHDS_GroupBase*, SMDS_MeshGroup* > TOldNewGroup; + vector< list< TOldNewGroup > > groupsByType( SMDSAbs_NbElementTypes ); + // group names + set< string > groupNames; + // + SMDS_MeshGroup* nullNewGroup = (SMDS_MeshGroup*) 0; + SMESH_Mesh::GroupIteratorPtr groupIt = GetMesh()->GetGroups(); + while ( groupIt->more() ) { + SMESH_Group * group = groupIt->next(); + if ( !group ) continue; + SMESHDS_GroupBase* groupDS = group->GetGroupDS(); + if ( !groupDS || groupDS->IsEmpty() ) continue; + groupNames.insert( group->GetName() ); + groupDS->SetStoreName( group->GetName() ); + groupsByType[ groupDS->GetType() ].push_back( make_pair( groupDS, nullNewGroup )); + } + + // Groups creation + + // loop on nodes and elements + for ( int isNodes = 0; isNodes < 2; ++isNodes ) + { + const SMESH_SequenceOfElemPtr& gens = isNodes ? nodeGens : elemGens; + const SMESH_SequenceOfElemPtr& elems = isNodes ? myLastCreatedNodes : myLastCreatedElems; + if ( gens.Length() != elems.Length() ) + throw SMESH_Exception(LOCALIZED("invalid args")); + + // loop on created elements + for (int iElem = 1; iElem <= elems.Length(); ++iElem ) + { + const SMDS_MeshElement* sourceElem = gens( iElem ); + if ( !sourceElem ) { + MESSAGE("generateGroups(): NULL source element"); + continue; + } + list< TOldNewGroup > & groupsOldNew = groupsByType[ sourceElem->GetType() ]; + if ( groupsOldNew.empty() ) { + while ( iElem < gens.Length() && gens( iElem+1 ) == sourceElem ) + ++iElem; // skip all elements made by sourceElem + continue; + } + // collect all elements made by sourceElem + list< const SMDS_MeshElement* > resultElems; + if ( const SMDS_MeshElement* resElem = elems( iElem )) + if ( resElem != sourceElem ) + resultElems.push_back( resElem ); + while ( iElem < gens.Length() && gens( iElem+1 ) == sourceElem ) + if ( const SMDS_MeshElement* resElem = elems( ++iElem )) + if ( resElem != sourceElem ) + resultElems.push_back( resElem ); + // do not generate element groups from node ones + if ( sourceElem->GetType() == SMDSAbs_Node && + elems( iElem )->GetType() != SMDSAbs_Node ) + continue; + + // add resultElems to groups made by ones the sourceElem belongs to + list< TOldNewGroup >::iterator gOldNew, gLast = groupsOldNew.end(); + for ( gOldNew = groupsOldNew.begin(); gOldNew != gLast; ++gOldNew ) + { + SMESHDS_GroupBase* oldGroup = gOldNew->first; + if ( oldGroup->Contains( sourceElem )) // sourceElem in oldGroup + { + SMDS_MeshGroup* & newGroup = gOldNew->second; + if ( !newGroup )// create a new group + { + // make a name + string name = oldGroup->GetStoreName(); + if ( !targetMesh ) { + name += "_"; + name += postfix; + int nb = 0; + while ( !groupNames.insert( name ).second ) // name exists + { + if ( nb == 0 ) { + name += "_1"; + } + else { + TCollection_AsciiString nbStr(nb+1); + name.resize( name.rfind('_')+1 ); + name += nbStr.ToCString(); + } + ++nb; + } + } + // make a group + int id; + SMESH_Group* group = mesh->AddGroup( resultElems.back()->GetType(), + name.c_str(), id ); + SMESHDS_Group* groupDS = static_cast(group->GetGroupDS()); + newGroup = & groupDS->SMDSGroup(); + newGroupIDs->push_back( id ); + } + + // fill in a new group + list< const SMDS_MeshElement* >::iterator resLast = resultElems.end(), resElemIt; + for ( resElemIt = resultElems.begin(); resElemIt != resLast; ++resElemIt ) + newGroup->Add( *resElemIt ); + } + } + } // loop on created elements + }// loop on nodes and elements + + return newGroupIDs; +} + +//======================================================================= +//function : FindCoincidentNodes +//purpose : Return list of group of nodes close to each other within theTolerance +// Search among theNodes or in the whole mesh if theNodes is empty using +// an Octree algorithm +//======================================================================= + +void SMESH_MeshEditor::FindCoincidentNodes (set & theNodes, + const double theTolerance, + TListOfListOfNodes & theGroupsOfNodes) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + set nodes; + if ( theNodes.empty() ) + { // get all nodes in the mesh + SMDS_NodeIteratorPtr nIt = GetMeshDS()->nodesIterator(); + while ( nIt->more() ) + nodes.insert( nodes.end(),nIt->next()); + } + else + nodes=theNodes; + SMESH_OctreeNode::FindCoincidentNodes ( nodes, &theGroupsOfNodes, theTolerance); + +} + +//======================================================================= +/*! + * \brief Implementation of search for the node closest to point + */ +//======================================================================= + +struct SMESH_NodeSearcherImpl: public SMESH_NodeSearcher +{ + /*! + * \brief Constructor + */ + SMESH_NodeSearcherImpl( const SMESHDS_Mesh* theMesh ) + { + set nodes; + if ( theMesh ) { + SMDS_NodeIteratorPtr nIt = theMesh->nodesIterator(); + while ( nIt->more() ) + nodes.insert( nodes.end(), nIt->next() ); + } + myOctreeNode = new SMESH_OctreeNode(nodes) ; + } + /*! + * \brief Do it's job + */ + const SMDS_MeshNode* FindClosestTo( const gp_Pnt& thePnt ) + { + SMDS_MeshNode tgtNode( thePnt.X(), thePnt.Y(), thePnt.Z() ); + list nodes; + const double precision = 1e-6; + //myOctreeNode->NodesAround( &tgtNode, &nodes, precision ); + + double minSqDist = DBL_MAX; + Bnd_B3d box; + if ( nodes.empty() ) // get all nodes of OctreeNode's closest to thePnt + { + // sort leafs by their distance from thePnt + typedef map< double, SMESH_OctreeNode* > TDistTreeMap; + TDistTreeMap treeMap; + list< SMESH_OctreeNode* > treeList; + list< SMESH_OctreeNode* >::iterator trIt; + treeList.push_back( myOctreeNode ); + for ( trIt = treeList.begin(); trIt != treeList.end(); ++trIt) + { + SMESH_OctreeNode* tree = *trIt; + if ( !tree->isLeaf() ) { // put children to the queue + SMESH_OctreeNodeIteratorPtr cIt = tree->GetChildrenIterator(); + while ( cIt->more() ) + treeList.push_back( cIt->next() ); + } + else if ( tree->NbNodes() ) { // put tree to treeMap + tree->getBox( box ); + double sqDist = thePnt.SquareDistance( 0.5 * ( box.CornerMin() + box.CornerMax() )); + pair it_in = treeMap.insert( make_pair( sqDist, tree )); + if ( !it_in.second ) // not unique distance to box center + treeMap.insert( it_in.first, make_pair( sqDist - 1e-13*treeMap.size(), tree )); + } + } + // find distance after which there is no sense to check tree's + double sqLimit = DBL_MAX; + TDistTreeMap::iterator sqDist_tree = treeMap.begin(); + if ( treeMap.size() > 5 ) { + SMESH_OctreeNode* closestTree = sqDist_tree->second; + closestTree->getBox( box ); + double limit = sqrt( sqDist_tree->first ) + sqrt ( box.SquareExtent() ); + sqLimit = limit * limit; + } + // get all nodes from trees + for ( ; sqDist_tree != treeMap.end(); ++sqDist_tree) { + if ( sqDist_tree->first > sqLimit ) + break; + SMESH_OctreeNode* tree = sqDist_tree->second; + tree->NodesAround( tree->GetNodeIterator()->next(), &nodes ); + } + } + // find closest among nodes + minSqDist = DBL_MAX; + const SMDS_MeshNode* closestNode = 0; + list::iterator nIt = nodes.begin(); + for ( ; nIt != nodes.end(); ++nIt ) { + double sqDist = thePnt.SquareDistance( TNodeXYZ( *nIt ) ); + if ( minSqDist > sqDist ) { + closestNode = *nIt; + minSqDist = sqDist; + } + } + return closestNode; + } + /*! + * \brief Destructor + */ + ~SMESH_NodeSearcherImpl() { delete myOctreeNode; } +private: + SMESH_OctreeNode* myOctreeNode; +}; + +//======================================================================= +/*! + * \brief Return SMESH_NodeSearcher + */ +//======================================================================= + +SMESH_NodeSearcher* SMESH_MeshEditor::GetNodeSearcher() +{ + return new SMESH_NodeSearcherImpl( GetMeshDS() ); +} + +//======================================================================= +//function : SimplifyFace +//purpose : +//======================================================================= +int SMESH_MeshEditor::SimplifyFace (const vector faceNodes, + vector& poly_nodes, + vector& quantities) const +{ + int nbNodes = faceNodes.size(); + + if (nbNodes < 3) + return 0; + + set nodeSet; + + // get simple seq of nodes + //const SMDS_MeshNode* simpleNodes[ nbNodes ]; + vector simpleNodes( nbNodes ); + int iSimple = 0, nbUnique = 0; + + simpleNodes[iSimple++] = faceNodes[0]; + nbUnique++; + for (int iCur = 1; iCur < nbNodes; iCur++) { + if (faceNodes[iCur] != simpleNodes[iSimple - 1]) { + simpleNodes[iSimple++] = faceNodes[iCur]; + if (nodeSet.insert( faceNodes[iCur] ).second) + nbUnique++; + } + } + int nbSimple = iSimple; + if (simpleNodes[nbSimple - 1] == simpleNodes[0]) { + nbSimple--; + iSimple--; + } + + if (nbUnique < 3) + return 0; + + // separate loops + int nbNew = 0; + bool foundLoop = (nbSimple > nbUnique); + while (foundLoop) { + foundLoop = false; + set loopSet; + for (iSimple = 0; iSimple < nbSimple && !foundLoop; iSimple++) { + const SMDS_MeshNode* n = simpleNodes[iSimple]; + if (!loopSet.insert( n ).second) { + foundLoop = true; + + // separate loop + int iC = 0, curLast = iSimple; + for (; iC < curLast; iC++) { + if (simpleNodes[iC] == n) break; + } + int loopLen = curLast - iC; + if (loopLen > 2) { + // create sub-element + nbNew++; + quantities.push_back(loopLen); + for (; iC < curLast; iC++) { + poly_nodes.push_back(simpleNodes[iC]); + } + } + // shift the rest nodes (place from the first loop position) + for (iC = curLast + 1; iC < nbSimple; iC++) { + simpleNodes[iC - loopLen] = simpleNodes[iC]; + } + nbSimple -= loopLen; + iSimple -= loopLen; + } + } // for (iSimple = 0; iSimple < nbSimple; iSimple++) + } // while (foundLoop) + + if (iSimple > 2) { + nbNew++; + quantities.push_back(iSimple); + for (int i = 0; i < iSimple; i++) + poly_nodes.push_back(simpleNodes[i]); + } + + return nbNew; +} + +//======================================================================= +//function : MergeNodes +//purpose : In each group, the cdr of nodes are substituted by the first one +// in all elements. +//======================================================================= + +void SMESH_MeshEditor::MergeNodes (TListOfListOfNodes & theGroupsOfNodes) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + TNodeNodeMap nodeNodeMap; // node to replace - new node + set elems; // all elements with changed nodes + list< int > rmElemIds, rmNodeIds; + + // Fill nodeNodeMap and elems + + TListOfListOfNodes::iterator grIt = theGroupsOfNodes.begin(); + for ( ; grIt != theGroupsOfNodes.end(); grIt++ ) { + list& nodes = *grIt; + list::iterator nIt = nodes.begin(); + const SMDS_MeshNode* nToKeep = *nIt; + for ( ++nIt; nIt != nodes.end(); nIt++ ) { + const SMDS_MeshNode* nToRemove = *nIt; + nodeNodeMap.insert( TNodeNodeMap::value_type( nToRemove, nToKeep )); + if ( nToRemove != nToKeep ) { + rmNodeIds.push_back( nToRemove->GetID() ); + AddToSameGroups( nToKeep, nToRemove, aMesh ); + } + + SMDS_ElemIteratorPtr invElemIt = nToRemove->GetInverseElementIterator(); + while ( invElemIt->more() ) { + const SMDS_MeshElement* elem = invElemIt->next(); + elems.insert(elem); + } + } + } + // Change element nodes or remove an element + + set::iterator eIt = elems.begin(); + for ( ; eIt != elems.end(); eIt++ ) { + const SMDS_MeshElement* elem = *eIt; + int nbNodes = elem->NbNodes(); + int aShapeId = FindShape( elem ); + + set nodeSet; + vector< const SMDS_MeshNode*> curNodes( nbNodes ), uniqueNodes( nbNodes ); + int iUnique = 0, iCur = 0, nbRepl = 0; + vector iRepl( nbNodes ); + + // get new seq of nodes + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) { + const SMDS_MeshNode* n = + static_cast( itN->next() ); + + TNodeNodeMap::iterator nnIt = nodeNodeMap.find( n ); + if ( nnIt != nodeNodeMap.end() ) { // n sticks + n = (*nnIt).second; + // BUG 0020185: begin + { + bool stopRecur = false; + set nodesRecur; + nodesRecur.insert(n); + while (!stopRecur) { + TNodeNodeMap::iterator nnIt_i = nodeNodeMap.find( n ); + if ( nnIt_i != nodeNodeMap.end() ) { // n sticks + n = (*nnIt_i).second; + if (!nodesRecur.insert(n).second) { + // error: recursive dependancy + stopRecur = true; + } + } + else + stopRecur = true; + } + } + // BUG 0020185: end + iRepl[ nbRepl++ ] = iCur; + } + curNodes[ iCur ] = n; + bool isUnique = nodeSet.insert( n ).second; + if ( isUnique ) + uniqueNodes[ iUnique++ ] = n; + iCur++; + } + + // Analyse element topology after replacement + + bool isOk = true; + int nbUniqueNodes = nodeSet.size(); + if ( nbNodes != nbUniqueNodes ) { // some nodes stick + // Polygons and Polyhedral volumes + if (elem->IsPoly()) { + + if (elem->GetType() == SMDSAbs_Face) { + // Polygon + vector face_nodes (nbNodes); + int inode = 0; + for (; inode < nbNodes; inode++) { + face_nodes[inode] = curNodes[inode]; + } + + vector polygons_nodes; + vector quantities; + int nbNew = SimplifyFace(face_nodes, polygons_nodes, quantities); + + if (nbNew > 0) { + inode = 0; + for (int iface = 0; iface < nbNew - 1; iface++) { + int nbNodes = quantities[iface]; + vector poly_nodes (nbNodes); + for (int ii = 0; ii < nbNodes; ii++, inode++) { + poly_nodes[ii] = polygons_nodes[inode]; + } + SMDS_MeshElement* newElem = aMesh->AddPolygonalFace(poly_nodes); + myLastCreatedElems.Append(newElem); + if (aShapeId) + aMesh->SetMeshElementOnShape(newElem, aShapeId); + } + aMesh->ChangeElementNodes(elem, &polygons_nodes[inode], quantities[nbNew - 1]); + } + else { + rmElemIds.push_back(elem->GetID()); + } + + } + else if (elem->GetType() == SMDSAbs_Volume) { + // Polyhedral volume + if (nbUniqueNodes < 4) { + rmElemIds.push_back(elem->GetID()); + } + else { + // each face has to be analized in order to check volume validity + const SMDS_PolyhedralVolumeOfNodes* aPolyedre = + static_cast( elem ); + if (aPolyedre) { + int nbFaces = aPolyedre->NbFaces(); + + vector poly_nodes; + vector quantities; + + for (int iface = 1; iface <= nbFaces; iface++) { + int nbFaceNodes = aPolyedre->NbFaceNodes(iface); + vector faceNodes (nbFaceNodes); + + for (int inode = 1; inode <= nbFaceNodes; inode++) { + const SMDS_MeshNode * faceNode = aPolyedre->GetFaceNode(iface, inode); + TNodeNodeMap::iterator nnIt = nodeNodeMap.find(faceNode); + if (nnIt != nodeNodeMap.end()) { // faceNode sticks + faceNode = (*nnIt).second; + } + faceNodes[inode - 1] = faceNode; + } + + SimplifyFace(faceNodes, poly_nodes, quantities); + } + + if (quantities.size() > 3) { + // to be done: remove coincident faces + } + + if (quantities.size() > 3) + aMesh->ChangePolyhedronNodes(elem, poly_nodes, quantities); + else + rmElemIds.push_back(elem->GetID()); + + } + else { + rmElemIds.push_back(elem->GetID()); + } + } + } + else { + } + + continue; + } + + // Regular elements + switch ( nbNodes ) { + case 2: ///////////////////////////////////// EDGE + isOk = false; break; + case 3: ///////////////////////////////////// TRIANGLE + isOk = false; break; + case 4: + if ( elem->GetType() == SMDSAbs_Volume ) // TETRAHEDRON + isOk = false; + else { //////////////////////////////////// QUADRANGLE + if ( nbUniqueNodes < 3 ) + isOk = false; + else if ( nbRepl == 2 && iRepl[ 1 ] - iRepl[ 0 ] == 2 ) + isOk = false; // opposite nodes stick + } + break; + case 6: ///////////////////////////////////// PENTAHEDRON + if ( nbUniqueNodes == 4 ) { + // ---------------------------------> tetrahedron + if (nbRepl == 3 && + iRepl[ 0 ] > 2 && iRepl[ 1 ] > 2 && iRepl[ 2 ] > 2 ) { + // all top nodes stick: reverse a bottom + uniqueNodes[ 0 ] = curNodes [ 1 ]; + uniqueNodes[ 1 ] = curNodes [ 0 ]; + } + else if (nbRepl == 3 && + iRepl[ 0 ] < 3 && iRepl[ 1 ] < 3 && iRepl[ 2 ] < 3 ) { + // all bottom nodes stick: set a top before + uniqueNodes[ 3 ] = uniqueNodes [ 0 ]; + uniqueNodes[ 0 ] = curNodes [ 3 ]; + uniqueNodes[ 1 ] = curNodes [ 4 ]; + uniqueNodes[ 2 ] = curNodes [ 5 ]; + } + else if (nbRepl == 4 && + iRepl[ 2 ] - iRepl [ 0 ] == 3 && iRepl[ 3 ] - iRepl [ 1 ] == 3 ) { + // a lateral face turns into a line: reverse a bottom + uniqueNodes[ 0 ] = curNodes [ 1 ]; + uniqueNodes[ 1 ] = curNodes [ 0 ]; + } + else + isOk = false; + } + else if ( nbUniqueNodes == 5 ) { + // PENTAHEDRON --------------------> 2 tetrahedrons + if ( nbRepl == 2 && iRepl[ 1 ] - iRepl [ 0 ] == 3 ) { + // a bottom node sticks with a linked top one + // 1. + SMDS_MeshElement* newElem = + aMesh->AddVolume(curNodes[ 3 ], + curNodes[ 4 ], + curNodes[ 5 ], + curNodes[ iRepl[ 0 ] == 2 ? 1 : 2 ]); + myLastCreatedElems.Append(newElem); + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + // 2. : reverse a bottom + uniqueNodes[ 0 ] = curNodes [ 1 ]; + uniqueNodes[ 1 ] = curNodes [ 0 ]; + nbUniqueNodes = 4; + } +<<<<<<< HEAD +======= + } + // add resultElems to groups originted from ones the sourceElem belongs to + list< TOldNewGroup >::iterator gOldNew, gLast = groupsOldNew.end(); + for ( gOldNew = groupsOldNew.begin(); gOldNew != gLast; ++gOldNew ) + { + SMESHDS_GroupBase* oldGroup = gOldNew->get<0>(); + if ( oldGroup->Contains( sourceElem )) // sourceElem is in oldGroup + { + // fill in a new group + SMDS_MeshGroup & newGroup = gOldNew->get<1>()->SMDSGroup(); + vector< const SMDS_MeshElement* >::iterator resLast = resultElems.end(), resElemIt; + for ( resElemIt = resultElems.begin(); resElemIt != resLast; ++resElemIt ) + if ( *resElemIt ) + newGroup.Add( *resElemIt ); + + // fill a "top" group + if ( topElem ) + { + SMDS_MeshGroup & newTopGroup = gOldNew->get<2>()->SMDSGroup(); + newTopGroup.Add( topElem ); + } + } + } + } // loop on created elements + }// loop on nodes and elements + + // Create new SMESH_Groups from SMESHDS_Groups and remove empty SMESHDS_Groups + + list topGrouIds; + for ( size_t i = 0; i < orderedOldNewGroups.size(); ++i ) + { + SMESHDS_GroupBase* oldGroupDS = orderedOldNewGroups[i]->get<0>(); + SMESHDS_Group* newGroups[2] = { orderedOldNewGroups[i]->get<1>(), + orderedOldNewGroups[i]->get<2>() }; + for ( int is2nd = 0; is2nd < 2; ++is2nd ) + { + SMESHDS_Group* newGroupDS = newGroups[ is2nd ]; + if ( newGroupDS->IsEmpty() ) + { + mesh->GetMeshDS()->RemoveGroup( newGroupDS ); + } + else + { + // set group type + newGroupDS->SetType( newGroupDS->GetElements()->next()->GetType() ); + + // make a name + const bool isTop = ( topPresent && + newGroupDS->GetType() == oldGroupDS->GetType() && + is2nd ); + + string name = oldGroupDS->GetStoreName(); + { // remove trailing whitespaces (issue 22599) + size_t size = name.size(); + while ( size > 1 && isspace( name[ size-1 ])) + --size; + if ( size != name.size() ) + { + name.resize( size ); + oldGroupDS->SetStoreName( name.c_str() ); + } + } + if ( !targetMesh ) { + string suffix = ( isTop ? "top": postfix.c_str() ); + name += "_"; + name += suffix; + int nb = 1; + while ( !groupNames.insert( name ).second ) // name exists + name = SMESH_Comment( oldGroupDS->GetStoreName() ) << "_" << suffix << "_" << nb++; + } + else if ( isTop ) { + name += "_top"; + } + newGroupDS->SetStoreName( name.c_str() ); + + // make a SMESH_Groups + mesh->AddGroup( newGroupDS ); + if ( isTop ) + topGrouIds.push_back( newGroupDS->GetID() ); + else + newGroupIDs->push_back( newGroupDS->GetID() ); + } + } + } + newGroupIDs->splice( newGroupIDs->end(), topGrouIds ); + + return newGroupIDs; +} + +//================================================================================ +/*! + * * \brief Return list of group of nodes close to each other within theTolerance + * * Search among theNodes or in the whole mesh if theNodes is empty using + * * an Octree algorithm + * \param [in,out] theNodes - the nodes to treat + * \param [in] theTolerance - the tolerance + * \param [out] theGroupsOfNodes - the result groups of coincident nodes + * \param [in] theSeparateCornersAndMedium - if \c true, in quadratic mesh puts + * corner and medium nodes in separate groups + */ +//================================================================================ + +void SMESH_MeshEditor::FindCoincidentNodes (TIDSortedNodeSet & theNodes, + const double theTolerance, + TListOfListOfNodes & theGroupsOfNodes, + bool theSeparateCornersAndMedium) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + if ( myMesh->NbEdges ( ORDER_QUADRATIC ) + + myMesh->NbFaces ( ORDER_QUADRATIC ) + + myMesh->NbVolumes( ORDER_QUADRATIC ) == 0 ) + theSeparateCornersAndMedium = false; + + TIDSortedNodeSet& corners = theNodes; + TIDSortedNodeSet medium; + + if ( theNodes.empty() ) // get all nodes in the mesh + { + TIDSortedNodeSet* nodes[2] = { &corners, &medium }; + SMDS_NodeIteratorPtr nIt = GetMeshDS()->nodesIterator(/*idInceasingOrder=*/true); + if ( theSeparateCornersAndMedium ) + while ( nIt->more() ) + { + const SMDS_MeshNode* n = nIt->next(); + TIDSortedNodeSet* & nodeSet = nodes[ SMESH_MesherHelper::IsMedium( n )]; + nodeSet->insert( nodeSet->end(), n ); + } + else + while ( nIt->more() ) + theNodes.insert( theNodes.end(),nIt->next() ); + } + else if ( theSeparateCornersAndMedium ) // separate corners from medium nodes + { + TIDSortedNodeSet::iterator nIt = corners.begin(); + while ( nIt != corners.end() ) + if ( SMESH_MesherHelper::IsMedium( *nIt )) + { + medium.insert( medium.end(), *nIt ); + corners.erase( nIt++ ); + } + else + { + ++nIt; + } + } + + if ( !corners.empty() ) + SMESH_OctreeNode::FindCoincidentNodes ( corners, &theGroupsOfNodes, theTolerance ); + if ( !medium.empty() ) + SMESH_OctreeNode::FindCoincidentNodes ( medium, &theGroupsOfNodes, theTolerance ); +} + +//======================================================================= +//function : SimplifyFace +//purpose : split a chain of nodes into several closed chains +//======================================================================= + +int SMESH_MeshEditor::SimplifyFace (const vector& faceNodes, + vector& poly_nodes, + vector& quantities) const +{ + int nbNodes = faceNodes.size(); + + if (nbNodes < 3) + return 0; + + set nodeSet; + + // get simple seq of nodes + vector simpleNodes( nbNodes ); + int iSimple = 0; + + simpleNodes[iSimple++] = faceNodes[0]; + for (int iCur = 1; iCur < nbNodes; iCur++) { + if (faceNodes[iCur] != simpleNodes[iSimple - 1]) { + simpleNodes[iSimple++] = faceNodes[iCur]; + nodeSet.insert( faceNodes[iCur] ); + } + } + int nbUnique = nodeSet.size(); + int nbSimple = iSimple; + if (simpleNodes[nbSimple - 1] == simpleNodes[0]) { + nbSimple--; + iSimple--; + } + + if (nbUnique < 3) + return 0; + + // separate loops + int nbNew = 0; + bool foundLoop = (nbSimple > nbUnique); + while (foundLoop) { + foundLoop = false; + set loopSet; + for (iSimple = 0; iSimple < nbSimple && !foundLoop; iSimple++) { + const SMDS_MeshNode* n = simpleNodes[iSimple]; + if (!loopSet.insert( n ).second) { + foundLoop = true; + + // separate loop + int iC = 0, curLast = iSimple; + for (; iC < curLast; iC++) { + if (simpleNodes[iC] == n) break; + } + int loopLen = curLast - iC; + if (loopLen > 2) { + // create sub-element + nbNew++; + quantities.push_back(loopLen); + for (; iC < curLast; iC++) { + poly_nodes.push_back(simpleNodes[iC]); + } + } + // shift the rest nodes (place from the first loop position) + for (iC = curLast + 1; iC < nbSimple; iC++) { + simpleNodes[iC - loopLen] = simpleNodes[iC]; + } + nbSimple -= loopLen; + iSimple -= loopLen; + } + } // for (iSimple = 0; iSimple < nbSimple; iSimple++) + } // while (foundLoop) + + if (iSimple > 2) { + nbNew++; + quantities.push_back(iSimple); + for (int i = 0; i < iSimple; i++) + poly_nodes.push_back(simpleNodes[i]); + } + + return nbNew; +} + +//======================================================================= +//function : MergeNodes +//purpose : In each group, the cdr of nodes are substituted by the first one +// in all elements. +//======================================================================= + +void SMESH_MeshEditor::MergeNodes (TListOfListOfNodes & theGroupsOfNodes) +{ + MESSAGE("MergeNodes"); + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + TNodeNodeMap nodeNodeMap; // node to replace - new node + set elems; // all elements with changed nodes + list< int > rmElemIds, rmNodeIds; + + // Fill nodeNodeMap and elems + + TListOfListOfNodes::iterator grIt = theGroupsOfNodes.begin(); + for ( ; grIt != theGroupsOfNodes.end(); grIt++ ) + { + list& nodes = *grIt; + list::iterator nIt = nodes.begin(); + const SMDS_MeshNode* nToKeep = *nIt; + for ( ++nIt; nIt != nodes.end(); nIt++ ) + { + const SMDS_MeshNode* nToRemove = *nIt; + nodeNodeMap.insert( make_pair( nToRemove, nToKeep )); + if ( nToRemove != nToKeep ) + { + rmNodeIds.push_back( nToRemove->GetID() ); + AddToSameGroups( nToKeep, nToRemove, aMesh ); + // set _alwaysComputed to a sub-mesh of VERTEX to enable mesh computing + // after MergeNodes() w/o creating node in place of merged ones. + const SMDS_PositionPtr& pos = nToRemove->GetPosition(); + if ( pos && pos->GetTypeOfPosition() == SMDS_TOP_VERTEX ) + if ( SMESH_subMesh* sm = myMesh->GetSubMeshContaining( nToRemove->getshapeId() )) + sm->SetIsAlwaysComputed( true ); + } + SMDS_ElemIteratorPtr invElemIt = nToRemove->GetInverseElementIterator(); + while ( invElemIt->more() ) { + const SMDS_MeshElement* elem = invElemIt->next(); + elems.insert(elem); + } + } + } + // Change element nodes or remove an element + + set nodeSet; + vector< const SMDS_MeshNode*> curNodes, uniqueNodes; + vector iRepl; + ElemFeatures elemType; + + set::iterator eIt = elems.begin(); + for ( ; eIt != elems.end(); eIt++ ) + { + const SMDS_MeshElement* elem = *eIt; + const int nbNodes = elem->NbNodes(); + const int aShapeId = FindShape( elem ); + + nodeSet.clear(); + curNodes.resize( nbNodes ); + uniqueNodes.resize( nbNodes ); + iRepl.resize( nbNodes ); + int iUnique = 0, iCur = 0, nbRepl = 0; + + // get new seq of nodes + SMDS_ElemIteratorPtr itN = elem->nodesIterator(); + while ( itN->more() ) + { + const SMDS_MeshNode* n = static_cast( itN->next() ); + + TNodeNodeMap::iterator nnIt = nodeNodeMap.find( n ); + if ( nnIt != nodeNodeMap.end() ) { // n sticks + n = (*nnIt).second; + { ////////// BUG 0020185: begin + bool stopRecur = false; + set nodesRecur; + nodesRecur.insert(n); + while (!stopRecur) { + TNodeNodeMap::iterator nnIt_i = nodeNodeMap.find( n ); + if ( nnIt_i != nodeNodeMap.end() ) { // n sticks + n = (*nnIt_i).second; + if (!nodesRecur.insert(n).second) { + // error: recursive dependancy + stopRecur = true; + } + } + else + stopRecur = true; + } + } ////////// BUG 0020185: end + } + curNodes[ iCur ] = n; + bool isUnique = nodeSet.insert( n ).second; + if ( isUnique ) + uniqueNodes[ iUnique++ ] = n; + else + iRepl[ nbRepl++ ] = iCur; + iCur++; + } + + // Analyse element topology after replacement + + bool isOk = true; + int nbUniqueNodes = nodeSet.size(); + if ( nbNodes != nbUniqueNodes ) // some nodes stick + { + if (elem->IsPoly()) // Polygons and Polyhedral volumes + { + if (elem->GetType() == SMDSAbs_Face) // Polygon + { + elemType.Init( elem ); + const bool isQuad = elemType.myIsQuad; + if ( isQuad ) { +#ifndef VTK_NO_QUAD_POLY + SMDS_MeshCell::applyInterlace // interlace medium and corner nodes + ( SMDS_MeshCell::interlacedSmdsOrder( SMDSEntity_Quad_Polygon, nbNodes ), curNodes ); +#else + throw SALOME_Exception("Quadratic polygon not supported with VTK <6.2"); +#endif + } + + // a polygon can divide into several elements + vector polygons_nodes; + vector quantities; + int nbNew = SimplifyFace( curNodes, polygons_nodes, quantities ); + if (nbNew > 0) + { + vector face_nodes; + int inode = 0; + for (int iface = 0; iface < nbNew; iface++) + { + int nbNewNodes = quantities[iface]; + face_nodes.assign( polygons_nodes.begin() + inode, + polygons_nodes.begin() + inode + nbNewNodes ); + inode += nbNewNodes; + if ( isQuad ) // check if a result elem is a valid quadratic polygon + { +#ifndef VTK_NO_QUAD_POLY + bool isValid = ( nbNewNodes % 2 == 0 ); + for ( int i = 0; i < nbNewNodes && isValid; ++i ) + isValid = ( elem->IsMediumNode( face_nodes[i]) == bool( i % 2 )); + elemType.SetQuad( isValid ); + if ( isValid ) // put medium nodes after corners + SMDS_MeshCell::applyInterlaceRev + ( SMDS_MeshCell::interlacedSmdsOrder( SMDSEntity_Quad_Polygon, + nbNewNodes ), face_nodes ); +#else + throw SALOME_Exception("Quadratic polygon not supported with VTK <6.2"); +#endif + } + elemType.SetPoly(( nbNewNodes / ( elemType.myIsQuad + 1 ) > 4 )); + + SMDS_MeshElement* newElem = AddElement( face_nodes, elemType ); + if ( aShapeId ) + aMesh->SetMeshElementOnShape(newElem, aShapeId); + } + } + rmElemIds.push_back(elem->GetID()); + + } // Polygon + + else if (elem->GetType() == SMDSAbs_Volume) // Polyhedral volume + { + if (nbUniqueNodes < 4) { + rmElemIds.push_back(elem->GetID()); + } + else { + // each face has to be analyzed in order to check volume validity + const SMDS_VtkVolume* aPolyedre = dynamic_cast( elem ); + if (aPolyedre) + { + int nbFaces = aPolyedre->NbFaces(); + + vector poly_nodes; + vector quantities; + + for (int iface = 1; iface <= nbFaces; iface++) { + int nbFaceNodes = aPolyedre->NbFaceNodes(iface); + vector faceNodes (nbFaceNodes); + + for (int inode = 1; inode <= nbFaceNodes; inode++) { + const SMDS_MeshNode * faceNode = aPolyedre->GetFaceNode(iface, inode); + TNodeNodeMap::iterator nnIt = nodeNodeMap.find(faceNode); + if (nnIt != nodeNodeMap.end()) { // faceNode sticks + faceNode = (*nnIt).second; + } + faceNodes[inode - 1] = faceNode; + } + + SimplifyFace(faceNodes, poly_nodes, quantities); + } + + if (quantities.size() > 3) { + // to be done: remove coincident faces + } + + if (quantities.size() > 3) + { + const SMDS_MeshElement* newElem = + aMesh->AddPolyhedralVolume(poly_nodes, quantities); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + rmElemIds.push_back(elem->GetID()); + } + } + else { + rmElemIds.push_back(elem->GetID()); + } + } + } + else { + } + + continue; + } // poly element + + // Regular elements + // TODO not all the possible cases are solved. Find something more generic? + switch ( nbNodes ) { + case 2: ///////////////////////////////////// EDGE + isOk = false; break; + case 3: ///////////////////////////////////// TRIANGLE + isOk = false; break; + case 4: + if ( elem->GetType() == SMDSAbs_Volume ) // TETRAHEDRON + isOk = false; + else { //////////////////////////////////// QUADRANGLE + if ( nbUniqueNodes < 3 ) + isOk = false; + else if ( nbRepl == 2 && iRepl[ 1 ] - iRepl[ 0 ] == 2 ) + isOk = false; // opposite nodes stick + //MESSAGE("isOk " << isOk); + } + break; + case 6: ///////////////////////////////////// PENTAHEDRON + if ( nbUniqueNodes == 4 ) { + // ---------------------------------> tetrahedron + if (nbRepl == 3 && + iRepl[ 0 ] > 2 && iRepl[ 1 ] > 2 && iRepl[ 2 ] > 2 ) { + // all top nodes stick: reverse a bottom + uniqueNodes[ 0 ] = curNodes [ 1 ]; + uniqueNodes[ 1 ] = curNodes [ 0 ]; + } + else if (nbRepl == 3 && + iRepl[ 0 ] < 3 && iRepl[ 1 ] < 3 && iRepl[ 2 ] < 3 ) { + // all bottom nodes stick: set a top before + uniqueNodes[ 3 ] = uniqueNodes [ 0 ]; + uniqueNodes[ 0 ] = curNodes [ 3 ]; + uniqueNodes[ 1 ] = curNodes [ 4 ]; + uniqueNodes[ 2 ] = curNodes [ 5 ]; + } + else if (nbRepl == 4 && + iRepl[ 2 ] - iRepl [ 0 ] == 3 && iRepl[ 3 ] - iRepl [ 1 ] == 3 ) { + // a lateral face turns into a line: reverse a bottom + uniqueNodes[ 0 ] = curNodes [ 1 ]; + uniqueNodes[ 1 ] = curNodes [ 0 ]; + } + else + isOk = false; + } + else if ( nbUniqueNodes == 5 ) { + // PENTAHEDRON --------------------> 2 tetrahedrons + if ( nbRepl == 2 && iRepl[ 1 ] - iRepl [ 0 ] == 3 ) { + // a bottom node sticks with a linked top one + // 1. + SMDS_MeshElement* newElem = + aMesh->AddVolume(curNodes[ 3 ], + curNodes[ 4 ], + curNodes[ 5 ], + curNodes[ iRepl[ 0 ] == 2 ? 1 : 2 ]); + myLastCreatedElems.Append(newElem); + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + // 2. : reverse a bottom + uniqueNodes[ 0 ] = curNodes [ 1 ]; + uniqueNodes[ 1 ] = curNodes [ 0 ]; + nbUniqueNodes = 4; + } +>>>>>>> c5d257d... SMESH: Make it compatibel to VTK 6.0 + else + isOk = false; + } + else + isOk = false; + break; + case 8: { + if(elem->IsQuadratic()) { // Quadratic quadrangle + // 1 5 2 + // +---+---+ + // | | + // | | + // 4+ +6 + // | | + // | | + // +---+---+ + // 0 7 3 + isOk = false; + if(nbRepl==3) { + nbUniqueNodes = 6; + if( iRepl[0]==0 && iRepl[1]==1 && iRepl[2]==4 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[2]; + uniqueNodes[2] = curNodes[3]; + uniqueNodes[3] = curNodes[5]; + uniqueNodes[4] = curNodes[6]; + uniqueNodes[5] = curNodes[7]; + isOk = true; + } + if( iRepl[0]==0 && iRepl[1]==3 && iRepl[2]==7 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[1]; + uniqueNodes[2] = curNodes[2]; + uniqueNodes[3] = curNodes[4]; + uniqueNodes[4] = curNodes[5]; + uniqueNodes[5] = curNodes[6]; + isOk = true; + } + if( iRepl[0]==0 && iRepl[1]==4 && iRepl[2]==7 ) { + uniqueNodes[0] = curNodes[1]; + uniqueNodes[1] = curNodes[2]; + uniqueNodes[2] = curNodes[3]; + uniqueNodes[3] = curNodes[5]; + uniqueNodes[4] = curNodes[6]; + uniqueNodes[5] = curNodes[0]; + isOk = true; + } + if( iRepl[0]==1 && iRepl[1]==2 && iRepl[2]==5 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[1]; + uniqueNodes[2] = curNodes[3]; + uniqueNodes[3] = curNodes[4]; + uniqueNodes[4] = curNodes[6]; + uniqueNodes[5] = curNodes[7]; + isOk = true; + } + if( iRepl[0]==1 && iRepl[1]==4 && iRepl[2]==5 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[2]; + uniqueNodes[2] = curNodes[3]; + uniqueNodes[3] = curNodes[1]; + uniqueNodes[4] = curNodes[6]; + uniqueNodes[5] = curNodes[7]; + isOk = true; + } + if( iRepl[0]==2 && iRepl[1]==3 && iRepl[2]==6 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[1]; + uniqueNodes[2] = curNodes[2]; + uniqueNodes[3] = curNodes[4]; + uniqueNodes[4] = curNodes[5]; + uniqueNodes[5] = curNodes[7]; + isOk = true; + } + if( iRepl[0]==2 && iRepl[1]==5 && iRepl[2]==6 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[1]; + uniqueNodes[2] = curNodes[3]; + uniqueNodes[3] = curNodes[4]; + uniqueNodes[4] = curNodes[2]; + uniqueNodes[5] = curNodes[7]; + isOk = true; + } + if( iRepl[0]==3 && iRepl[1]==6 && iRepl[2]==7 ) { + uniqueNodes[0] = curNodes[0]; + uniqueNodes[1] = curNodes[1]; + uniqueNodes[2] = curNodes[2]; + uniqueNodes[3] = curNodes[4]; + uniqueNodes[4] = curNodes[5]; + uniqueNodes[5] = curNodes[3]; + isOk = true; + } + } + break; + } + //////////////////////////////////// HEXAHEDRON + isOk = false; + SMDS_VolumeTool hexa (elem); + hexa.SetExternalNormal(); + if ( nbUniqueNodes == 4 && nbRepl == 6 ) { + //////////////////////// ---> tetrahedron + for ( int iFace = 0; iFace < 6; iFace++ ) { + const int *ind = hexa.GetFaceNodesIndices( iFace ); // indices of face nodes + if (curNodes[ind[ 0 ]] == curNodes[ind[ 1 ]] && + curNodes[ind[ 0 ]] == curNodes[ind[ 2 ]] && + curNodes[ind[ 0 ]] == curNodes[ind[ 3 ]] ) { + // one face turns into a point ... + int iOppFace = hexa.GetOppFaceIndex( iFace ); + ind = hexa.GetFaceNodesIndices( iOppFace ); + int nbStick = 0; + iUnique = 2; // reverse a tetrahedron bottom + for ( iCur = 0; iCur < 4 && nbStick < 2; iCur++ ) { + if ( curNodes[ind[ iCur ]] == curNodes[ind[ iCur + 1 ]] ) + nbStick++; + else if ( iUnique >= 0 ) + uniqueNodes[ iUnique-- ] = curNodes[ind[ iCur ]]; + } + if ( nbStick == 1 ) { + // ... and the opposite one - into a triangle. + // set a top node + ind = hexa.GetFaceNodesIndices( iFace ); + uniqueNodes[ 3 ] = curNodes[ind[ 0 ]]; + isOk = true; + } + break; + } + } + } + else if (nbUniqueNodes == 5 && nbRepl == 4 ) { + //////////////////// HEXAHEDRON ---> 2 tetrahedrons + for ( int iFace = 0; iFace < 6; iFace++ ) { + const int *ind = hexa.GetFaceNodesIndices( iFace ); // indices of face nodes + if (curNodes[ind[ 0 ]] == curNodes[ind[ 1 ]] && + curNodes[ind[ 0 ]] == curNodes[ind[ 2 ]] && + curNodes[ind[ 0 ]] == curNodes[ind[ 3 ]] ) { + // one face turns into a point ... + int iOppFace = hexa.GetOppFaceIndex( iFace ); + ind = hexa.GetFaceNodesIndices( iOppFace ); + int nbStick = 0; + iUnique = 2; // reverse a tetrahedron 1 bottom + for ( iCur = 0; iCur < 4 && nbStick == 0; iCur++ ) { + if ( curNodes[ind[ iCur ]] == curNodes[ind[ iCur + 1 ]] ) + nbStick++; + else if ( iUnique >= 0 ) + uniqueNodes[ iUnique-- ] = curNodes[ind[ iCur ]]; + } + if ( nbStick == 0 ) { + // ... and the opposite one is a quadrangle + // set a top node + const int* indTop = hexa.GetFaceNodesIndices( iFace ); + uniqueNodes[ 3 ] = curNodes[indTop[ 0 ]]; + nbUniqueNodes = 4; + // tetrahedron 2 + SMDS_MeshElement* newElem = + aMesh->AddVolume(curNodes[ind[ 0 ]], + curNodes[ind[ 3 ]], + curNodes[ind[ 2 ]], + curNodes[indTop[ 0 ]]); + myLastCreatedElems.Append(newElem); + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + isOk = true; + } + break; + } + } + } + else if ( nbUniqueNodes == 6 && nbRepl == 4 ) { + ////////////////// HEXAHEDRON ---> 2 tetrahedrons or 1 prism + // find indices of quad and tri faces + int iQuadFace[ 6 ], iTriFace[ 6 ], nbQuad = 0, nbTri = 0, iFace; + for ( iFace = 0; iFace < 6; iFace++ ) { + const int *ind = hexa.GetFaceNodesIndices( iFace ); // indices of face nodes + nodeSet.clear(); + for ( iCur = 0; iCur < 4; iCur++ ) + nodeSet.insert( curNodes[ind[ iCur ]] ); + nbUniqueNodes = nodeSet.size(); + if ( nbUniqueNodes == 3 ) + iTriFace[ nbTri++ ] = iFace; + else if ( nbUniqueNodes == 4 ) + iQuadFace[ nbQuad++ ] = iFace; + } + if (nbQuad == 2 && nbTri == 4 && + hexa.GetOppFaceIndex( iQuadFace[ 0 ] ) == iQuadFace[ 1 ]) { + // 2 opposite quadrangles stuck with a diagonal; + // sample groups of merged indices: (0-4)(2-6) + // --------------------------------------------> 2 tetrahedrons + const int *ind1 = hexa.GetFaceNodesIndices( iQuadFace[ 0 ]); // indices of quad1 nodes + const int *ind2 = hexa.GetFaceNodesIndices( iQuadFace[ 1 ]); + int i0, i1d, i2, i3d, i0t, i2t; // d-daigonal, t-top + if (curNodes[ind1[ 0 ]] == curNodes[ind2[ 0 ]] && + curNodes[ind1[ 2 ]] == curNodes[ind2[ 2 ]]) { + // stuck with 0-2 diagonal + i0 = ind1[ 3 ]; + i1d = ind1[ 0 ]; + i2 = ind1[ 1 ]; + i3d = ind1[ 2 ]; + i0t = ind2[ 1 ]; + i2t = ind2[ 3 ]; + } + else if (curNodes[ind1[ 1 ]] == curNodes[ind2[ 3 ]] && + curNodes[ind1[ 3 ]] == curNodes[ind2[ 1 ]]) { + // stuck with 1-3 diagonal + i0 = ind1[ 0 ]; + i1d = ind1[ 1 ]; + i2 = ind1[ 2 ]; + i3d = ind1[ 3 ]; + i0t = ind2[ 0 ]; + i2t = ind2[ 1 ]; + } + else { + ASSERT(0); + } + // tetrahedron 1 + uniqueNodes[ 0 ] = curNodes [ i0 ]; + uniqueNodes[ 1 ] = curNodes [ i1d ]; + uniqueNodes[ 2 ] = curNodes [ i3d ]; + uniqueNodes[ 3 ] = curNodes [ i0t ]; + nbUniqueNodes = 4; + // tetrahedron 2 + SMDS_MeshElement* newElem = aMesh->AddVolume(curNodes[ i1d ], + curNodes[ i2 ], + curNodes[ i3d ], + curNodes[ i2t ]); + myLastCreatedElems.Append(newElem); + if ( aShapeId ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + isOk = true; + } + else if (( nbTri == 2 && nbQuad == 3 ) || // merged (0-4)(1-5) + ( nbTri == 4 && nbQuad == 2 )) { // merged (7-4)(1-5) + // --------------------------------------------> prism + // find 2 opposite triangles + nbUniqueNodes = 6; + for ( iFace = 0; iFace + 1 < nbTri; iFace++ ) { + if ( hexa.GetOppFaceIndex( iTriFace[ iFace ] ) == iTriFace[ iFace + 1 ]) { + // find indices of kept and replaced nodes + // and fill unique nodes of 2 opposite triangles + const int *ind1 = hexa.GetFaceNodesIndices( iTriFace[ iFace ]); + const int *ind2 = hexa.GetFaceNodesIndices( iTriFace[ iFace + 1 ]); + const SMDS_MeshNode** hexanodes = hexa.GetNodes(); + // fill unique nodes + iUnique = 0; + isOk = true; + for ( iCur = 0; iCur < 4 && isOk; iCur++ ) { + const SMDS_MeshNode* n = curNodes[ind1[ iCur ]]; + const SMDS_MeshNode* nInit = hexanodes[ind1[ iCur ]]; + if ( n == nInit ) { + // iCur of a linked node of the opposite face (make normals co-directed): + int iCurOpp = ( iCur == 1 || iCur == 3 ) ? 4 - iCur : iCur; + // check that correspondent corners of triangles are linked + if ( !hexa.IsLinked( ind1[ iCur ], ind2[ iCurOpp ] )) + isOk = false; + else { + uniqueNodes[ iUnique ] = n; + uniqueNodes[ iUnique + 3 ] = curNodes[ind2[ iCurOpp ]]; + iUnique++; + } + } + } + break; + } + } + } + } // if ( nbUniqueNodes == 6 && nbRepl == 4 ) + break; + } // HEXAHEDRON + + default: + isOk = false; + } // switch ( nbNodes ) + + } // if ( nbNodes != nbUniqueNodes ) // some nodes stick + + if ( isOk ) { + if (elem->IsPoly() && elem->GetType() == SMDSAbs_Volume) { + // Change nodes of polyedre + const SMDS_PolyhedralVolumeOfNodes* aPolyedre = + static_cast( elem ); + if (aPolyedre) { + int nbFaces = aPolyedre->NbFaces(); + + vector poly_nodes; + vector quantities (nbFaces); + + for (int iface = 1; iface <= nbFaces; iface++) { + int inode, nbFaceNodes = aPolyedre->NbFaceNodes(iface); + quantities[iface - 1] = nbFaceNodes; + + for (inode = 1; inode <= nbFaceNodes; inode++) { + const SMDS_MeshNode* curNode = aPolyedre->GetFaceNode(iface, inode); + + TNodeNodeMap::iterator nnIt = nodeNodeMap.find( curNode ); + if (nnIt != nodeNodeMap.end()) { // curNode sticks + curNode = (*nnIt).second; + } + poly_nodes.push_back(curNode); + } + } + aMesh->ChangePolyhedronNodes( elem, poly_nodes, quantities ); + } + } + else { + // Change regular element or polygon + aMesh->ChangeElementNodes( elem, & uniqueNodes[0], nbUniqueNodes ); + } + } + else { + // Remove invalid regular element or invalid polygon + rmElemIds.push_back( elem->GetID() ); + } + + } // loop on elements + + // Remove equal nodes and bad elements + + Remove( rmNodeIds, true ); + Remove( rmElemIds, false ); + +} + + +// ======================================================== +// class : SortableElement +// purpose : allow sorting elements basing on their nodes +// ======================================================== +class SortableElement : public set +{ + public: + + SortableElement( const SMDS_MeshElement* theElem ) + { + myElem = theElem; + SMDS_ElemIteratorPtr nodeIt = theElem->nodesIterator(); + while ( nodeIt->more() ) + this->insert( nodeIt->next() ); + } + + const SMDS_MeshElement* Get() const + { return myElem; } + + void Set(const SMDS_MeshElement* e) const + { myElem = e; } + + + private: + mutable const SMDS_MeshElement* myElem; +}; + +//======================================================================= +//function : FindEqualElements +//purpose : Return list of group of elements built on the same nodes. +// Search among theElements or in the whole mesh if theElements is empty +//======================================================================= +void SMESH_MeshEditor::FindEqualElements(set & theElements, + TListOfListOfElementsID & theGroupsOfElementsID) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + typedef set TElemsSet; + typedef map< SortableElement, int > TMapOfNodeSet; + typedef list TGroupOfElems; + + TElemsSet elems; + if ( theElements.empty() ) + { // get all elements in the mesh + SMDS_ElemIteratorPtr eIt = GetMeshDS()->elementsIterator(); + while ( eIt->more() ) + elems.insert( elems.end(), eIt->next()); + } + else + elems = theElements; + + vector< TGroupOfElems > arrayOfGroups; + TGroupOfElems groupOfElems; + TMapOfNodeSet mapOfNodeSet; + + TElemsSet::iterator elemIt = elems.begin(); + for ( int i = 0, j=0; elemIt != elems.end(); ++elemIt, ++j ) { + const SMDS_MeshElement* curElem = *elemIt; + SortableElement SE(curElem); + int ind = -1; + // check uniqueness + pair< TMapOfNodeSet::iterator, bool> pp = mapOfNodeSet.insert(make_pair(SE, i)); + if( !(pp.second) ) { + TMapOfNodeSet::iterator& itSE = pp.first; + ind = (*itSE).second; + arrayOfGroups[ind].push_back(curElem->GetID()); + } + else { + groupOfElems.clear(); + groupOfElems.push_back(curElem->GetID()); + arrayOfGroups.push_back(groupOfElems); + i++; + } + } + + vector< TGroupOfElems >::iterator groupIt = arrayOfGroups.begin(); + for ( ; groupIt != arrayOfGroups.end(); ++groupIt ) { + groupOfElems = *groupIt; + if ( groupOfElems.size() > 1 ) { + groupOfElems.sort(); + theGroupsOfElementsID.push_back(groupOfElems); + } + } +} + +//======================================================================= +//function : MergeElements +//purpose : In each given group, substitute all elements by the first one. +//======================================================================= + +void SMESH_MeshEditor::MergeElements(TListOfListOfElementsID & theGroupsOfElementsID) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + typedef list TListOfIDs; + TListOfIDs rmElemIds; // IDs of elems to remove + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + TListOfListOfElementsID::iterator groupsIt = theGroupsOfElementsID.begin(); + while ( groupsIt != theGroupsOfElementsID.end() ) { + TListOfIDs& aGroupOfElemID = *groupsIt; + aGroupOfElemID.sort(); + int elemIDToKeep = aGroupOfElemID.front(); + const SMDS_MeshElement* elemToKeep = aMesh->FindElement(elemIDToKeep); + aGroupOfElemID.pop_front(); + TListOfIDs::iterator idIt = aGroupOfElemID.begin(); + while ( idIt != aGroupOfElemID.end() ) { + int elemIDToRemove = *idIt; + const SMDS_MeshElement* elemToRemove = aMesh->FindElement(elemIDToRemove); + // add the kept element in groups of removed one (PAL15188) + AddToSameGroups( elemToKeep, elemToRemove, aMesh ); + rmElemIds.push_back( elemIDToRemove ); + ++idIt; + } + ++groupsIt; + } + + Remove( rmElemIds, false ); +} + +//======================================================================= +//function : MergeEqualElements +//purpose : Remove all but one of elements built on the same nodes. +//======================================================================= + +void SMESH_MeshEditor::MergeEqualElements() +{ + set aMeshElements; /* empty input - + to merge equal elements in the whole mesh */ + TListOfListOfElementsID aGroupsOfElementsID; + FindEqualElements(aMeshElements, aGroupsOfElementsID); + MergeElements(aGroupsOfElementsID); +} + +//======================================================================= +//function : FindFaceInSet +//purpose : Return a face having linked nodes n1 and n2 and which is +// - not in avoidSet, +// - in elemSet provided that !elemSet.empty() +//======================================================================= + +const SMDS_MeshElement* + SMESH_MeshEditor::FindFaceInSet(const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const TIDSortedElemSet& elemSet, + const TIDSortedElemSet& avoidSet) + +{ + SMDS_ElemIteratorPtr invElemIt = n1->GetInverseElementIterator(SMDSAbs_Face); + while ( invElemIt->more() ) { // loop on inverse elements of n1 + const SMDS_MeshElement* elem = invElemIt->next(); + if (avoidSet.find( elem ) != avoidSet.end() ) + continue; + if ( !elemSet.empty() && elemSet.find( elem ) == elemSet.end()) + continue; + // get face nodes and find index of n1 + int i1, nbN = elem->NbNodes(), iNode = 0; + //const SMDS_MeshNode* faceNodes[ nbN ], *n; + vector faceNodes( nbN ); + const SMDS_MeshNode* n; + SMDS_ElemIteratorPtr nIt = elem->nodesIterator(); + while ( nIt->more() ) { + faceNodes[ iNode ] = static_cast( nIt->next() ); + if ( faceNodes[ iNode++ ] == n1 ) + i1 = iNode - 1; + } + // find a n2 linked to n1 + if(!elem->IsQuadratic()) { + for ( iNode = 0; iNode < 2; iNode++ ) { + if ( iNode ) // node before n1 + n = faceNodes[ i1 == 0 ? nbN - 1 : i1 - 1 ]; + else // node after n1 + n = faceNodes[ i1 + 1 == nbN ? 0 : i1 + 1 ]; + if ( n == n2 ) + return elem; + } + } + else { // analysis for quadratic elements + bool IsFind = false; + // check using only corner nodes + for ( iNode = 0; iNode < 2; iNode++ ) { + if ( iNode ) // node before n1 + n = faceNodes[ i1 == 0 ? nbN/2 - 1 : i1 - 1 ]; + else // node after n1 + n = faceNodes[ i1 + 1 == nbN/2 ? 0 : i1 + 1 ]; + if ( n == n2 ) + IsFind = true; + } + if(IsFind) { + return elem; + } + else { + // check using all nodes + const SMDS_QuadraticFaceOfNodes* F = + static_cast(elem); + // use special nodes iterator + iNode = 0; + SMDS_NodeIteratorPtr anIter = F->interlacedNodesIterator(); + while ( anIter->more() ) { + faceNodes[iNode] = static_cast(anIter->next()); + if ( faceNodes[ iNode++ ] == n1 ) + i1 = iNode - 1; + } + for ( iNode = 0; iNode < 2; iNode++ ) { + if ( iNode ) // node before n1 + n = faceNodes[ i1 == 0 ? nbN - 1 : i1 - 1 ]; + else // node after n1 + n = faceNodes[ i1 + 1 == nbN ? 0 : i1 + 1 ]; + if ( n == n2 ) { + return elem; + } + } + } + } // end analysis for quadratic elements + } + return 0; +} + +//======================================================================= +//function : findAdjacentFace +//purpose : +//======================================================================= + +static const SMDS_MeshElement* findAdjacentFace(const SMDS_MeshNode* n1, + const SMDS_MeshNode* n2, + const SMDS_MeshElement* elem) +{ + TIDSortedElemSet elemSet, avoidSet; + if ( elem ) + avoidSet.insert ( elem ); + return SMESH_MeshEditor::FindFaceInSet( n1, n2, elemSet, avoidSet ); +} + +//======================================================================= +//function : FindFreeBorder +//purpose : +//======================================================================= + +#define ControlFreeBorder SMESH::Controls::FreeEdges::IsFreeEdge + +bool SMESH_MeshEditor::FindFreeBorder (const SMDS_MeshNode* theFirstNode, + const SMDS_MeshNode* theSecondNode, + const SMDS_MeshNode* theLastNode, + list< const SMDS_MeshNode* > & theNodes, + list< const SMDS_MeshElement* >& theFaces) +{ + if ( !theFirstNode || !theSecondNode ) + return false; + // find border face between theFirstNode and theSecondNode + const SMDS_MeshElement* curElem = findAdjacentFace( theFirstNode, theSecondNode, 0 ); + if ( !curElem ) + return false; + + theFaces.push_back( curElem ); + theNodes.push_back( theFirstNode ); + theNodes.push_back( theSecondNode ); + + //vector nodes; + const SMDS_MeshNode *nIgnore = theFirstNode, *nStart = theSecondNode; + set < const SMDS_MeshElement* > foundElems; + bool needTheLast = ( theLastNode != 0 ); + + while ( nStart != theLastNode ) { + if ( nStart == theFirstNode ) + return !needTheLast; + + // find all free border faces sharing form nStart + + list< const SMDS_MeshElement* > curElemList; + list< const SMDS_MeshNode* > nStartList; + SMDS_ElemIteratorPtr invElemIt = nStart->GetInverseElementIterator(SMDSAbs_Face); + while ( invElemIt->more() ) { + const SMDS_MeshElement* e = invElemIt->next(); + if ( e == curElem || foundElems.insert( e ).second ) { + // get nodes + int iNode = 0, nbNodes = e->NbNodes(); + //const SMDS_MeshNode* nodes[nbNodes+1]; + vector nodes(nbNodes+1); + + if(e->IsQuadratic()) { + const SMDS_QuadraticFaceOfNodes* F = + static_cast(e); + // use special nodes iterator + SMDS_NodeIteratorPtr anIter = F->interlacedNodesIterator(); + while( anIter->more() ) { + nodes[ iNode++ ] = anIter->next(); + } + } + else { + SMDS_ElemIteratorPtr nIt = e->nodesIterator(); + while ( nIt->more() ) + nodes[ iNode++ ] = static_cast( nIt->next() ); + } + nodes[ iNode ] = nodes[ 0 ]; + // check 2 links + for ( iNode = 0; iNode < nbNodes; iNode++ ) + if (((nodes[ iNode ] == nStart && nodes[ iNode + 1] != nIgnore ) || + (nodes[ iNode + 1] == nStart && nodes[ iNode ] != nIgnore )) && + ControlFreeBorder( &nodes[ iNode ], e->GetID() )) + { + nStartList.push_back( nodes[ iNode + ( nodes[ iNode ] == nStart ? 1 : 0 )]); + curElemList.push_back( e ); + } + } + } + // analyse the found + + int nbNewBorders = curElemList.size(); + if ( nbNewBorders == 0 ) { + // no free border furthermore + return !needTheLast; + } + else if ( nbNewBorders == 1 ) { + // one more element found + nIgnore = nStart; + nStart = nStartList.front(); + curElem = curElemList.front(); + theFaces.push_back( curElem ); + theNodes.push_back( nStart ); + } + else { + // several continuations found + list< const SMDS_MeshElement* >::iterator curElemIt; + list< const SMDS_MeshNode* >::iterator nStartIt; + // check if one of them reached the last node + if ( needTheLast ) { + for (curElemIt = curElemList.begin(), nStartIt = nStartList.begin(); + curElemIt!= curElemList.end(); + curElemIt++, nStartIt++ ) + if ( *nStartIt == theLastNode ) { + theFaces.push_back( *curElemIt ); + theNodes.push_back( *nStartIt ); + return true; + } + } + // find the best free border by the continuations + list contNodes[ 2 ], *cNL; + list contFaces[ 2 ], *cFL; + for (curElemIt = curElemList.begin(), nStartIt = nStartList.begin(); + curElemIt!= curElemList.end(); + curElemIt++, nStartIt++ ) + { + cNL = & contNodes[ contNodes[0].empty() ? 0 : 1 ]; + cFL = & contFaces[ contFaces[0].empty() ? 0 : 1 ]; + // find one more free border + if ( ! FindFreeBorder( nStart, *nStartIt, theLastNode, *cNL, *cFL )) { + cNL->clear(); + cFL->clear(); + } + else if ( !contNodes[0].empty() && !contNodes[1].empty() ) { + // choice: clear a worse one + int iLongest = ( contNodes[0].size() < contNodes[1].size() ? 1 : 0 ); + int iWorse = ( needTheLast ? 1 - iLongest : iLongest ); + contNodes[ iWorse ].clear(); + contFaces[ iWorse ].clear(); + } + } + if ( contNodes[0].empty() && contNodes[1].empty() ) + return false; + + // append the best free border + cNL = & contNodes[ contNodes[0].empty() ? 1 : 0 ]; + cFL = & contFaces[ contFaces[0].empty() ? 1 : 0 ]; + theNodes.pop_back(); // remove nIgnore + theNodes.pop_back(); // remove nStart + theFaces.pop_back(); // remove curElem + list< const SMDS_MeshNode* >::iterator nIt = cNL->begin(); + list< const SMDS_MeshElement* >::iterator fIt = cFL->begin(); + for ( ; nIt != cNL->end(); nIt++ ) theNodes.push_back( *nIt ); + for ( ; fIt != cFL->end(); fIt++ ) theFaces.push_back( *fIt ); + return true; + + } // several continuations found + } // while ( nStart != theLastNode ) + + return true; +} + +//======================================================================= +//function : CheckFreeBorderNodes +//purpose : Return true if the tree nodes are on a free border +//======================================================================= + +bool SMESH_MeshEditor::CheckFreeBorderNodes(const SMDS_MeshNode* theNode1, + const SMDS_MeshNode* theNode2, + const SMDS_MeshNode* theNode3) +{ + list< const SMDS_MeshNode* > nodes; + list< const SMDS_MeshElement* > faces; + return FindFreeBorder( theNode1, theNode2, theNode3, nodes, faces); +} + +//======================================================================= +//function : SewFreeBorder +//purpose : +//======================================================================= + +SMESH_MeshEditor::Sew_Error + SMESH_MeshEditor::SewFreeBorder (const SMDS_MeshNode* theBordFirstNode, + const SMDS_MeshNode* theBordSecondNode, + const SMDS_MeshNode* theBordLastNode, + const SMDS_MeshNode* theSideFirstNode, + const SMDS_MeshNode* theSideSecondNode, + const SMDS_MeshNode* theSideThirdNode, + const bool theSideIsFreeBorder, + const bool toCreatePolygons, + const bool toCreatePolyedrs) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE("::SewFreeBorder()"); + Sew_Error aResult = SEW_OK; + + // ==================================== + // find side nodes and elements + // ==================================== + + list< const SMDS_MeshNode* > nSide[ 2 ]; + list< const SMDS_MeshElement* > eSide[ 2 ]; + list< const SMDS_MeshNode* >::iterator nIt[ 2 ]; + list< const SMDS_MeshElement* >::iterator eIt[ 2 ]; + + // Free border 1 + // -------------- + if (!FindFreeBorder(theBordFirstNode,theBordSecondNode,theBordLastNode, + nSide[0], eSide[0])) { + MESSAGE(" Free Border 1 not found " ); + aResult = SEW_BORDER1_NOT_FOUND; + } + if (theSideIsFreeBorder) { + // Free border 2 + // -------------- + if (!FindFreeBorder(theSideFirstNode, theSideSecondNode, theSideThirdNode, + nSide[1], eSide[1])) { + MESSAGE(" Free Border 2 not found " ); + aResult = ( aResult != SEW_OK ? SEW_BOTH_BORDERS_NOT_FOUND : SEW_BORDER2_NOT_FOUND ); + } + } + if ( aResult != SEW_OK ) + return aResult; + + if (!theSideIsFreeBorder) { + // Side 2 + // -------------- + + // ------------------------------------------------------------------------- + // Algo: + // 1. If nodes to merge are not coincident, move nodes of the free border + // from the coord sys defined by the direction from the first to last + // nodes of the border to the correspondent sys of the side 2 + // 2. On the side 2, find the links most co-directed with the correspondent + // links of the free border + // ------------------------------------------------------------------------- + + // 1. Since sewing may brake if there are volumes to split on the side 2, + // we wont move nodes but just compute new coordinates for them + typedef map TNodeXYZMap; + TNodeXYZMap nBordXYZ; + list< const SMDS_MeshNode* >& bordNodes = nSide[ 0 ]; + list< const SMDS_MeshNode* >::iterator nBordIt; + + gp_XYZ Pb1( theBordFirstNode->X(), theBordFirstNode->Y(), theBordFirstNode->Z() ); + gp_XYZ Pb2( theBordLastNode->X(), theBordLastNode->Y(), theBordLastNode->Z() ); + gp_XYZ Ps1( theSideFirstNode->X(), theSideFirstNode->Y(), theSideFirstNode->Z() ); + gp_XYZ Ps2( theSideSecondNode->X(), theSideSecondNode->Y(), theSideSecondNode->Z() ); + double tol2 = 1.e-8; + gp_Vec Vbs1( Pb1 - Ps1 ),Vbs2( Pb2 - Ps2 ); + if ( Vbs1.SquareMagnitude() > tol2 || Vbs2.SquareMagnitude() > tol2 ) { + // Need node movement. + + // find X and Z axes to create trsf + gp_Vec Zb( Pb1 - Pb2 ), Zs( Ps1 - Ps2 ); + gp_Vec X = Zs ^ Zb; + if ( X.SquareMagnitude() <= gp::Resolution() * gp::Resolution() ) + // Zb || Zs + X = gp_Ax2( gp::Origin(), Zb ).XDirection(); + + // coord systems + gp_Ax3 toBordAx( Pb1, Zb, X ); + gp_Ax3 fromSideAx( Ps1, Zs, X ); + gp_Ax3 toGlobalAx( gp::Origin(), gp::DZ(), gp::DX() ); + // set trsf + gp_Trsf toBordSys, fromSide2Sys; + toBordSys.SetTransformation( toBordAx ); + fromSide2Sys.SetTransformation( fromSideAx, toGlobalAx ); + fromSide2Sys.SetScaleFactor( Zs.Magnitude() / Zb.Magnitude() ); + + // move + for ( nBordIt = bordNodes.begin(); nBordIt != bordNodes.end(); nBordIt++ ) { + const SMDS_MeshNode* n = *nBordIt; + gp_XYZ xyz( n->X(),n->Y(),n->Z() ); + toBordSys.Transforms( xyz ); + fromSide2Sys.Transforms( xyz ); + nBordXYZ.insert( TNodeXYZMap::value_type( n, xyz )); + } + } + else { + // just insert nodes XYZ in the nBordXYZ map + for ( nBordIt = bordNodes.begin(); nBordIt != bordNodes.end(); nBordIt++ ) { + const SMDS_MeshNode* n = *nBordIt; + nBordXYZ.insert( TNodeXYZMap::value_type( n, gp_XYZ( n->X(),n->Y(),n->Z() ))); + } + } + + // 2. On the side 2, find the links most co-directed with the correspondent + // links of the free border + + list< const SMDS_MeshElement* >& sideElems = eSide[ 1 ]; + list< const SMDS_MeshNode* >& sideNodes = nSide[ 1 ]; + sideNodes.push_back( theSideFirstNode ); + + bool hasVolumes = false; + LinkID_Gen aLinkID_Gen( GetMeshDS() ); + set foundSideLinkIDs, checkedLinkIDs; + SMDS_VolumeTool volume; + //const SMDS_MeshNode* faceNodes[ 4 ]; + + const SMDS_MeshNode* sideNode; + const SMDS_MeshElement* sideElem; + const SMDS_MeshNode* prevSideNode = theSideFirstNode; + const SMDS_MeshNode* prevBordNode = theBordFirstNode; + nBordIt = bordNodes.begin(); + nBordIt++; + // border node position and border link direction to compare with + gp_XYZ bordPos = nBordXYZ[ *nBordIt ]; + gp_XYZ bordDir = bordPos - nBordXYZ[ prevBordNode ]; + // choose next side node by link direction or by closeness to + // the current border node: + bool searchByDir = ( *nBordIt != theBordLastNode ); + do { + // find the next node on the Side 2 + sideNode = 0; + double maxDot = -DBL_MAX, minDist = DBL_MAX; + long linkID; + checkedLinkIDs.clear(); + gp_XYZ prevXYZ( prevSideNode->X(), prevSideNode->Y(), prevSideNode->Z() ); + + // loop on inverse elements of current node (prevSideNode) on the Side 2 + SMDS_ElemIteratorPtr invElemIt = prevSideNode->GetInverseElementIterator(); + while ( invElemIt->more() ) + { + const SMDS_MeshElement* elem = invElemIt->next(); + // prepare data for a loop on links coming to prevSideNode, of a face or a volume + int iPrevNode, iNode = 0, nbNodes = elem->NbNodes(); + vector< const SMDS_MeshNode* > faceNodes( nbNodes, (const SMDS_MeshNode*)0 ); + bool isVolume = volume.Set( elem ); + const SMDS_MeshNode** nodes = isVolume ? volume.GetNodes() : & faceNodes[0]; + if ( isVolume ) // --volume + hasVolumes = true; + else if ( elem->GetType()==SMDSAbs_Face ) { // --face + // retrieve all face nodes and find iPrevNode - an index of the prevSideNode + if(elem->IsQuadratic()) { + const SMDS_QuadraticFaceOfNodes* F = + static_cast(elem); + // use special nodes iterator + SMDS_NodeIteratorPtr anIter = F->interlacedNodesIterator(); + while( anIter->more() ) { + nodes[ iNode ] = anIter->next(); + if ( nodes[ iNode++ ] == prevSideNode ) + iPrevNode = iNode - 1; + } + } + else { + SMDS_ElemIteratorPtr nIt = elem->nodesIterator(); + while ( nIt->more() ) { + nodes[ iNode ] = cast2Node( nIt->next() ); + if ( nodes[ iNode++ ] == prevSideNode ) + iPrevNode = iNode - 1; + } + } + // there are 2 links to check + nbNodes = 2; + } + else // --edge + continue; + // loop on links, to be precise, on the second node of links + for ( iNode = 0; iNode < nbNodes; iNode++ ) { + const SMDS_MeshNode* n = nodes[ iNode ]; + if ( isVolume ) { + if ( !volume.IsLinked( n, prevSideNode )) + continue; + } + else { + if ( iNode ) // a node before prevSideNode + n = nodes[ iPrevNode == 0 ? elem->NbNodes() - 1 : iPrevNode - 1 ]; + else // a node after prevSideNode + n = nodes[ iPrevNode + 1 == elem->NbNodes() ? 0 : iPrevNode + 1 ]; + } + // check if this link was already used + long iLink = aLinkID_Gen.GetLinkID( prevSideNode, n ); + bool isJustChecked = !checkedLinkIDs.insert( iLink ).second; + if (!isJustChecked && + foundSideLinkIDs.find( iLink ) == foundSideLinkIDs.end() ) + { + // test a link geometrically + gp_XYZ nextXYZ ( n->X(), n->Y(), n->Z() ); + bool linkIsBetter = false; + double dot = 0.0, dist = 0.0; + if ( searchByDir ) { // choose most co-directed link + dot = bordDir * ( nextXYZ - prevXYZ ).Normalized(); + linkIsBetter = ( dot > maxDot ); + } + else { // choose link with the node closest to bordPos + dist = ( nextXYZ - bordPos ).SquareModulus(); + linkIsBetter = ( dist < minDist ); + } + if ( linkIsBetter ) { + maxDot = dot; + minDist = dist; + linkID = iLink; + sideNode = n; + sideElem = elem; + } + } + } + } // loop on inverse elements of prevSideNode + + if ( !sideNode ) { + MESSAGE(" Cant find path by links of the Side 2 "); + return SEW_BAD_SIDE_NODES; + } + sideNodes.push_back( sideNode ); + sideElems.push_back( sideElem ); + foundSideLinkIDs.insert ( linkID ); + prevSideNode = sideNode; + + if ( *nBordIt == theBordLastNode ) + searchByDir = false; + else { + // find the next border link to compare with + gp_XYZ sidePos( sideNode->X(), sideNode->Y(), sideNode->Z() ); + searchByDir = ( bordDir * ( sidePos - bordPos ) <= 0 ); + // move to next border node if sideNode is before forward border node (bordPos) + while ( *nBordIt != theBordLastNode && !searchByDir ) { + prevBordNode = *nBordIt; + nBordIt++; + bordPos = nBordXYZ[ *nBordIt ]; + bordDir = bordPos - nBordXYZ[ prevBordNode ]; + searchByDir = ( bordDir * ( sidePos - bordPos ) <= 0 ); + } + } + } + while ( sideNode != theSideSecondNode ); + + if ( hasVolumes && sideNodes.size () != bordNodes.size() && !toCreatePolyedrs) { + MESSAGE("VOLUME SPLITTING IS FORBIDDEN"); + return SEW_VOLUMES_TO_SPLIT; // volume splitting is forbidden + } + } // end nodes search on the side 2 + + // ============================ + // sew the border to the side 2 + // ============================ + + int nbNodes[] = { (int)nSide[0].size(), (int)nSide[1].size() }; + int maxNbNodes = Max( nbNodes[0], nbNodes[1] ); + + TListOfListOfNodes nodeGroupsToMerge; + if ( nbNodes[0] == nbNodes[1] || + ( theSideIsFreeBorder && !theSideThirdNode)) { + + // all nodes are to be merged + + for (nIt[0] = nSide[0].begin(), nIt[1] = nSide[1].begin(); + nIt[0] != nSide[0].end() && nIt[1] != nSide[1].end(); + nIt[0]++, nIt[1]++ ) + { + nodeGroupsToMerge.push_back( list() ); + nodeGroupsToMerge.back().push_back( *nIt[1] ); // to keep + nodeGroupsToMerge.back().push_back( *nIt[0] ); // to remove + } + } + else { + + // insert new nodes into the border and the side to get equal nb of segments + + // get normalized parameters of nodes on the borders + //double param[ 2 ][ maxNbNodes ]; + double* param[ 2 ]; + param[0] = new double [ maxNbNodes ]; + param[1] = new double [ maxNbNodes ]; + int iNode, iBord; + for ( iBord = 0; iBord < 2; iBord++ ) { // loop on 2 borders + list< const SMDS_MeshNode* >& nodes = nSide[ iBord ]; + list< const SMDS_MeshNode* >::iterator nIt = nodes.begin(); + const SMDS_MeshNode* nPrev = *nIt; + double bordLength = 0; + for ( iNode = 0; nIt != nodes.end(); nIt++, iNode++ ) { // loop on border nodes + const SMDS_MeshNode* nCur = *nIt; + gp_XYZ segment (nCur->X() - nPrev->X(), + nCur->Y() - nPrev->Y(), + nCur->Z() - nPrev->Z()); + double segmentLen = segment.Modulus(); + bordLength += segmentLen; + param[ iBord ][ iNode ] = bordLength; + nPrev = nCur; + } + // normalize within [0,1] + for ( iNode = 0; iNode < nbNodes[ iBord ]; iNode++ ) { + param[ iBord ][ iNode ] /= bordLength; + } + } + + // loop on border segments + const SMDS_MeshNode *nPrev[ 2 ] = { 0, 0 }; + int i[ 2 ] = { 0, 0 }; + nIt[0] = nSide[0].begin(); eIt[0] = eSide[0].begin(); + nIt[1] = nSide[1].begin(); eIt[1] = eSide[1].begin(); + + TElemOfNodeListMap insertMap; + TElemOfNodeListMap::iterator insertMapIt; + // insertMap is + // key: elem to insert nodes into + // value: 2 nodes to insert between + nodes to be inserted + do { + bool next[ 2 ] = { false, false }; + + // find min adjacent segment length after sewing + double nextParam = 10., prevParam = 0; + for ( iBord = 0; iBord < 2; iBord++ ) { // loop on 2 borders + if ( i[ iBord ] + 1 < nbNodes[ iBord ]) + nextParam = Min( nextParam, param[iBord][ i[iBord] + 1 ]); + if ( i[ iBord ] > 0 ) + prevParam = Max( prevParam, param[iBord][ i[iBord] - 1 ]); + } + double minParam = Min( param[ 0 ][ i[0] ], param[ 1 ][ i[1] ]); + double maxParam = Max( param[ 0 ][ i[0] ], param[ 1 ][ i[1] ]); + double minSegLen = Min( nextParam - minParam, maxParam - prevParam ); + + // choose to insert or to merge nodes + double du = param[ 1 ][ i[1] ] - param[ 0 ][ i[0] ]; + if ( Abs( du ) <= minSegLen * 0.2 ) { + // merge + // ------ + nodeGroupsToMerge.push_back( list() ); + const SMDS_MeshNode* n0 = *nIt[0]; + const SMDS_MeshNode* n1 = *nIt[1]; + nodeGroupsToMerge.back().push_back( n1 ); + nodeGroupsToMerge.back().push_back( n0 ); + // position of node of the border changes due to merge + param[ 0 ][ i[0] ] += du; + // move n1 for the sake of elem shape evaluation during insertion. + // n1 will be removed by MergeNodes() anyway + const_cast( n0 )->setXYZ( n1->X(), n1->Y(), n1->Z() ); + next[0] = next[1] = true; + } + else { + // insert + // ------ + int intoBord = ( du < 0 ) ? 0 : 1; + const SMDS_MeshElement* elem = *eIt[ intoBord ]; + const SMDS_MeshNode* n1 = nPrev[ intoBord ]; + const SMDS_MeshNode* n2 = *nIt[ intoBord ]; + const SMDS_MeshNode* nIns = *nIt[ 1 - intoBord ]; + if ( intoBord == 1 ) { + // move node of the border to be on a link of elem of the side + gp_XYZ p1 (n1->X(), n1->Y(), n1->Z()); + gp_XYZ p2 (n2->X(), n2->Y(), n2->Z()); + double ratio = du / ( param[ 1 ][ i[1] ] - param[ 1 ][ i[1]-1 ]); + gp_XYZ p = p2 * ( 1 - ratio ) + p1 * ratio; + GetMeshDS()->MoveNode( nIns, p.X(), p.Y(), p.Z() ); + } + insertMapIt = insertMap.find( elem ); + bool notFound = ( insertMapIt == insertMap.end() ); + bool otherLink = ( !notFound && (*insertMapIt).second.front() != n1 ); + if ( otherLink ) { + // insert into another link of the same element: + // 1. perform insertion into the other link of the elem + list & nodeList = (*insertMapIt).second; + const SMDS_MeshNode* n12 = nodeList.front(); nodeList.pop_front(); + const SMDS_MeshNode* n22 = nodeList.front(); nodeList.pop_front(); + InsertNodesIntoLink( elem, n12, n22, nodeList, toCreatePolygons ); + // 2. perform insertion into the link of adjacent faces + while (true) { + const SMDS_MeshElement* adjElem = findAdjacentFace( n12, n22, elem ); + if ( adjElem ) + InsertNodesIntoLink( adjElem, n12, n22, nodeList, toCreatePolygons ); + else + break; + } + if (toCreatePolyedrs) { + // perform insertion into the links of adjacent volumes + UpdateVolumes(n12, n22, nodeList); + } + // 3. find an element appeared on n1 and n2 after the insertion + insertMap.erase( elem ); + elem = findAdjacentFace( n1, n2, 0 ); + } + if ( notFound || otherLink ) { + // add element and nodes of the side into the insertMap + insertMapIt = insertMap.insert + ( TElemOfNodeListMap::value_type( elem, list() )).first; + (*insertMapIt).second.push_back( n1 ); + (*insertMapIt).second.push_back( n2 ); + } + // add node to be inserted into elem + (*insertMapIt).second.push_back( nIns ); + next[ 1 - intoBord ] = true; + } + + // go to the next segment + for ( iBord = 0; iBord < 2; iBord++ ) { // loop on 2 borders + if ( next[ iBord ] ) { + if ( i[ iBord ] != 0 && eIt[ iBord ] != eSide[ iBord ].end()) + eIt[ iBord ]++; + nPrev[ iBord ] = *nIt[ iBord ]; + nIt[ iBord ]++; i[ iBord ]++; + } + } + } + while ( nIt[0] != nSide[0].end() && nIt[1] != nSide[1].end()); + + // perform insertion of nodes into elements + + for (insertMapIt = insertMap.begin(); + insertMapIt != insertMap.end(); + insertMapIt++ ) + { + const SMDS_MeshElement* elem = (*insertMapIt).first; + list & nodeList = (*insertMapIt).second; + const SMDS_MeshNode* n1 = nodeList.front(); nodeList.pop_front(); + const SMDS_MeshNode* n2 = nodeList.front(); nodeList.pop_front(); + + InsertNodesIntoLink( elem, n1, n2, nodeList, toCreatePolygons ); + + if ( !theSideIsFreeBorder ) { + // look for and insert nodes into the faces adjacent to elem + while (true) { + const SMDS_MeshElement* adjElem = findAdjacentFace( n1, n2, elem ); + if ( adjElem ) + InsertNodesIntoLink( adjElem, n1, n2, nodeList, toCreatePolygons ); + else + break; + } + } + if (toCreatePolyedrs) { + // perform insertion into the links of adjacent volumes + UpdateVolumes(n1, n2, nodeList); + } + } + + delete param[0]; + delete param[1]; + } // end: insert new nodes + + MergeNodes ( nodeGroupsToMerge ); + + return aResult; +} + +//======================================================================= +//function : InsertNodesIntoLink +//purpose : insert theNodesToInsert into theFace between theBetweenNode1 +// and theBetweenNode2 and split theElement +//======================================================================= + +void SMESH_MeshEditor::InsertNodesIntoLink(const SMDS_MeshElement* theFace, + const SMDS_MeshNode* theBetweenNode1, + const SMDS_MeshNode* theBetweenNode2, + list& theNodesToInsert, + const bool toCreatePoly) +{ + if ( theFace->GetType() != SMDSAbs_Face ) return; + + // find indices of 2 link nodes and of the rest nodes + int iNode = 0, il1, il2, i3, i4; + il1 = il2 = i3 = i4 = -1; + //const SMDS_MeshNode* nodes[ theFace->NbNodes() ]; + vector nodes( theFace->NbNodes() ); + + if(theFace->IsQuadratic()) { + const SMDS_QuadraticFaceOfNodes* F = + static_cast(theFace); + // use special nodes iterator + SMDS_NodeIteratorPtr anIter = F->interlacedNodesIterator(); + while( anIter->more() ) { + const SMDS_MeshNode* n = anIter->next(); + if ( n == theBetweenNode1 ) + il1 = iNode; + else if ( n == theBetweenNode2 ) + il2 = iNode; + else if ( i3 < 0 ) + i3 = iNode; + else + i4 = iNode; + nodes[ iNode++ ] = n; + } + } + else { + SMDS_ElemIteratorPtr nodeIt = theFace->nodesIterator(); + while ( nodeIt->more() ) { + const SMDS_MeshNode* n = static_cast( nodeIt->next() ); + if ( n == theBetweenNode1 ) + il1 = iNode; + else if ( n == theBetweenNode2 ) + il2 = iNode; + else if ( i3 < 0 ) + i3 = iNode; + else + i4 = iNode; + nodes[ iNode++ ] = n; + } + } + if ( il1 < 0 || il2 < 0 || i3 < 0 ) + return ; + + // arrange link nodes to go one after another regarding the face orientation + bool reverse = ( Abs( il2 - il1 ) == 1 ? il2 < il1 : il1 < il2 ); + list aNodesToInsert = theNodesToInsert; + if ( reverse ) { + iNode = il1; + il1 = il2; + il2 = iNode; + aNodesToInsert.reverse(); + } + // check that not link nodes of a quadrangles are in good order + int nbFaceNodes = theFace->NbNodes(); + if ( nbFaceNodes == 4 && i4 - i3 != 1 ) { + iNode = i3; + i3 = i4; + i4 = iNode; + } + + if (toCreatePoly || theFace->IsPoly()) { + + iNode = 0; + vector poly_nodes (nbFaceNodes + aNodesToInsert.size()); + + // add nodes of face up to first node of link + bool isFLN = false; + + if(theFace->IsQuadratic()) { + const SMDS_QuadraticFaceOfNodes* F = + static_cast(theFace); + // use special nodes iterator + SMDS_NodeIteratorPtr anIter = F->interlacedNodesIterator(); + while( anIter->more() && !isFLN ) { + const SMDS_MeshNode* n = anIter->next(); + poly_nodes[iNode++] = n; + if (n == nodes[il1]) { + isFLN = true; + } + } + // add nodes to insert + list::iterator nIt = aNodesToInsert.begin(); + for (; nIt != aNodesToInsert.end(); nIt++) { + poly_nodes[iNode++] = *nIt; + } + // add nodes of face starting from last node of link + while ( anIter->more() ) { + poly_nodes[iNode++] = anIter->next(); + } + } + else { + SMDS_ElemIteratorPtr nodeIt = theFace->nodesIterator(); + while ( nodeIt->more() && !isFLN ) { + const SMDS_MeshNode* n = static_cast( nodeIt->next() ); + poly_nodes[iNode++] = n; + if (n == nodes[il1]) { + isFLN = true; + } + } + // add nodes to insert + list::iterator nIt = aNodesToInsert.begin(); + for (; nIt != aNodesToInsert.end(); nIt++) { + poly_nodes[iNode++] = *nIt; + } + // add nodes of face starting from last node of link + while ( nodeIt->more() ) { + const SMDS_MeshNode* n = static_cast( nodeIt->next() ); + poly_nodes[iNode++] = n; + } + } + + // edit or replace the face + SMESHDS_Mesh *aMesh = GetMeshDS(); + + if (theFace->IsPoly()) { + aMesh->ChangePolygonNodes(theFace, poly_nodes); + } + else { + int aShapeId = FindShape( theFace ); + + SMDS_MeshElement* newElem = aMesh->AddPolygonalFace(poly_nodes); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + + aMesh->RemoveElement(theFace); + } + return; + } + + if( !theFace->IsQuadratic() ) { + + // put aNodesToInsert between theBetweenNode1 and theBetweenNode2 + int nbLinkNodes = 2 + aNodesToInsert.size(); + //const SMDS_MeshNode* linkNodes[ nbLinkNodes ]; + vector linkNodes( nbLinkNodes ); + linkNodes[ 0 ] = nodes[ il1 ]; + linkNodes[ nbLinkNodes - 1 ] = nodes[ il2 ]; + list::iterator nIt = aNodesToInsert.begin(); + for ( iNode = 1; nIt != aNodesToInsert.end(); nIt++ ) { + linkNodes[ iNode++ ] = *nIt; + } + // decide how to split a quadrangle: compare possible variants + // and choose which of splits to be a quadrangle + int i1, i2, iSplit, nbSplits = nbLinkNodes - 1, iBestQuad; + if ( nbFaceNodes == 3 ) { + iBestQuad = nbSplits; + i4 = i3; + } + else if ( nbFaceNodes == 4 ) { + SMESH::Controls::NumericalFunctorPtr aCrit( new SMESH::Controls::AspectRatio); + double aBestRate = DBL_MAX; + for ( int iQuad = 0; iQuad < nbSplits; iQuad++ ) { + i1 = 0; i2 = 1; + double aBadRate = 0; + // evaluate elements quality + for ( iSplit = 0; iSplit < nbSplits; iSplit++ ) { + if ( iSplit == iQuad ) { + SMDS_FaceOfNodes quad (linkNodes[ i1++ ], + linkNodes[ i2++ ], + nodes[ i3 ], + nodes[ i4 ]); + aBadRate += getBadRate( &quad, aCrit ); + } + else { + SMDS_FaceOfNodes tria (linkNodes[ i1++ ], + linkNodes[ i2++ ], + nodes[ iSplit < iQuad ? i4 : i3 ]); + aBadRate += getBadRate( &tria, aCrit ); + } + } + // choice + if ( aBadRate < aBestRate ) { + iBestQuad = iQuad; + aBestRate = aBadRate; + } + } + } + + // create new elements + SMESHDS_Mesh *aMesh = GetMeshDS(); + int aShapeId = FindShape( theFace ); + + i1 = 0; i2 = 1; + for ( iSplit = 0; iSplit < nbSplits - 1; iSplit++ ) { + SMDS_MeshElement* newElem = 0; + if ( iSplit == iBestQuad ) + newElem = aMesh->AddFace (linkNodes[ i1++ ], + linkNodes[ i2++ ], + nodes[ i3 ], + nodes[ i4 ]); + else + newElem = aMesh->AddFace (linkNodes[ i1++ ], + linkNodes[ i2++ ], + nodes[ iSplit < iBestQuad ? i4 : i3 ]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + } + + // change nodes of theFace + const SMDS_MeshNode* newNodes[ 4 ]; + newNodes[ 0 ] = linkNodes[ i1 ]; + newNodes[ 1 ] = linkNodes[ i2 ]; + newNodes[ 2 ] = nodes[ iSplit >= iBestQuad ? i3 : i4 ]; + newNodes[ 3 ] = nodes[ i4 ]; + aMesh->ChangeElementNodes( theFace, newNodes, iSplit == iBestQuad ? 4 : 3 ); + } // end if(!theFace->IsQuadratic()) + else { // theFace is quadratic + // we have to split theFace on simple triangles and one simple quadrangle + int tmp = il1/2; + int nbshift = tmp*2; + // shift nodes in nodes[] by nbshift + int i,j; + for(i=0; iAddFace(nodes[3],nodes[4],nodes[5]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + if(theFace->IsMediumNode(nodes[il1])) { + // create quadrangle + newElem = aMesh->AddFace(nodes[0],nodes[1],nodes[3],nodes[5]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + n1 = 1; + n2 = 2; + n3 = 3; + } + else { + // create quadrangle + newElem = aMesh->AddFace(nodes[1],nodes[2],nodes[3],nodes[5]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + n1 = 0; + n2 = 1; + n3 = 5; + } + } + else { // nbFaceNodes==8 - quadratic quadrangle + SMDS_MeshElement* newElem = + aMesh->AddFace(nodes[3],nodes[4],nodes[5]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + newElem = aMesh->AddFace(nodes[5],nodes[6],nodes[7]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + newElem = aMesh->AddFace(nodes[5],nodes[7],nodes[3]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + if(theFace->IsMediumNode(nodes[il1])) { + // create quadrangle + newElem = aMesh->AddFace(nodes[0],nodes[1],nodes[3],nodes[7]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + n1 = 1; + n2 = 2; + n3 = 3; + } + else { + // create quadrangle + newElem = aMesh->AddFace(nodes[1],nodes[2],nodes[3],nodes[7]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + n1 = 0; + n2 = 1; + n3 = 7; + } + } + // create needed triangles using n1,n2,n3 and inserted nodes + int nbn = 2 + aNodesToInsert.size(); + //const SMDS_MeshNode* aNodes[nbn]; + vector aNodes(nbn); + aNodes[0] = nodes[n1]; + aNodes[nbn-1] = nodes[n2]; + list::iterator nIt = aNodesToInsert.begin(); + for ( iNode = 1; nIt != aNodesToInsert.end(); nIt++ ) { + aNodes[iNode++] = *nIt; + } + for(i=1; iAddFace(aNodes[i-1],aNodes[i],nodes[n3]); + myLastCreatedElems.Append(newElem); + if ( aShapeId && newElem ) + aMesh->SetMeshElementOnShape( newElem, aShapeId ); + } + // remove old quadratic face + aMesh->RemoveElement(theFace); + } +} + +//======================================================================= +//function : UpdateVolumes +//purpose : +//======================================================================= +void SMESH_MeshEditor::UpdateVolumes (const SMDS_MeshNode* theBetweenNode1, + const SMDS_MeshNode* theBetweenNode2, + list& theNodesToInsert) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + SMDS_ElemIteratorPtr invElemIt = theBetweenNode1->GetInverseElementIterator(SMDSAbs_Volume); + while (invElemIt->more()) { // loop on inverse elements of theBetweenNode1 + const SMDS_MeshElement* elem = invElemIt->next(); + + // check, if current volume has link theBetweenNode1 - theBetweenNode2 + SMDS_VolumeTool aVolume (elem); + if (!aVolume.IsLinked(theBetweenNode1, theBetweenNode2)) + continue; + + // insert new nodes in all faces of the volume, sharing link theBetweenNode1 - theBetweenNode2 + int iface, nbFaces = aVolume.NbFaces(); + vector poly_nodes; + vector quantities (nbFaces); + + for (iface = 0; iface < nbFaces; iface++) { + int nbFaceNodes = aVolume.NbFaceNodes(iface), nbInserted = 0; + // faceNodes will contain (nbFaceNodes + 1) nodes, last = first + const SMDS_MeshNode** faceNodes = aVolume.GetFaceNodes(iface); + + for (int inode = 0; inode < nbFaceNodes; inode++) { + poly_nodes.push_back(faceNodes[inode]); + + if (nbInserted == 0) { + if (faceNodes[inode] == theBetweenNode1) { + if (faceNodes[inode + 1] == theBetweenNode2) { + nbInserted = theNodesToInsert.size(); + + // add nodes to insert + list::iterator nIt = theNodesToInsert.begin(); + for (; nIt != theNodesToInsert.end(); nIt++) { + poly_nodes.push_back(*nIt); + } + } + } + else if (faceNodes[inode] == theBetweenNode2) { + if (faceNodes[inode + 1] == theBetweenNode1) { + nbInserted = theNodesToInsert.size(); + + // add nodes to insert in reversed order + list::iterator nIt = theNodesToInsert.end(); + nIt--; + for (; nIt != theNodesToInsert.begin(); nIt--) { + poly_nodes.push_back(*nIt); + } + poly_nodes.push_back(*nIt); + } + } + else { + } + } + } + quantities[iface] = nbFaceNodes + nbInserted; + } + + // Replace or update the volume + SMESHDS_Mesh *aMesh = GetMeshDS(); + + if (elem->IsPoly()) { + aMesh->ChangePolyhedronNodes(elem, poly_nodes, quantities); + + } + else { + int aShapeId = FindShape( elem ); + + SMDS_MeshElement* newElem = + aMesh->AddPolyhedralVolume(poly_nodes, quantities); + myLastCreatedElems.Append(newElem); + if (aShapeId && newElem) + aMesh->SetMeshElementOnShape(newElem, aShapeId); + + aMesh->RemoveElement(elem); + } + } +} + +//======================================================================= +/*! + * \brief Convert elements contained in a submesh to quadratic + * \retval int - nb of checked elements + */ +//======================================================================= + +int SMESH_MeshEditor::convertElemToQuadratic(SMESHDS_SubMesh * theSm, + SMESH_MesherHelper& theHelper, + const bool theForce3d) +{ + int nbElem = 0; + if( !theSm ) return nbElem; + + const bool notFromGroups = false; + SMDS_ElemIteratorPtr ElemItr = theSm->GetElements(); + while(ElemItr->more()) + { + nbElem++; + const SMDS_MeshElement* elem = ElemItr->next(); + if( !elem || elem->IsQuadratic() ) continue; + + int id = elem->GetID(); + int nbNodes = elem->NbNodes(); + vector aNds (nbNodes); + + for(int i = 0; i < nbNodes; i++) + { + aNds[i] = elem->GetNode(i); + } + SMDSAbs_ElementType aType = elem->GetType(); + + GetMeshDS()->RemoveFreeElement(elem, theSm, notFromGroups); + + const SMDS_MeshElement* NewElem = 0; + + switch( aType ) + { + case SMDSAbs_Edge : + { + NewElem = theHelper.AddEdge(aNds[0], aNds[1], id, theForce3d); + break; + } + case SMDSAbs_Face : + { + switch(nbNodes) + { + case 3: + NewElem = theHelper.AddFace(aNds[0], aNds[1], aNds[2], id, theForce3d); + break; + case 4: + NewElem = theHelper.AddFace(aNds[0], aNds[1], aNds[2], aNds[3], id, theForce3d); + break; + default: + continue; + } + break; + } + case SMDSAbs_Volume : + { + switch(nbNodes) + { + case 4: + NewElem = theHelper.AddVolume(aNds[0], aNds[1], aNds[2], aNds[3], id, theForce3d); + break; + case 6: + NewElem = theHelper.AddVolume(aNds[0], aNds[1], aNds[2], aNds[3], aNds[4], aNds[5], id, theForce3d); + break; + case 8: + NewElem = theHelper.AddVolume(aNds[0], aNds[1], aNds[2], aNds[3], + aNds[4], aNds[5], aNds[6], aNds[7], id, theForce3d); + break; + default: + continue; + } + break; + } + default : + continue; + } + ReplaceElemInGroups( elem, NewElem, GetMeshDS()); + if( NewElem ) + theSm->AddElement( NewElem ); + } + return nbElem; +} + +//======================================================================= +//function : ConvertToQuadratic +//purpose : +//======================================================================= +void SMESH_MeshEditor::ConvertToQuadratic(const bool theForce3d) +{ + SMESHDS_Mesh* meshDS = GetMeshDS(); + + SMESH_MesherHelper aHelper(*myMesh); + aHelper.SetIsQuadratic( true ); + const bool notFromGroups = false; + + int nbCheckedElems = 0; + if ( myMesh->HasShapeToMesh() ) + { + if ( SMESH_subMesh *aSubMesh = myMesh->GetSubMeshContaining(myMesh->GetShapeToMesh())) + { + SMESH_subMeshIteratorPtr smIt = aSubMesh->getDependsOnIterator(true,false); + while ( smIt->more() ) { + SMESH_subMesh* sm = smIt->next(); + if ( SMESHDS_SubMesh *smDS = sm->GetSubMeshDS() ) { + aHelper.SetSubShape( sm->GetSubShape() ); + nbCheckedElems += convertElemToQuadratic(smDS, aHelper, theForce3d); + } + } + } + } + int totalNbElems = meshDS->NbEdges() + meshDS->NbFaces() + meshDS->NbVolumes(); + if ( nbCheckedElems < totalNbElems ) // not all elements are in submeshes + { + SMESHDS_SubMesh *smDS = 0; + SMDS_EdgeIteratorPtr aEdgeItr = meshDS->edgesIterator(); + while(aEdgeItr->more()) + { + const SMDS_MeshEdge* edge = aEdgeItr->next(); + if(edge && !edge->IsQuadratic()) + { + int id = edge->GetID(); + const SMDS_MeshNode* n1 = edge->GetNode(0); + const SMDS_MeshNode* n2 = edge->GetNode(1); + + meshDS->RemoveFreeElement(edge, smDS, notFromGroups); + + const SMDS_MeshEdge* NewEdge = aHelper.AddEdge(n1, n2, id, theForce3d); + ReplaceElemInGroups( edge, NewEdge, GetMeshDS()); + } + } + SMDS_FaceIteratorPtr aFaceItr = meshDS->facesIterator(); + while(aFaceItr->more()) + { + const SMDS_MeshFace* face = aFaceItr->next(); + if(!face || face->IsQuadratic() ) continue; + + int id = face->GetID(); + int nbNodes = face->NbNodes(); + vector aNds (nbNodes); + + for(int i = 0; i < nbNodes; i++) + { + aNds[i] = face->GetNode(i); + } + + meshDS->RemoveFreeElement(face, smDS, notFromGroups); + + SMDS_MeshFace * NewFace = 0; + switch(nbNodes) + { + case 3: + NewFace = aHelper.AddFace(aNds[0], aNds[1], aNds[2], id, theForce3d); + break; + case 4: + NewFace = aHelper.AddFace(aNds[0], aNds[1], aNds[2], aNds[3], id, theForce3d); + break; + default: + continue; + } + ReplaceElemInGroups( face, NewFace, GetMeshDS()); + } + SMDS_VolumeIteratorPtr aVolumeItr = meshDS->volumesIterator(); + while(aVolumeItr->more()) + { + const SMDS_MeshVolume* volume = aVolumeItr->next(); + if(!volume || volume->IsQuadratic() ) continue; + + int id = volume->GetID(); + int nbNodes = volume->NbNodes(); + vector aNds (nbNodes); + + for(int i = 0; i < nbNodes; i++) + { + aNds[i] = volume->GetNode(i); + } + + meshDS->RemoveFreeElement(volume, smDS, notFromGroups); + + SMDS_MeshVolume * NewVolume = 0; + switch(nbNodes) + { + case 4: + NewVolume = aHelper.AddVolume(aNds[0], aNds[1], aNds[2], + aNds[3], id, theForce3d ); + break; + case 6: + NewVolume = aHelper.AddVolume(aNds[0], aNds[1], aNds[2], + aNds[3], aNds[4], aNds[5], id, theForce3d); + break; + case 8: + NewVolume = aHelper.AddVolume(aNds[0], aNds[1], aNds[2], aNds[3], + aNds[4], aNds[5], aNds[6], aNds[7], id, theForce3d); + break; + default: + continue; + } + ReplaceElemInGroups(volume, NewVolume, meshDS); + } + } +} + +//======================================================================= +/*! + * \brief Convert quadratic elements to linear ones and remove quadratic nodes + * \retval int - nb of checked elements + */ +//======================================================================= + +int SMESH_MeshEditor::removeQuadElem(SMESHDS_SubMesh * theSm, + SMDS_ElemIteratorPtr theItr, + const int theShapeID) +{ + int nbElem = 0; + SMESHDS_Mesh* meshDS = GetMeshDS(); + const bool notFromGroups = false; + + while( theItr->more() ) + { + const SMDS_MeshElement* elem = theItr->next(); + nbElem++; + if( elem && elem->IsQuadratic()) + { + int id = elem->GetID(); + int nbNodes = elem->NbNodes(); + vector aNds, mediumNodes; + aNds.reserve( nbNodes ); + mediumNodes.reserve( nbNodes ); + + for(int i = 0; i < nbNodes; i++) + { + const SMDS_MeshNode* n = elem->GetNode(i); + + if( elem->IsMediumNode( n ) ) + mediumNodes.push_back( n ); + else + aNds.push_back( n ); + } + if( aNds.empty() ) continue; + SMDSAbs_ElementType aType = elem->GetType(); + + //remove old quadratic element + meshDS->RemoveFreeElement( elem, theSm, notFromGroups ); + + SMDS_MeshElement * NewElem = AddElement( aNds, aType, false, id ); + ReplaceElemInGroups(elem, NewElem, meshDS); + if( theSm && NewElem ) + theSm->AddElement( NewElem ); + + // remove medium nodes + vector::iterator nIt = mediumNodes.begin(); + for ( ; nIt != mediumNodes.end(); ++nIt ) { + const SMDS_MeshNode* n = *nIt; + if ( n->NbInverseElements() == 0 ) { + if ( n->GetPosition()->GetShapeId() != theShapeID ) + meshDS->RemoveFreeNode( n, meshDS->MeshElements + ( n->GetPosition()->GetShapeId() )); + else + meshDS->RemoveFreeNode( n, theSm ); + } + } + } + } + return nbElem; +} + +//======================================================================= +//function : ConvertFromQuadratic +//purpose : +//======================================================================= +bool SMESH_MeshEditor::ConvertFromQuadratic() +{ + int nbCheckedElems = 0; + if ( myMesh->HasShapeToMesh() ) + { + if ( SMESH_subMesh *aSubMesh = myMesh->GetSubMeshContaining(myMesh->GetShapeToMesh())) + { + SMESH_subMeshIteratorPtr smIt = aSubMesh->getDependsOnIterator(true,false); + while ( smIt->more() ) { + SMESH_subMesh* sm = smIt->next(); + if ( SMESHDS_SubMesh *smDS = sm->GetSubMeshDS() ) + nbCheckedElems += removeQuadElem( smDS, smDS->GetElements(), sm->GetId() ); + } + } + } + + int totalNbElems = + GetMeshDS()->NbEdges() + GetMeshDS()->NbFaces() + GetMeshDS()->NbVolumes(); + if ( nbCheckedElems < totalNbElems ) // not all elements are in submeshes + { + SMESHDS_SubMesh *aSM = 0; + removeQuadElem( aSM, GetMeshDS()->elementsIterator(), 0 ); + } + + return true; +} + +//======================================================================= +//function : SewSideElements +//purpose : +//======================================================================= + +SMESH_MeshEditor::Sew_Error + SMESH_MeshEditor::SewSideElements (TIDSortedElemSet& theSide1, + TIDSortedElemSet& theSide2, + const SMDS_MeshNode* theFirstNode1, + const SMDS_MeshNode* theFirstNode2, + const SMDS_MeshNode* theSecondNode1, + const SMDS_MeshNode* theSecondNode2) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + MESSAGE ("::::SewSideElements()"); + if ( theSide1.size() != theSide2.size() ) + return SEW_DIFF_NB_OF_ELEMENTS; + + Sew_Error aResult = SEW_OK; + // Algo: + // 1. Build set of faces representing each side + // 2. Find which nodes of the side 1 to merge with ones on the side 2 + // 3. Replace nodes in elements of the side 1 and remove replaced nodes + + // ======================================================================= + // 1. Build set of faces representing each side: + // ======================================================================= + // a. build set of nodes belonging to faces + // b. complete set of faces: find missing fices whose nodes are in set of nodes + // c. create temporary faces representing side of volumes if correspondent + // face does not exist + + SMESHDS_Mesh* aMesh = GetMeshDS(); + SMDS_Mesh aTmpFacesMesh; + set faceSet1, faceSet2; + set volSet1, volSet2; + set nodeSet1, nodeSet2; + set * faceSetPtr[] = { &faceSet1, &faceSet2 }; + set * volSetPtr[] = { &volSet1, &volSet2 }; + set * nodeSetPtr[] = { &nodeSet1, &nodeSet2 }; + TIDSortedElemSet * elemSetPtr[] = { &theSide1, &theSide2 }; + int iSide, iFace, iNode; + + for ( iSide = 0; iSide < 2; iSide++ ) { + set * nodeSet = nodeSetPtr[ iSide ]; + TIDSortedElemSet * elemSet = elemSetPtr[ iSide ]; + set * faceSet = faceSetPtr[ iSide ]; + set * volSet = volSetPtr [ iSide ]; + set::iterator vIt; + TIDSortedElemSet::iterator eIt; + set::iterator nIt; + + // check that given nodes belong to given elements + const SMDS_MeshNode* n1 = ( iSide == 0 ) ? theFirstNode1 : theFirstNode2; + const SMDS_MeshNode* n2 = ( iSide == 0 ) ? theSecondNode1 : theSecondNode2; + int firstIndex = -1, secondIndex = -1; + for (eIt = elemSet->begin(); eIt != elemSet->end(); eIt++ ) { + const SMDS_MeshElement* elem = *eIt; + if ( firstIndex < 0 ) firstIndex = elem->GetNodeIndex( n1 ); + if ( secondIndex < 0 ) secondIndex = elem->GetNodeIndex( n2 ); + if ( firstIndex > -1 && secondIndex > -1 ) break; + } + if ( firstIndex < 0 || secondIndex < 0 ) { + // we can simply return until temporary faces created + return (iSide == 0 ) ? SEW_BAD_SIDE1_NODES : SEW_BAD_SIDE2_NODES; + } + + // ----------------------------------------------------------- + // 1a. Collect nodes of existing faces + // and build set of face nodes in order to detect missing + // faces corresponing to sides of volumes + // ----------------------------------------------------------- + + set< set > setOfFaceNodeSet; + + // loop on the given element of a side + for (eIt = elemSet->begin(); eIt != elemSet->end(); eIt++ ) { + //const SMDS_MeshElement* elem = *eIt; + const SMDS_MeshElement* elem = *eIt; + if ( elem->GetType() == SMDSAbs_Face ) { + faceSet->insert( elem ); + set faceNodeSet; + SMDS_ElemIteratorPtr nodeIt = elem->nodesIterator(); + while ( nodeIt->more() ) { + const SMDS_MeshNode* n = static_cast( nodeIt->next() ); + nodeSet->insert( n ); + faceNodeSet.insert( n ); + } + setOfFaceNodeSet.insert( faceNodeSet ); + } + else if ( elem->GetType() == SMDSAbs_Volume ) + volSet->insert( elem ); + } + // ------------------------------------------------------------------------------ + // 1b. Complete set of faces: find missing fices whose nodes are in set of nodes + // ------------------------------------------------------------------------------ + + for ( nIt = nodeSet->begin(); nIt != nodeSet->end(); nIt++ ) { // loop on nodes of iSide + SMDS_ElemIteratorPtr fIt = (*nIt)->GetInverseElementIterator(SMDSAbs_Face); + while ( fIt->more() ) { // loop on faces sharing a node + const SMDS_MeshElement* f = fIt->next(); + if ( faceSet->find( f ) == faceSet->end() ) { + // check if all nodes are in nodeSet and + // complete setOfFaceNodeSet if they are + set faceNodeSet; + SMDS_ElemIteratorPtr nodeIt = f->nodesIterator(); + bool allInSet = true; + while ( nodeIt->more() && allInSet ) { // loop on nodes of a face + const SMDS_MeshNode* n = static_cast( nodeIt->next() ); + if ( nodeSet->find( n ) == nodeSet->end() ) + allInSet = false; + else + faceNodeSet.insert( n ); + } + if ( allInSet ) { + faceSet->insert( f ); + setOfFaceNodeSet.insert( faceNodeSet ); + } + } + } + } + + // ------------------------------------------------------------------------- + // 1c. Create temporary faces representing sides of volumes if correspondent + // face does not exist + // ------------------------------------------------------------------------- + + if ( !volSet->empty() ) { + //int nodeSetSize = nodeSet->size(); + + // loop on given volumes + for ( vIt = volSet->begin(); vIt != volSet->end(); vIt++ ) { + SMDS_VolumeTool vol (*vIt); + // loop on volume faces: find free faces + // -------------------------------------- + list freeFaceList; + for ( iFace = 0; iFace < vol.NbFaces(); iFace++ ) { + if ( !vol.IsFreeFace( iFace )) + continue; + // check if there is already a face with same nodes in a face set + const SMDS_MeshElement* aFreeFace = 0; + const SMDS_MeshNode** fNodes = vol.GetFaceNodes( iFace ); + int nbNodes = vol.NbFaceNodes( iFace ); + set faceNodeSet; + vol.GetFaceNodes( iFace, faceNodeSet ); + bool isNewFace = setOfFaceNodeSet.insert( faceNodeSet ).second; + if ( isNewFace ) { + // no such a face is given but it still can exist, check it + if ( nbNodes == 3 ) { + aFreeFace = aMesh->FindFace( fNodes[0],fNodes[1],fNodes[2] ); + } + else if ( nbNodes == 4 ) { + aFreeFace = aMesh->FindFace( fNodes[0],fNodes[1],fNodes[2],fNodes[3] ); + } + else { + vector poly_nodes ( fNodes, & fNodes[nbNodes]); + aFreeFace = aMesh->FindFace(poly_nodes); + } + } + if ( !aFreeFace ) { + // create a temporary face + if ( nbNodes == 3 ) { + aFreeFace = aTmpFacesMesh.AddFace( fNodes[0],fNodes[1],fNodes[2] ); + } + else if ( nbNodes == 4 ) { + aFreeFace = aTmpFacesMesh.AddFace( fNodes[0],fNodes[1],fNodes[2],fNodes[3] ); + } + else { + vector poly_nodes ( fNodes, & fNodes[nbNodes]); + aFreeFace = aTmpFacesMesh.AddPolygonalFace(poly_nodes); + } + } + if ( aFreeFace ) + freeFaceList.push_back( aFreeFace ); + + } // loop on faces of a volume + + // choose one of several free faces + // -------------------------------------- + if ( freeFaceList.size() > 1 ) { + // choose a face having max nb of nodes shared by other elems of a side + int maxNbNodes = -1/*, nbExcludedFaces = 0*/; + list::iterator fIt = freeFaceList.begin(); + while ( fIt != freeFaceList.end() ) { // loop on free faces + int nbSharedNodes = 0; + SMDS_ElemIteratorPtr nodeIt = (*fIt)->nodesIterator(); + while ( nodeIt->more() ) { // loop on free face nodes + const SMDS_MeshNode* n = + static_cast( nodeIt->next() ); + SMDS_ElemIteratorPtr invElemIt = n->GetInverseElementIterator(); + while ( invElemIt->more() ) { + const SMDS_MeshElement* e = invElemIt->next(); + if ( faceSet->find( e ) != faceSet->end() ) + nbSharedNodes++; + if ( elemSet->find( e ) != elemSet->end() ) + nbSharedNodes++; + } + } + if ( nbSharedNodes >= maxNbNodes ) { + maxNbNodes = nbSharedNodes; + fIt++; + } + else + freeFaceList.erase( fIt++ ); // here fIt++ occures before erase + } + if ( freeFaceList.size() > 1 ) + { + // could not choose one face, use another way + // choose a face most close to the bary center of the opposite side + gp_XYZ aBC( 0., 0., 0. ); + set addedNodes; + TIDSortedElemSet * elemSet2 = elemSetPtr[ 1 - iSide ]; + eIt = elemSet2->begin(); + for ( eIt = elemSet2->begin(); eIt != elemSet2->end(); eIt++ ) { + SMDS_ElemIteratorPtr nodeIt = (*eIt)->nodesIterator(); + while ( nodeIt->more() ) { // loop on free face nodes + const SMDS_MeshNode* n = + static_cast( nodeIt->next() ); + if ( addedNodes.insert( n ).second ) + aBC += gp_XYZ( n->X(),n->Y(),n->Z() ); + } + } + aBC /= addedNodes.size(); + double minDist = DBL_MAX; + fIt = freeFaceList.begin(); + while ( fIt != freeFaceList.end() ) { // loop on free faces + double dist = 0; + SMDS_ElemIteratorPtr nodeIt = (*fIt)->nodesIterator(); + while ( nodeIt->more() ) { // loop on free face nodes + const SMDS_MeshNode* n = + static_cast( nodeIt->next() ); + gp_XYZ p( n->X(),n->Y(),n->Z() ); + dist += ( aBC - p ).SquareModulus(); + } + if ( dist < minDist ) { + minDist = dist; + freeFaceList.erase( freeFaceList.begin(), fIt++ ); + } + else + fIt = freeFaceList.erase( fIt++ ); + } + } + } // choose one of several free faces of a volume + + if ( freeFaceList.size() == 1 ) { + const SMDS_MeshElement* aFreeFace = freeFaceList.front(); + faceSet->insert( aFreeFace ); + // complete a node set with nodes of a found free face +// for ( iNode = 0; iNode < ; iNode++ ) +// nodeSet->insert( fNodes[ iNode ] ); + } + + } // loop on volumes of a side + +// // complete a set of faces if new nodes in a nodeSet appeared +// // ---------------------------------------------------------- +// if ( nodeSetSize != nodeSet->size() ) { +// for ( ; nIt != nodeSet->end(); nIt++ ) { // loop on nodes of iSide +// SMDS_ElemIteratorPtr fIt = (*nIt)->GetInverseElementIterator(SMDSAbs_Face); +// while ( fIt->more() ) { // loop on faces sharing a node +// const SMDS_MeshElement* f = fIt->next(); +// if ( faceSet->find( f ) == faceSet->end() ) { +// // check if all nodes are in nodeSet and +// // complete setOfFaceNodeSet if they are +// set faceNodeSet; +// SMDS_ElemIteratorPtr nodeIt = f->nodesIterator(); +// bool allInSet = true; +// while ( nodeIt->more() && allInSet ) { // loop on nodes of a face +// const SMDS_MeshNode* n = static_cast( nodeIt->next() ); +// if ( nodeSet->find( n ) == nodeSet->end() ) +// allInSet = false; +// else +// faceNodeSet.insert( n ); +// } +// if ( allInSet ) { +// faceSet->insert( f ); +// setOfFaceNodeSet.insert( faceNodeSet ); +// } +// } +// } +// } +// } + } // Create temporary faces, if there are volumes given + } // loop on sides + + if ( faceSet1.size() != faceSet2.size() ) { + // delete temporary faces: they are in reverseElements of actual nodes + SMDS_FaceIteratorPtr tmpFaceIt = aTmpFacesMesh.facesIterator(); + while ( tmpFaceIt->more() ) + aTmpFacesMesh.RemoveElement( tmpFaceIt->next() ); + MESSAGE("Diff nb of faces"); + return SEW_TOPO_DIFF_SETS_OF_ELEMENTS; + } + + // ============================================================ + // 2. Find nodes to merge: + // bind a node to remove to a node to put instead + // ============================================================ + + TNodeNodeMap nReplaceMap; // bind a node to remove to a node to put instead + if ( theFirstNode1 != theFirstNode2 ) + nReplaceMap.insert( TNodeNodeMap::value_type( theFirstNode1, theFirstNode2 )); + if ( theSecondNode1 != theSecondNode2 ) + nReplaceMap.insert( TNodeNodeMap::value_type( theSecondNode1, theSecondNode2 )); + + LinkID_Gen aLinkID_Gen( GetMeshDS() ); + set< long > linkIdSet; // links to process + linkIdSet.insert( aLinkID_Gen.GetLinkID( theFirstNode1, theSecondNode1 )); + + typedef pair< const SMDS_MeshNode*, const SMDS_MeshNode* > NLink; + list< NLink > linkList[2]; + linkList[0].push_back( NLink( theFirstNode1, theSecondNode1 )); + linkList[1].push_back( NLink( theFirstNode2, theSecondNode2 )); + // loop on links in linkList; find faces by links and append links + // of the found faces to linkList + list< NLink >::iterator linkIt[] = { linkList[0].begin(), linkList[1].begin() } ; + for ( ; linkIt[0] != linkList[0].end(); linkIt[0]++, linkIt[1]++ ) { + NLink link[] = { *linkIt[0], *linkIt[1] }; + long linkID = aLinkID_Gen.GetLinkID( link[0].first, link[0].second ); + if ( linkIdSet.find( linkID ) == linkIdSet.end() ) + continue; + + // by links, find faces in the face sets, + // and find indices of link nodes in the found faces; + // in a face set, there is only one or no face sharing a link + // --------------------------------------------------------------- + + const SMDS_MeshElement* face[] = { 0, 0 }; + //const SMDS_MeshNode* faceNodes[ 2 ][ 5 ]; + vector fnodes1(9); + vector fnodes2(9); + //const SMDS_MeshNode* notLinkNodes[ 2 ][ 2 ] = {{ 0, 0 },{ 0, 0 }} ; + vector notLinkNodes1(6); + vector notLinkNodes2(6); + int iLinkNode[2][2]; + for ( iSide = 0; iSide < 2; iSide++ ) { // loop on 2 sides + const SMDS_MeshNode* n1 = link[iSide].first; + const SMDS_MeshNode* n2 = link[iSide].second; + set * faceSet = faceSetPtr[ iSide ]; + set< const SMDS_MeshElement* > fMap; + for ( int i = 0; i < 2; i++ ) { // loop on 2 nodes of a link + const SMDS_MeshNode* n = i ? n1 : n2; // a node of a link + SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator(SMDSAbs_Face); + while ( fIt->more() ) { // loop on faces sharing a node + const SMDS_MeshElement* f = fIt->next(); + if (faceSet->find( f ) != faceSet->end() && // f is in face set + ! fMap.insert( f ).second ) // f encounters twice + { + if ( face[ iSide ] ) { + MESSAGE( "2 faces per link " ); + aResult = iSide ? SEW_BAD_SIDE2_NODES : SEW_BAD_SIDE1_NODES; + break; + } + face[ iSide ] = f; + faceSet->erase( f ); + // get face nodes and find ones of a link + iNode = 0; + int nbl = -1; + if(f->IsPoly()) { + if(iSide==0) { + fnodes1.resize(f->NbNodes()+1); + notLinkNodes1.resize(f->NbNodes()-2); + } + else { + fnodes2.resize(f->NbNodes()+1); + notLinkNodes2.resize(f->NbNodes()-2); + } + } + if(!f->IsQuadratic()) { + SMDS_ElemIteratorPtr nIt = f->nodesIterator(); + while ( nIt->more() ) { + const SMDS_MeshNode* n = + static_cast( nIt->next() ); + if ( n == n1 ) { + iLinkNode[ iSide ][ 0 ] = iNode; + } + else if ( n == n2 ) { + iLinkNode[ iSide ][ 1 ] = iNode; + } + //else if ( notLinkNodes[ iSide ][ 0 ] ) + // notLinkNodes[ iSide ][ 1 ] = n; + //else + // notLinkNodes[ iSide ][ 0 ] = n; + else { + nbl++; + if(iSide==0) + notLinkNodes1[nbl] = n; + //notLinkNodes1.push_back(n); + else + notLinkNodes2[nbl] = n; + //notLinkNodes2.push_back(n); + } + //faceNodes[ iSide ][ iNode++ ] = n; + if(iSide==0) { + fnodes1[iNode++] = n; + } + else { + fnodes2[iNode++] = n; + } + } + } + else { // f->IsQuadratic() + const SMDS_QuadraticFaceOfNodes* F = + static_cast(f); + // use special nodes iterator + SMDS_NodeIteratorPtr anIter = F->interlacedNodesIterator(); + while ( anIter->more() ) { + const SMDS_MeshNode* n = + static_cast( anIter->next() ); + if ( n == n1 ) { + iLinkNode[ iSide ][ 0 ] = iNode; + } + else if ( n == n2 ) { + iLinkNode[ iSide ][ 1 ] = iNode; + } + else { + nbl++; + if(iSide==0) { + notLinkNodes1[nbl] = n; + } + else { + notLinkNodes2[nbl] = n; + } + } + if(iSide==0) { + fnodes1[iNode++] = n; + } + else { + fnodes2[iNode++] = n; + } + } + } + //faceNodes[ iSide ][ iNode ] = faceNodes[ iSide ][ 0 ]; + if(iSide==0) { + fnodes1[iNode] = fnodes1[0]; + } + else { + fnodes2[iNode] = fnodes1[0]; + } + } + } + } + } + + // check similarity of elements of the sides + if ((aResult == SEW_OK && ( face[0] && !face[1] )) || ( !face[0] && face[1] )) { + MESSAGE("Correspondent face not found on side " << ( face[0] ? 1 : 0 )); + if ( nReplaceMap.size() == 2 ) { // faces on input nodes not found + aResult = ( face[0] ? SEW_BAD_SIDE2_NODES : SEW_BAD_SIDE1_NODES ); + } + else { + aResult = SEW_TOPO_DIFF_SETS_OF_ELEMENTS; + } + break; // do not return because it s necessary to remove tmp faces + } + + // set nodes to merge + // ------------------- + + if ( face[0] && face[1] ) { + int nbNodes = face[0]->NbNodes(); + if ( nbNodes != face[1]->NbNodes() ) { + MESSAGE("Diff nb of face nodes"); + aResult = SEW_TOPO_DIFF_SETS_OF_ELEMENTS; + break; // do not return because it s necessary to remove tmp faces + } + bool reverse[] = { false, false }; // order of notLinkNodes of quadrangle + if ( nbNodes == 3 ) { + //nReplaceMap.insert( TNodeNodeMap::value_type + // ( notLinkNodes[0][0], notLinkNodes[1][0] )); + nReplaceMap.insert( TNodeNodeMap::value_type + ( notLinkNodes1[0], notLinkNodes2[0] )); + } + else { + for ( iSide = 0; iSide < 2; iSide++ ) { // loop on 2 sides + // analyse link orientation in faces + int i1 = iLinkNode[ iSide ][ 0 ]; + int i2 = iLinkNode[ iSide ][ 1 ]; + reverse[ iSide ] = Abs( i1 - i2 ) == 1 ? i1 > i2 : i2 > i1; + // if notLinkNodes are the first and the last ones, then + // their order does not correspond to the link orientation + if (( i1 == 1 && i2 == 2 ) || + ( i1 == 2 && i2 == 1 )) + reverse[ iSide ] = !reverse[ iSide ]; + } + if ( reverse[0] == reverse[1] ) { + //nReplaceMap.insert( TNodeNodeMap::value_type + // ( notLinkNodes[0][0], notLinkNodes[1][0] )); + //nReplaceMap.insert( TNodeNodeMap::value_type + // ( notLinkNodes[0][1], notLinkNodes[1][1] )); + for(int nn=0; nn::iterator, bool > iter_isnew = linkIdSet.insert( linkID ); + if ( !iter_isnew.second ) { // already in a set: no need to process + linkIdSet.erase( iter_isnew.first ); + } + else // new in set == encountered for the first time: add + { + //const SMDS_MeshNode* n1 = nodes[ iNode ]; + //const SMDS_MeshNode* n2 = nodes[ iNode + 1]; + const SMDS_MeshNode* n1 = fnodes1[ iNode ]; + const SMDS_MeshNode* n2 = fnodes1[ iNode + 1]; + linkList[0].push_back ( NLink( n1, n2 )); + linkList[1].push_back ( NLink( nReplaceMap[n1], nReplaceMap[n2] )); + } + } + } // 2 faces found + } // loop on link lists + + if ( aResult == SEW_OK && + ( linkIt[0] != linkList[0].end() || + !faceSetPtr[0]->empty() || !faceSetPtr[1]->empty() )) { + MESSAGE( (linkIt[0] != linkList[0].end()) <<" "<< (faceSetPtr[0]->empty()) << + " " << (faceSetPtr[1]->empty())); + aResult = SEW_TOPO_DIFF_SETS_OF_ELEMENTS; + } + + // ==================================================================== + // 3. Replace nodes in elements of the side 1 and remove replaced nodes + // ==================================================================== + + // delete temporary faces: they are in reverseElements of actual nodes + SMDS_FaceIteratorPtr tmpFaceIt = aTmpFacesMesh.facesIterator(); + while ( tmpFaceIt->more() ) + aTmpFacesMesh.RemoveElement( tmpFaceIt->next() ); + + if ( aResult != SEW_OK) + return aResult; + + list< int > nodeIDsToRemove/*, elemIDsToRemove*/; + // loop on nodes replacement map + TNodeNodeMap::iterator nReplaceMapIt = nReplaceMap.begin(), nnIt; + for ( ; nReplaceMapIt != nReplaceMap.end(); nReplaceMapIt++ ) + if ( (*nReplaceMapIt).first != (*nReplaceMapIt).second ) { + const SMDS_MeshNode* nToRemove = (*nReplaceMapIt).first; + nodeIDsToRemove.push_back( nToRemove->GetID() ); + // loop on elements sharing nToRemove + SMDS_ElemIteratorPtr invElemIt = nToRemove->GetInverseElementIterator(); + while ( invElemIt->more() ) { + const SMDS_MeshElement* e = invElemIt->next(); + // get a new suite of nodes: make replacement + int nbReplaced = 0, i = 0, nbNodes = e->NbNodes(); + vector< const SMDS_MeshNode*> nodes( nbNodes ); + SMDS_ElemIteratorPtr nIt = e->nodesIterator(); + while ( nIt->more() ) { + const SMDS_MeshNode* n = + static_cast( nIt->next() ); + nnIt = nReplaceMap.find( n ); + if ( nnIt != nReplaceMap.end() ) { + nbReplaced++; + n = (*nnIt).second; + } + nodes[ i++ ] = n; + } + // if ( nbReplaced == nbNodes && e->GetType() == SMDSAbs_Face ) + // elemIDsToRemove.push_back( e->GetID() ); + // else + if ( nbReplaced ) + aMesh->ChangeElementNodes( e, & nodes[0], nbNodes ); + } + } + + Remove( nodeIDsToRemove, true ); + + return aResult; +} + +//================================================================================ + /*! + * \brief Find corresponding nodes in two sets of faces + * \param theSide1 - first face set + * \param theSide2 - second first face + * \param theFirstNode1 - a boundary node of set 1 + * \param theFirstNode2 - a node of set 2 corresponding to theFirstNode1 + * \param theSecondNode1 - a boundary node of set 1 linked with theFirstNode1 + * \param theSecondNode2 - a node of set 2 corresponding to theSecondNode1 + * \param nReplaceMap - output map of corresponding nodes + * \retval bool - is a success or not + */ +//================================================================================ + +#ifdef _DEBUG_ +//#define DEBUG_MATCHING_NODES +#endif + +SMESH_MeshEditor::Sew_Error +SMESH_MeshEditor::FindMatchingNodes(set& theSide1, + set& theSide2, + const SMDS_MeshNode* theFirstNode1, + const SMDS_MeshNode* theFirstNode2, + const SMDS_MeshNode* theSecondNode1, + const SMDS_MeshNode* theSecondNode2, + TNodeNodeMap & nReplaceMap) +{ + set * faceSetPtr[] = { &theSide1, &theSide2 }; + + nReplaceMap.clear(); + if ( theFirstNode1 != theFirstNode2 ) + nReplaceMap.insert( make_pair( theFirstNode1, theFirstNode2 )); + if ( theSecondNode1 != theSecondNode2 ) + nReplaceMap.insert( make_pair( theSecondNode1, theSecondNode2 )); + + set< SMESH_TLink > linkSet; // set of nodes where order of nodes is ignored + linkSet.insert( SMESH_TLink( theFirstNode1, theSecondNode1 )); + + list< NLink > linkList[2]; + linkList[0].push_back( NLink( theFirstNode1, theSecondNode1 )); + linkList[1].push_back( NLink( theFirstNode2, theSecondNode2 )); + + // loop on links in linkList; find faces by links and append links + // of the found faces to linkList + list< NLink >::iterator linkIt[] = { linkList[0].begin(), linkList[1].begin() } ; + for ( ; linkIt[0] != linkList[0].end(); linkIt[0]++, linkIt[1]++ ) { + NLink link[] = { *linkIt[0], *linkIt[1] }; + if ( linkSet.find( link[0] ) == linkSet.end() ) + continue; + + // by links, find faces in the face sets, + // and find indices of link nodes in the found faces; + // in a face set, there is only one or no face sharing a link + // --------------------------------------------------------------- + + const SMDS_MeshElement* face[] = { 0, 0 }; + list notLinkNodes[2]; + //bool reverse[] = { false, false }; // order of notLinkNodes + int nbNodes[2]; + for ( int iSide = 0; iSide < 2; iSide++ ) // loop on 2 sides + { + const SMDS_MeshNode* n1 = link[iSide].first; + const SMDS_MeshNode* n2 = link[iSide].second; + set * faceSet = faceSetPtr[ iSide ]; + set< const SMDS_MeshElement* > facesOfNode1; + for ( int iNode = 0; iNode < 2; iNode++ ) // loop on 2 nodes of a link + { + // during a loop of the first node, we find all faces around n1, + // during a loop of the second node, we find one face sharing both n1 and n2 + const SMDS_MeshNode* n = iNode ? n1 : n2; // a node of a link + SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator(SMDSAbs_Face); + while ( fIt->more() ) { // loop on faces sharing a node + const SMDS_MeshElement* f = fIt->next(); + if (faceSet->find( f ) != faceSet->end() && // f is in face set + ! facesOfNode1.insert( f ).second ) // f encounters twice + { + if ( face[ iSide ] ) { + MESSAGE( "2 faces per link " ); + return ( iSide ? SEW_BAD_SIDE2_NODES : SEW_BAD_SIDE1_NODES ); + } + face[ iSide ] = f; + faceSet->erase( f ); + + // get not link nodes + int nbN = f->NbNodes(); + if ( f->IsQuadratic() ) + nbN /= 2; + nbNodes[ iSide ] = nbN; + list< const SMDS_MeshNode* > & nodes = notLinkNodes[ iSide ]; + int i1 = f->GetNodeIndex( n1 ); + int i2 = f->GetNodeIndex( n2 ); + int iEnd = nbN, iBeg = -1, iDelta = 1; + bool reverse = ( Abs( i1 - i2 ) == 1 ? i1 > i2 : i2 > i1 ); + if ( reverse ) { + std::swap( iEnd, iBeg ); iDelta = -1; + } + int i = i2; + while ( true ) { + i += iDelta; + if ( i == iEnd ) i = iBeg + iDelta; + if ( i == i1 ) break; + nodes.push_back ( f->GetNode( i ) ); + } + } + } + } + } + // check similarity of elements of the sides + if (( face[0] && !face[1] ) || ( !face[0] && face[1] )) { + MESSAGE("Correspondent face not found on side " << ( face[0] ? 1 : 0 )); + if ( nReplaceMap.size() == 2 ) { // faces on input nodes not found + return ( face[0] ? SEW_BAD_SIDE2_NODES : SEW_BAD_SIDE1_NODES ); + } + else { + return SEW_TOPO_DIFF_SETS_OF_ELEMENTS; + } + } + + // set nodes to merge + // ------------------- + + if ( face[0] && face[1] ) { + if ( nbNodes[0] != nbNodes[1] ) { + MESSAGE("Diff nb of face nodes"); + return SEW_TOPO_DIFF_SETS_OF_ELEMENTS; + } +#ifdef DEBUG_MATCHING_NODES + MESSAGE ( " Link 1: " << link[0].first->GetID() <<" "<< link[0].second->GetID() + << " F 1: " << face[0] << "| Link 2: " << link[1].first->GetID() <<" " + << link[1].second->GetID() << " F 2: " << face[1] << " | Bind: " ) ; +#endif + int nbN = nbNodes[0]; + { + list::iterator n1 = notLinkNodes[0].begin(); + list::iterator n2 = notLinkNodes[1].begin(); + for ( int i = 0 ; i < nbN - 2; ++i ) { +#ifdef DEBUG_MATCHING_NODES + MESSAGE ( (*n1)->GetID() << " to " << (*n2)->GetID() ); +#endif + nReplaceMap.insert( make_pair( *(n1++), *(n2++) )); + } + } + + // add other links of the face 1 to linkList + // ----------------------------------------- + + const SMDS_MeshElement* f0 = face[0]; + const SMDS_MeshNode* n1 = f0->GetNode( nbN - 1 ); + for ( int i = 0; i < nbN; i++ ) + { + const SMDS_MeshNode* n2 = f0->GetNode( i ); + pair< set< SMESH_TLink >::iterator, bool > iter_isnew = + linkSet.insert( SMESH_TLink( n1, n2 )); + if ( !iter_isnew.second ) { // already in a set: no need to process + linkSet.erase( iter_isnew.first ); + } + else // new in set == encountered for the first time: add + { +#ifdef DEBUG_MATCHING_NODES + MESSAGE ( "Add link 1: " << n1->GetID() << " " << n2->GetID() << " " + << " | link 2: " << nReplaceMap[n1]->GetID() << " " << nReplaceMap[n2]->GetID() << " " ); +#endif + linkList[0].push_back ( NLink( n1, n2 )); + linkList[1].push_back ( NLink( nReplaceMap[n1], nReplaceMap[n2] )); + } + n1 = n2; + } + } // 2 faces found + } // loop on link lists + + return SEW_OK; +} + +/*! + \brief Creates a hole in a mesh by doubling the nodes of some particular elements + \param theNodes - identifiers of nodes to be doubled + \param theModifiedElems - identifiers of elements to be updated by the new (doubled) + nodes. If list of element identifiers is empty then nodes are doubled but + they not assigned to elements + \return TRUE if operation has been completed successfully, FALSE otherwise +*/ +bool SMESH_MeshEditor::DoubleNodes( const std::list< int >& theListOfNodes, + const std::list< int >& theListOfModifiedElems ) +{ + myLastCreatedElems.Clear(); + myLastCreatedNodes.Clear(); + + if ( theListOfNodes.size() == 0 ) + return false; + + SMESHDS_Mesh* aMeshDS = GetMeshDS(); + if ( !aMeshDS ) + return false; + + // iterate through nodes and duplicate them + + std::map< const SMDS_MeshNode*, const SMDS_MeshNode* > anOldNodeToNewNode; + + std::list< int >::const_iterator aNodeIter; + for ( aNodeIter = theListOfNodes.begin(); aNodeIter != theListOfNodes.end(); ++aNodeIter ) + { + int aCurr = *aNodeIter; + SMDS_MeshNode* aNode = (SMDS_MeshNode*)aMeshDS->FindNode( aCurr ); + if ( !aNode ) + continue; + + // duplicate node + + const SMDS_MeshNode* aNewNode = aMeshDS->AddNode( aNode->X(), aNode->Y(), aNode->Z() ); + if ( aNewNode ) + { + anOldNodeToNewNode[ aNode ] = aNewNode; + myLastCreatedNodes.Append( aNewNode ); + } + } + + // Create map of new nodes for modified elements + + std::map< SMDS_MeshElement*, vector > anElemToNodes; + + std::list< int >::const_iterator anElemIter; + for ( anElemIter = theListOfModifiedElems.begin(); + anElemIter != theListOfModifiedElems.end(); ++anElemIter ) + { + int aCurr = *anElemIter; + SMDS_MeshElement* anElem = (SMDS_MeshElement*)aMeshDS->FindElement( aCurr ); + if ( !anElem ) + continue; + + vector aNodeArr( anElem->NbNodes() ); + + SMDS_ElemIteratorPtr anIter = anElem->nodesIterator(); + int ind = 0; + while ( anIter->more() ) + { + SMDS_MeshNode* aCurrNode = (SMDS_MeshNode*)anIter->next(); + if ( aCurr && anOldNodeToNewNode.find( aCurrNode ) != anOldNodeToNewNode.end() ) + { + const SMDS_MeshNode* aNewNode = anOldNodeToNewNode[ aCurrNode ]; + aNodeArr[ ind++ ] = aNewNode; + } + else + aNodeArr[ ind++ ] = aCurrNode; + } + anElemToNodes[ anElem ] = aNodeArr; + } + + // Change nodes of elements + + std::map< SMDS_MeshElement*, vector >::iterator + anElemToNodesIter = anElemToNodes.begin(); + for ( ; anElemToNodesIter != anElemToNodes.end(); ++anElemToNodesIter ) + { + const SMDS_MeshElement* anElem = anElemToNodesIter->first; + vector aNodeArr = anElemToNodesIter->second; + if ( anElem ) + aMeshDS->ChangeElementNodes( anElem, &aNodeArr[ 0 ], anElem->NbNodes() ); + } + + return true; +} diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshVSLink.cpp.orig b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshVSLink.cpp.orig new file mode 100644 index 000000000000..4a1eb8220631 --- /dev/null +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshVSLink.cpp.orig @@ -0,0 +1,683 @@ +<<<<<<< bca7a1866e596ad2e318809f35b6d08776226a69 +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +//local headers +#include +#include + +//occ headers +#include +#include +#include + +//BEGIN sortNodes CHANGE /* +#include + +#include +#include +#include + +#if OCC_VERSION_HEX >= 0x070000 +IMPLEMENT_STANDARD_RTTIEXT(SMESH_MeshVSLink,MeshVS_DataSource3D) +#endif + +#define MAX_SORT_NODE_COUNT 12 + +typedef std::map T_Double_NodeID_Map; + +//======================================================================= +//function : sortNodes +//purpose : +//======================================================================= +bool sortNodes (const SMDS_MeshElement* theTool, const int* idNodes, int theNodeCount, int *myResult) +{ + if (theNodeCount < 3) return false; + //INITIAL VARS + TColgp_Array1OfXYZ myNodeList(1, theNodeCount); + TColgp_Array1OfVec myVectList(1, theNodeCount); + TColStd_Array1OfReal myAngleList(1, theNodeCount); + gp_XYZ BaryCenter(0.,0.,0.); + //int myResult[MAX_SORT_NODE_COUNT]; + //INITIALIZE THE POINTS + for (int i = 1; i <= theNodeCount; i++ ) { + const SMDS_MeshNode *n = theTool->GetNode( idNodes[i-1] ); + gp_XYZ aPoint(n->X(), n->Y(), n->Z()); + myNodeList.SetValue(i, aPoint); + } + //CALCULATE THE BARYCENTER + for (int i = 1; i <= theNodeCount; i++ ) + BaryCenter += myNodeList.Value(i); + BaryCenter /= theNodeCount; + //CREATE THE VECTORS + for (int i = 1; i <= theNodeCount; i++ ) { + gp_Vec aVector(BaryCenter, myNodeList.Value(i)); + myVectList.SetValue(i, aVector); + } + //CALCULATE THE NORMAL USING FIRST THREE POINTS + gp_XYZ q1 = myNodeList.Value(2)-myNodeList.Value(1); + gp_XYZ q2 = myNodeList.Value(3)-myNodeList.Value(1); + gp_XYZ normal = q1 ^ q2; + double modul = normal.Modulus(); + if ( modul > 0 ) + normal /= modul; + //COUNT THE ANGLE OF THE FIRST WITH EACH + for (int i = 1; i <= theNodeCount; i++ ) + myAngleList.SetValue(i, myVectList.Value(1).AngleWithRef(myVectList.Value(i), normal)); + //CREATE THE RESULT MAP (WILL SORT THE VERTICES) + T_Double_NodeID_Map myMap; + for (int i = 1; i <= theNodeCount; i++ ) + myMap.insert( make_pair(myAngleList.Value(i), idNodes[i-1])); + int resID = 0; + T_Double_NodeID_Map::iterator it; + for(it = myMap.begin(); it!= myMap.end(); ++it) + myResult[resID++] = it->second; + + return true; +} +//END sortNodes CHANGE */ + +//================================================================ +// Function : Constructor +// Purpose : +//================================================================ +SMESH_MeshVSLink::SMESH_MeshVSLink(const SMESH_Mesh *aMesh) +{ + myMesh = (SMESH_Mesh*) aMesh; + //add the nodes + SMDS_NodeIteratorPtr aNodeIter = myMesh->GetMeshDS()->nodesIterator(); + for(;aNodeIter->more();) { + const SMDS_MeshNode* aNode = aNodeIter->next(); + myNodes.Add( aNode->GetID() ); + } + //add the edges + SMDS_EdgeIteratorPtr anEdgeIter = myMesh->GetMeshDS()->edgesIterator(); + for(;anEdgeIter->more();) { + const SMDS_MeshEdge* anElem = anEdgeIter->next(); + myElements.Add( anElem->GetID() ); + } + //add the faces + SMDS_FaceIteratorPtr aFaceIter = myMesh->GetMeshDS()->facesIterator(); + for(;aFaceIter->more();) { + const SMDS_MeshFace* anElem = aFaceIter->next(); + myElements.Add( anElem->GetID() ); + } + //add the volumes + SMDS_VolumeIteratorPtr aVolumeIter = myMesh->GetMeshDS()->volumesIterator(); + for(;aVolumeIter->more();) { + const SMDS_MeshVolume* anElem = aVolumeIter->next(); + myElements.Add( anElem->GetID() ); + } + //add the groups + const std::set& groups = myMesh->GetMeshDS()->GetGroups(); + if (!groups.empty()) { + std::set::const_iterator GrIt = groups.begin(); + for (; GrIt != groups.end(); GrIt++) { + SMESHDS_Group* grp = dynamic_cast(*GrIt); + if (!grp || grp->IsEmpty()) continue; + myGroups.Add(grp->GetID()); + } + } +} + +//================================================================ +// Function : GetGeom +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetGeom + ( const Standard_Integer ID, const Standard_Boolean IsElement, + TColStd_Array1OfReal& Coords, Standard_Integer& NbNodes, + MeshVS_EntityType& Type ) const +{ + if( IsElement ) { + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(ID); + if (!myElem) return Standard_False; + if (myElem->GetType() == SMDSAbs_Edge) + Type = MeshVS_ET_Link; + else if (myElem->GetType() == SMDSAbs_Face) + Type = MeshVS_ET_Face; + else if (myElem->GetType() == SMDSAbs_Volume) + Type = MeshVS_ET_Volume; + else + Type = MeshVS_ET_Element; + NbNodes = myElem->NbNodes(); + int nbCoord = 1; + for(Standard_Integer i = 0; i < NbNodes; i++ ) { + Coords(nbCoord++) = myElem->GetNode(i)->X(); + Coords(nbCoord++) = myElem->GetNode(i)->Y(); + Coords(nbCoord++) = myElem->GetNode(i)->Z(); + } + } + else { + const SMDS_MeshNode* myNode = myMesh->GetMeshDS()->FindNode(ID); + if (!myNode) return Standard_False; + if (myNode->GetType() == SMDSAbs_Node) + Type = MeshVS_ET_Node; + else + Type = MeshVS_ET_0D; + NbNodes = 1; + Coords(1) = myNode->X(); + Coords(2) = myNode->Y(); + Coords(3) = myNode->Z(); + } + return Standard_True; +} + +//================================================================ +// Function : Get3DGeom +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::Get3DGeom + ( const Standard_Integer ID, Standard_Integer& NbNodes, + Handle(MeshVS_HArray1OfSequenceOfInteger)& Data) const +{ + //check validity of element + const SMDS_MeshElement* myVolume = myMesh->GetMeshDS()->FindElement(ID); + if (!myVolume) return Standard_False; + if (myVolume->GetType() != SMDSAbs_Volume) return Standard_False; + + //initialize VolumeTool + SMDS_VolumeTool aTool; + aTool.Set(myVolume); + //set the nodes number + NbNodes = aTool.NbNodes();// myVolume->NbNodes(); + //check validity or create Data + int NbFaces = aTool.NbFaces(); + if (Data.IsNull()) + Data = new MeshVS_HArray1OfSequenceOfInteger(1, NbFaces); + else if (Data->Length() != NbFaces) { + Data.Nullify(); + Data = new MeshVS_HArray1OfSequenceOfInteger(1, NbFaces); + } + //iterate the faces and their nodes and add them to Data + for (int itr=0;itr < NbFaces;itr++) { + int NbThisFaceNodeCount = aTool.NbFaceNodes(itr); + const int *FaceIndices = aTool.GetFaceNodesIndices(itr); + int sortedFaceIndices[MAX_SORT_NODE_COUNT]; + TColStd_SequenceOfInteger aSeq; + if (sortNodes(myVolume, FaceIndices, NbThisFaceNodeCount, sortedFaceIndices)) { + for (int itrX=0;itrX < NbThisFaceNodeCount;itrX++) + aSeq.Append(sortedFaceIndices[itrX]); + } else { + for (int itrX=0;itrX < NbThisFaceNodeCount;itrX++) + aSeq.Append(FaceIndices[itrX]); + } + Data->SetValue(itr+1, aSeq); + } + return Standard_True; +} + +//================================================================ +// Function : GetGeomType +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetGeomType + ( const Standard_Integer ID, + const Standard_Boolean IsElement, + MeshVS_EntityType& Type ) const +{ + if( IsElement ) { + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(ID); + if (!myElem) return Standard_False; + if (myElem->GetType() == SMDSAbs_Edge) + Type = MeshVS_ET_Link; + else if (myElem->GetType() == SMDSAbs_Face) + Type = MeshVS_ET_Face; + else if (myElem->GetType() == SMDSAbs_Volume) + Type = MeshVS_ET_Volume; + else + Type = MeshVS_ET_Element; + } + else { + const SMDS_MeshNode* myNode = myMesh->GetMeshDS()->FindNode(ID); + if (!myNode) return Standard_False; + if (myNode->GetType() == SMDSAbs_Node) + Type = MeshVS_ET_Node; + else + Type = MeshVS_ET_0D; + } + return Standard_True; +} + +//================================================================ +// Function : GetAddr +// Purpose : +//================================================================ +Standard_Address SMESH_MeshVSLink::GetAddr + ( const Standard_Integer, const Standard_Boolean ) const +{ + return NULL; +} + +//================================================================ +// Function : GetNodesByElement +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetNodesByElement + ( const Standard_Integer ID,TColStd_Array1OfInteger& NodeIDs,Standard_Integer& NbNodes ) const +{ + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(ID); + if (!myElem) return Standard_False; + NbNodes = myElem->NbNodes(); + for(Standard_Integer i = 0; i < NbNodes; i++ ) { + const SMDS_MeshNode* aNode = myElem->GetNode(i); + if (!aNode) return Standard_False; + NodeIDs.SetValue(i+1, aNode->GetID()); + } + return Standard_True; +} + +//================================================================ +// Function : GetAllNodes +// Purpose : +//================================================================ +const TColStd_PackedMapOfInteger& SMESH_MeshVSLink::GetAllNodes() const +{ + return myNodes; +} + +//================================================================ +// Function : GetAllElements +// Purpose : +//================================================================ +const TColStd_PackedMapOfInteger& SMESH_MeshVSLink::GetAllElements() const +{ + return myElements; +} + +//================================================================ +// Function : GetAllElements +// Purpose : +//================================================================ +void SMESH_MeshVSLink::GetAllGroups(TColStd_PackedMapOfInteger& Ids) const +{ + Ids = myGroups; +} + +//================================================================ +// Function : GetNormal +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetNormal + ( const Standard_Integer Id, const Standard_Integer Max, + Standard_Real& nx, Standard_Real& ny,Standard_Real& nz ) const +{ + if(Max<3) return Standard_False; + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(Id); + if(!myElem) return Standard_False; + if(myElem->NbNodes() < 3) return Standard_False; + gp_XYZ normal; + gp_XYZ nodes[3]; + for (int itr = 0;itr < 3;itr++) + nodes[itr] = gp_XYZ(myElem->GetNode(itr)->X(), myElem->GetNode(itr)->Y(), myElem->GetNode(itr)->Z()); + normal = (nodes[1]-nodes[0]) ^ (nodes[2]-nodes[0]); + if ( normal.Modulus() > 0 ) + normal /= normal.Modulus(); + nx = normal.X(); + ny = normal.Y(); + nz = normal.Z(); + return Standard_True; +} +======= +// SMESH SMESH_MeshVSLink : Connection of SMESH with MeshVS from OCC +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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 2.1 of the License. +// +// This library 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 this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_MeshVSLink.cxx +// Created : Mon Dec 1 09:00:00 2008 +// Author : Sioutis Fotios +// Module : SMESH + +//local headers +#include +#include + +//occ headers +#include +#include +#include + +//BEGIN sortNodes CHANGE /* +#include + +#include +#include +#include + +#define MAX_SORT_NODE_COUNT 12 + +typedef std::map T_Double_NodeID_Map; + +//======================================================================= +//function : sortNodes +//purpose : +//======================================================================= +bool sortNodes (const SMDS_MeshElement* theTool, const int* idNodes, int theNodeCount, int *myResult) +{ + if (theNodeCount < 3) return false; + //INITIAL VARS + TColgp_Array1OfXYZ myNodeList(1, theNodeCount); + TColgp_Array1OfVec myVectList(1, theNodeCount); + TColStd_Array1OfReal myAngleList(1, theNodeCount); + gp_XYZ BaryCenter(0.,0.,0.); + //int myResult[MAX_SORT_NODE_COUNT]; + //INITIALIZE THE POINTS + for (int i = 1; i <= theNodeCount; i++ ) { + const SMDS_MeshNode *n = theTool->GetNode( idNodes[i-1] ); + gp_XYZ aPoint(n->X(), n->Y(), n->Z()); + myNodeList.SetValue(i, aPoint); + } + //CALCULATE THE BARYCENTER + for (int i = 1; i <= theNodeCount; i++ ) + BaryCenter += myNodeList.Value(i); + BaryCenter /= theNodeCount; + //CREATE THE VECTORS + for (int i = 1; i <= theNodeCount; i++ ) { + gp_Vec aVector(BaryCenter, myNodeList.Value(i)); + myVectList.SetValue(i, aVector); + } + //CALCULATE THE NORMAL USING FIRST THREE POINTS + gp_XYZ q1 = myNodeList.Value(2)-myNodeList.Value(1); + gp_XYZ q2 = myNodeList.Value(3)-myNodeList.Value(1); + gp_XYZ normal = q1 ^ q2; + double modul = normal.Modulus(); + if ( modul > 0 ) + normal /= modul; + //COUNT THE ANGLE OF THE FIRST WITH EACH + for (int i = 1; i <= theNodeCount; i++ ) + myAngleList.SetValue(i, myVectList.Value(1).AngleWithRef(myVectList.Value(i), normal)); + //CREATE THE RESULT MAP (WILL SORT THE VERTICES) + T_Double_NodeID_Map myMap; + for (int i = 1; i <= theNodeCount; i++ ) + myMap.insert( make_pair(myAngleList.Value(i), idNodes[i-1])); + int resID = 0; + T_Double_NodeID_Map::iterator it; + for(it = myMap.begin(); it!= myMap.end(); ++it) + myResult[resID++] = it->second; + + return true; +} +//END sortNodes CHANGE */ + +//================================================================ +// Function : Constructor +// Purpose : +//================================================================ +SMESH_MeshVSLink::SMESH_MeshVSLink(const SMESH_Mesh *aMesh) +{ + myMesh = (SMESH_Mesh*) aMesh; + //add the nodes + SMDS_NodeIteratorPtr aNodeIter = myMesh->GetMeshDS()->nodesIterator(); + for(;aNodeIter->more();) { + const SMDS_MeshNode* aNode = aNodeIter->next(); + myNodes.Add( aNode->GetID() ); + } + //add the edges + SMDS_EdgeIteratorPtr anEdgeIter = myMesh->GetMeshDS()->edgesIterator(); + for(;anEdgeIter->more();) { + const SMDS_MeshEdge* anElem = anEdgeIter->next(); + myElements.Add( anElem->GetID() ); + } + //add the faces + SMDS_FaceIteratorPtr aFaceIter = myMesh->GetMeshDS()->facesIterator(); + for(;aFaceIter->more();) { + const SMDS_MeshFace* anElem = aFaceIter->next(); + myElements.Add( anElem->GetID() ); + } + //add the volumes + SMDS_VolumeIteratorPtr aVolumeIter = myMesh->GetMeshDS()->volumesIterator(); + for(;aVolumeIter->more();) { + const SMDS_MeshVolume* anElem = aVolumeIter->next(); + myElements.Add( anElem->GetID() ); + } + //add the groups + const std::set& groups = myMesh->GetMeshDS()->GetGroups(); + if (!groups.empty()) { + std::set::const_iterator GrIt = groups.begin(); + for (; GrIt != groups.end(); GrIt++) { + SMESHDS_Group* grp = dynamic_cast(*GrIt); + if (!grp || grp->IsEmpty()) continue; + myGroups.Add(grp->GetID()); + } + } +} + +//================================================================ +// Function : GetGeom +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetGeom + ( const Standard_Integer ID, const Standard_Boolean IsElement, + TColStd_Array1OfReal& Coords, Standard_Integer& NbNodes, + MeshVS_EntityType& Type ) const +{ + if( IsElement ) { + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(ID); + if (!myElem) return Standard_False; + if (myElem->GetType() == SMDSAbs_Edge) + Type = MeshVS_ET_Link; + else if (myElem->GetType() == SMDSAbs_Face) + Type = MeshVS_ET_Face; + else if (myElem->GetType() == SMDSAbs_Volume) + Type = MeshVS_ET_Volume; + else + Type = MeshVS_ET_Element; + NbNodes = myElem->NbNodes(); + int nbCoord = 1; + for(Standard_Integer i = 0; i < NbNodes; i++ ) { + Coords(nbCoord++) = myElem->GetNode(i)->X(); + Coords(nbCoord++) = myElem->GetNode(i)->Y(); + Coords(nbCoord++) = myElem->GetNode(i)->Z(); + } + } + else { + const SMDS_MeshNode* myNode = myMesh->GetMeshDS()->FindNode(ID); + if (!myNode) return Standard_False; + if (myNode->GetType() == SMDSAbs_Node) + Type = MeshVS_ET_Node; + else + Type = MeshVS_ET_0D; + NbNodes = 1; + Coords(1) = myNode->X(); + Coords(2) = myNode->Y(); + Coords(3) = myNode->Z(); + } + return Standard_True; +} + +//================================================================ +// Function : Get3DGeom +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::Get3DGeom + ( const Standard_Integer ID, Standard_Integer& NbNodes, + Handle(MeshVS_HArray1OfSequenceOfInteger)& Data) const +{ + //check validity of element + const SMDS_MeshElement* myVolume = myMesh->GetMeshDS()->FindElement(ID); + if (!myVolume) return Standard_False; + if (myVolume->GetType() != SMDSAbs_Volume) return Standard_False; + + //initialize VolumeTool + SMDS_VolumeTool aTool; + aTool.Set(myVolume); + //set the nodes number + NbNodes = aTool.NbNodes();// myVolume->NbNodes(); + //check validity or create Data + int NbFaces = aTool.NbFaces(); + if (Data.IsNull()) + Data = new MeshVS_HArray1OfSequenceOfInteger(1, NbFaces); + else if (Data->Length() != NbFaces) { + Data.Nullify(); + Data = new MeshVS_HArray1OfSequenceOfInteger(1, NbFaces); + } + //iterate the faces and their nodes and add them to Data + for (int itr=0;itr < NbFaces;itr++) { + int NbThisFaceNodeCount = aTool.NbFaceNodes(itr); + const int *FaceIndices = aTool.GetFaceNodesIndices(itr); + int sortedFaceIndices[MAX_SORT_NODE_COUNT]; + TColStd_SequenceOfInteger aSeq; + if (sortNodes(myVolume, FaceIndices, NbThisFaceNodeCount, sortedFaceIndices)) { + for (int itrX=0;itrX < NbThisFaceNodeCount;itrX++) + aSeq.Append(sortedFaceIndices[itrX]); + } else { + for (int itrX=0;itrX < NbThisFaceNodeCount;itrX++) + aSeq.Append(FaceIndices[itrX]); + } + Data->SetValue(itr+1, aSeq); + } + return Standard_True; +} + +//================================================================ +// Function : GetGeomType +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetGeomType + ( const Standard_Integer ID, + const Standard_Boolean IsElement, + MeshVS_EntityType& Type ) const +{ + if( IsElement ) { + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(ID); + if (!myElem) return Standard_False; + if (myElem->GetType() == SMDSAbs_Edge) + Type = MeshVS_ET_Link; + else if (myElem->GetType() == SMDSAbs_Face) + Type = MeshVS_ET_Face; + else if (myElem->GetType() == SMDSAbs_Volume) + Type = MeshVS_ET_Volume; + else + Type = MeshVS_ET_Element; + } + else { + const SMDS_MeshNode* myNode = myMesh->GetMeshDS()->FindNode(ID); + if (!myNode) return Standard_False; + if (myNode->GetType() == SMDSAbs_Node) + Type = MeshVS_ET_Node; + else + Type = MeshVS_ET_0D; + } + return Standard_True; +} + +//================================================================ +// Function : GetAddr +// Purpose : +//================================================================ +Standard_Address SMESH_MeshVSLink::GetAddr + ( const Standard_Integer, const Standard_Boolean ) const +{ + return NULL; +} + +//================================================================ +// Function : GetNodesByElement +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetNodesByElement + ( const Standard_Integer ID,TColStd_Array1OfInteger& NodeIDs,Standard_Integer& NbNodes ) const +{ + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(ID); + if (!myElem) return Standard_False; + NbNodes = myElem->NbNodes(); + for(Standard_Integer i = 0; i < NbNodes; i++ ) { + const SMDS_MeshNode* aNode = myElem->GetNode(i); + if (!aNode) return Standard_False; + NodeIDs.SetValue(i+1, aNode->GetID()); + } + return Standard_True; +} + +//================================================================ +// Function : GetAllNodes +// Purpose : +//================================================================ +const TColStd_PackedMapOfInteger& SMESH_MeshVSLink::GetAllNodes() const +{ + return myNodes; +} + +//================================================================ +// Function : GetAllElements +// Purpose : +//================================================================ +const TColStd_PackedMapOfInteger& SMESH_MeshVSLink::GetAllElements() const +{ + return myElements; +} + +//================================================================ +// Function : GetAllElements +// Purpose : +//================================================================ +void SMESH_MeshVSLink::GetAllGroups(TColStd_PackedMapOfInteger& Ids) const +{ + Ids = myGroups; +} + +//================================================================ +// Function : GetNormal +// Purpose : +//================================================================ +Standard_Boolean SMESH_MeshVSLink::GetNormal + ( const Standard_Integer Id, const Standard_Integer Max, + Standard_Real& nx, Standard_Real& ny,Standard_Real& nz ) const +{ + if(Max<3) return Standard_False; + const SMDS_MeshElement* myElem = myMesh->GetMeshDS()->FindElement(Id); + if(!myElem) return Standard_False; + if(myElem->NbNodes() < 3) return Standard_False; + gp_XYZ normal; + gp_XYZ nodes[3]; + for (int itr = 0;itr < 3;itr++) + nodes[itr] = gp_XYZ(myElem->GetNode(itr)->X(), myElem->GetNode(itr)->Y(), myElem->GetNode(itr)->Z()); + normal = (nodes[1]-nodes[0]) ^ (nodes[2]-nodes[0]); + if ( normal.Modulus() > 0 ) + normal /= normal.Modulus(); + nx = normal.X(); + ny = normal.Y(); + nz = normal.Z(); + return Standard_True; +} +>>>>>>> upgrade to SMESH7.7.1 diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 4b8f5a5b5c12..afcb866bb82e 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1135,6 +1135,13 @@ void Application::initTypes(void) App ::PropertyPythonObject ::init(); App ::PropertyExpressionEngine ::init(); + // Extension classes + App ::Extension ::init(); + App ::GroupExtension ::init(); + App ::GeoFeatureGroupExtension ::init(); + //App ::GeoFeatureGroupPython ::init(); + App ::OriginGroupExtension ::init(); + // Document classes App ::TransactionalObject ::init(); App ::DocumentObject ::init(); @@ -1158,9 +1165,6 @@ void Application::initTypes(void) App ::OriginFeature ::init(); App ::Plane ::init(); App ::Line ::init(); - App ::GeoFeatureGroup ::init(); - App ::GeoFeatureGroupPython ::init(); - App ::OriginGroup ::init(); App ::Part ::init(); App ::Origin ::init(); diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index d9f3129c369d..fbba57953d36 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -55,8 +55,8 @@ generate_from_xml(DocumentPy) generate_from_xml(DocumentObjectPy) generate_from_xml(DocumentObjectGroupPy) generate_from_xml(GeoFeaturePy) -generate_from_xml(GeoFeatureGroupPy) -generate_from_xml(OriginGroupPy) +#generate_from_xml(GeoFeatureGroupPy) +#generate_from_xml(OriginGroupPy) generate_from_xml(PartPy) generate_from_xml(ComplexGeoDataPy) @@ -70,8 +70,8 @@ SET(FreeCADApp_XML_SRCS DocumentObjectGroupPy.xml DocumentObjectPy.xml GeoFeaturePy.xml - GeoFeatureGroupPy.xml - OriginGroupPy.xml +# GeoFeatureGroupPy.xml +# OriginGroupPy.xml PartPy.xml DocumentPy.xml PropertyContainerPy.xml @@ -85,6 +85,7 @@ SET(Document_CPP_SRCS Annotation.cpp Document.cpp DocumentObject.cpp + Extension.cpp DocumentObjectFileIncluded.cpp DocumentObjectGroup.cpp DocumentObjectGroupPyImp.cpp @@ -97,9 +98,9 @@ SET(Document_CPP_SRCS FeaturePython.cpp FeatureTest.cpp GeoFeature.cpp - GeoFeatureGroupPyImp.cpp +# GeoFeatureGroupPyImp.cpp GeoFeatureGroup.cpp - OriginGroupPyImp.cpp +# OriginGroupPyImp.cpp OriginGroup.cpp PartPyImp.cpp Part.cpp @@ -121,6 +122,7 @@ SET(Document_HPP_SRCS Annotation.h Document.h DocumentObject.h + Extension.h DocumentObjectFileIncluded.h DocumentObjectGroup.h DocumentObserver.h diff --git a/src/App/Document.cpp b/src/App/Document.cpp index ece4201380f4..fc80d7069ff8 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -1901,7 +1901,7 @@ DocumentObject * Document::addObject(const char* sType, const char* pObjectName, throw Base::TypeError(str.str()); } - App::DocumentObject* pcObject = static_cast(base); + App::DocumentObject* pcObject = dynamic_cast(base); pcObject->setDocument(this); // do no transactions if we do a rollback! @@ -2400,6 +2400,17 @@ std::vector Document::getObjectsOfType(const Base::Type& typeId return Objects; } +std::vector< DocumentObject* > Document::getObjectsWithExtension(const Base::Type& typeId) const { + + std::vector Objects; + for (std::vector::const_iterator it = d->objectArray.begin(); it != d->objectArray.end(); ++it) { + if ((*it)->hasExtension(typeId)) + Objects.push_back(*it); + } + return Objects; +} + + std::vector Document::findObjects(const Base::Type& typeId, const char* objname) const { boost::regex rx(objname); diff --git a/src/App/Document.h b/src/App/Document.h index 947f5371669b..7b3d5454e54a 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -218,6 +218,7 @@ class AppExport Document : public App::PropertyContainer /// Returns a list of all Objects std::vector getObjects() const; std::vector getObjectsOfType(const Base::Type& typeId) const; + std::vector getObjectsWithExtension(const Base::Type& typeId) const; std::vector findObjects(const Base::Type& typeId, const char* objname) const; /// Returns an array with the correct types already. template inline std::vector getObjectsOfType() const; diff --git a/src/App/DocumentObject.cpp b/src/App/DocumentObject.cpp index bc003b4d431f..fc61eaef73f5 100644 --- a/src/App/DocumentObject.cpp +++ b/src/App/DocumentObject.cpp @@ -181,7 +181,7 @@ std::vector DocumentObject::getInList(void) const DocumentObjectGroup* DocumentObject::getGroup() const { - return DocumentObjectGroup::getGroupOfObject(this); + return dynamic_cast(GroupExtension::getGroupOfObject(this)); } bool DocumentObject::testIfLinkDAGCompatible(DocumentObject *linkTo) const diff --git a/src/App/DocumentObject.h.orig b/src/App/DocumentObject.h.orig new file mode 100644 index 000000000000..b91dfdd9c203 --- /dev/null +++ b/src/App/DocumentObject.h.orig @@ -0,0 +1,271 @@ +/*************************************************************************** + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#ifndef APP_DOCUMENTOBJECT_H +#define APP_DOCUMENTOBJECT_H + +<<<<<<< 51e23d854e59ab0a23a9ea9b19e74e5f02753d82 +#include +======= +#include +>>>>>>> Introduce extensions and port App groups +#include +#include +#include + +#include +#include + +#include +#include + +namespace App +{ +class Document; +class DocumentObjectGroup; +class DocumentObjectPy; +class Expression; + +enum ObjectStatus { + Touch = 0, + Error = 1, + New = 2, + Recompute = 3, + Restore = 4, + Delete = 5, + Expand = 16 +}; + +/** Return object for feature execution +*/ +class AppExport DocumentObjectExecReturn +{ +public: + DocumentObjectExecReturn(const std::string& sWhy, DocumentObject* WhichObject=0) + : Why(sWhy), Which(WhichObject) + { + } + DocumentObjectExecReturn(const char* sWhy, DocumentObject* WhichObject=0) + : Which(WhichObject) + { + if(sWhy) + Why = sWhy; + } + + std::string Why; + DocumentObject* Which; +}; + + + +/** Base class of all Classes handled in the Document + */ +<<<<<<< 51e23d854e59ab0a23a9ea9b19e74e5f02753d82 +class AppExport DocumentObject: public App::TransactionalObject +======= +class AppExport DocumentObject : public App::ExtensionContainer +>>>>>>> Introduce extensions and port App groups +{ + PROPERTY_HEADER(App::DocumentObject); + +public: + + PropertyString Label; + PropertyExpressionEngine ExpressionEngine; + + /// returns the type name of the ViewProvider + virtual const char* getViewProviderName(void) const { + return ""; + } + /// Constructor + DocumentObject(void); + virtual ~DocumentObject(); + + /// returns the name which is set in the document for this object (not the name property!) + const char *getNameInDocument(void) const; + virtual bool isAttachedToDocument() const; + virtual const char* detachFromDocument(); + /// gets the document in which this Object is handled + App::Document *getDocument(void) const; + + /** Set the property touched -> changed, cause recomputation in Update() + */ + //@{ + /// set this feature touched (cause recomputation on depndend features) + void touch(void); + /// test if this feature is touched + bool isTouched(void) const; + /// reset this feature touched + void purgeTouched(void){StatusBits.reset(0);setPropertyStatus(0,false);} + /// set this feature to error + bool isError(void) const {return StatusBits.test(1);} + bool isValid(void) const {return !StatusBits.test(1);} + /// remove the error from the object + void purgeError(void){StatusBits.reset(1);} + /// returns true if this objects is currently recomputing + bool isRecomputing() const {return StatusBits.test(3);} + /// returns true if this objects is currently restoring from file + bool isRestoring() const {return StatusBits.test(4);} + /// returns true if this objects is currently restoring from file + bool isDeleting() const {return StatusBits.test(5);} + /// recompute only this object + virtual App::DocumentObjectExecReturn *recompute(void); + /// return the status bits + unsigned long getStatus() const {return StatusBits.to_ulong();} + bool testStatus(ObjectStatus pos) const {return StatusBits.test((size_t)pos);} + void setStatus(ObjectStatus pos, bool on) {StatusBits.set((size_t)pos, on);} + //@} + + /// returns a list of objects this object is pointing to by Links + std::vector getOutList(void) const; + /// get all objects link to this object + std::vector getInList(void) const; + /// get group if object is part of a group, otherwise 0 is returned + DocumentObjectGroup* getGroup() const; + + /** + * @brief testIfLinkIsDAG tests a link that is about to be created for + * circular references. + * @param objToLinkIn (input). The object this object is to depend on after + * the link is going to be created. + * @return true if link can be created (no cycles will be made). False if + * the link will cause a circular dependency and break recomputes. Throws an + * error if the document already has a circular dependency. + * That is, if the return is true, the link is allowed. + */ + bool testIfLinkDAGCompatible(DocumentObject* linkTo) const; + bool testIfLinkDAGCompatible(const std::vector &linksTo) const; + bool testIfLinkDAGCompatible(App::PropertyLinkSubList &linksTo) const; + bool testIfLinkDAGCompatible(App::PropertyLinkSub &linkTo) const; + + +public: + /** mustExecute + * We call this method to check if the object was modified to + * be invoked. If the object label or an argument is modified. + * If we must recompute the object - to call the method execute(). + * 0: no recompution is needed + * 1: recompution needed + * -1: the document examine all links of this object and if one is touched -> recompute + */ + virtual short mustExecute(void) const; + + /// get the status Message + const char *getStatusString(void) const; + + /** Called in case of loosing a link + * Get called by the document when a object got deleted a link property of this + * object ist pointing to. The standard behaviour of the DocumentObject implementation + * is to reset the links to nothing. You may overide this method to implement + *additional or different behavior. + */ + virtual void onLostLinkToObject(DocumentObject*); + virtual PyObject *getPyObject(void); + /// its used to get the python sub objects by name (e.g. by the selection) + virtual std::vector getPySubObjects(const std::vector&) const; + + friend class Document; + friend class Transaction; + friend class ObjectExecution; + + static DocumentObjectExecReturn *StdReturn; + + virtual void Save (Base::Writer &writer) const; + + /* Expression support */ + + virtual void setExpression(const ObjectIdentifier & path, boost::shared_ptr expr, const char *comment = 0); + + virtual const PropertyExpressionEngine::ExpressionInfo getExpression(const ObjectIdentifier &path) const; + + virtual void renameObjectIdentifiers(const std::map & paths); + + virtual void connectRelabelSignals(); + + const std::string & getOldLabel() const { return oldLabel; } + +protected: + /** get called by the document to recompute this feature + * Normaly this method get called in the processing of + * Document::recompute(). + * In execute() the outpupt properties get recomputed + * with the data from linked objects and objects own + * properties. + */ + virtual App::DocumentObjectExecReturn *execute(void); + + /** Status bits of the document object + * The first 8 bits are used for the base system the rest can be used in + * descendent classes to to mark special stati on the objects. + * The bits and their meaning are listed below: + * 0 - object is marked as 'touched' + * 1 - object is marked as 'erroneous' + * 2 - object is marked as 'new' + * 3 - object is marked as 'recompute', i.e. the object gets recomputed now + * 4 - object is marked as 'restoring', i.e. the object gets loaded at the moment + * 5 - object is marked as 'deleting', i.e. the object gets deleted at the moment + * 6 - reserved + * 7 - reserved + * 16 - object is marked as 'expanded' in the tree view + */ + std::bitset<32> StatusBits; + + void setError(void){StatusBits.set(1);} + void resetError(void){StatusBits.reset(1);} + void setDocument(App::Document* doc); + + /// get called before the value is changed + virtual void onBeforeChange(const Property* prop); + /// get called by the container when a property was changed + virtual void onChanged(const Property* prop); + /// get called after a document has been fully restored + virtual void onDocumentRestored() {} + /// get called after setting the document + virtual void onSettingDocument() {} + /// get called after a brand new object was created + virtual void setupObject() {} + /// get called when object is going to be removed from the document + virtual void unsetupObject() {} + + /// python object of this class and all descendend +protected: // attributes + Py::Object PythonObject; + /// pointer to the document this object belongs to + App::Document* _pDoc; + + // Connections to track relabeling of document and document objects + boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledDocumentConnection; + boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledObjectConnection; + boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onDeletedObjectConnection; + + /// Old label; used for renaming expressions + std::string oldLabel; + + // pointer to the document name string (for performance) + const std::string *pcNameInDocument; +}; + +} //namespace App + + +#endif // APP_DOCUMENTOBJECT_H diff --git a/src/App/DocumentObjectGroup.cpp b/src/App/DocumentObjectGroup.cpp index 474a00276de2..a2036e07f1fe 100644 --- a/src/App/DocumentObjectGroup.cpp +++ b/src/App/DocumentObjectGroup.cpp @@ -33,26 +33,27 @@ using namespace App; -PROPERTY_SOURCE(App::DocumentObjectGroup, App::DocumentObject) - +PROPERTY_SOURCE(App::GroupExtension, App::Extension) -DocumentObjectGroup::DocumentObjectGroup() +GroupExtension::GroupExtension() { + m_extensionType = GroupExtension::getClassTypeId(); + ADD_PROPERTY_TYPE(Group,(0),"Base",(App::PropertyType)(Prop_Output),"List of referenced objects"); } -DocumentObjectGroup::~DocumentObjectGroup() +GroupExtension::~GroupExtension() { } -DocumentObject* DocumentObjectGroup::addObject(const char* sType, const char* pObjectName) +DocumentObject* GroupExtension::addObject(const char* sType, const char* pObjectName) { - DocumentObject* obj = getDocument()->addObject(sType, pObjectName); + DocumentObject* obj = getExtendedObject()->getDocument()->addObject(sType, pObjectName); if (obj) addObject(obj); return obj; } -void DocumentObjectGroup::addObject(DocumentObject* obj) +void GroupExtension::addObject(DocumentObject* obj) { if (!hasObject(obj)) { std::vector grp = Group.getValues(); @@ -61,7 +62,7 @@ void DocumentObjectGroup::addObject(DocumentObject* obj) } } -void DocumentObjectGroup::removeObject(DocumentObject* obj) +void GroupExtension::removeObject(DocumentObject* obj) { const std::vector & grp = Group.getValues(); std::vector newGrp; @@ -72,7 +73,7 @@ void DocumentObjectGroup::removeObject(DocumentObject* obj) } } -void DocumentObjectGroup::removeObjectsFromDocument() +void GroupExtension::removeObjectsFromDocument() { const std::vector & grp = Group.getValues(); // Use set so iterate on each linked object exactly one time (in case of multiple links to the same document) @@ -83,34 +84,34 @@ void DocumentObjectGroup::removeObjectsFromDocument() } } -void DocumentObjectGroup::removeObjectFromDocument(DocumentObject* obj) +void GroupExtension::removeObjectFromDocument(DocumentObject* obj) { // remove all children - if (obj->getTypeId().isDerivedFrom(DocumentObjectGroup::getClassTypeId())) { - DocumentObjectGroup *grp = static_cast(obj); + if (obj->hasExtension(GroupExtension::getClassTypeId())) { + GroupExtension *grp = static_cast(obj->getExtension(GroupExtension::getClassTypeId())); // recursive call to remove all subgroups grp->removeObjectsFromDocument(); } - this->getDocument()->remObject(obj->getNameInDocument()); + getExtendedObject()->getDocument()->remObject(obj->getNameInDocument()); } -DocumentObject *DocumentObjectGroup::getObject(const char *Name) const +DocumentObject *GroupExtension::getObject(const char *Name) const { - DocumentObject* obj = getDocument()->getObject(Name); + DocumentObject* obj = getExtendedObject()->getDocument()->getObject(Name); if (obj && hasObject(obj)) return obj; return 0; } -bool DocumentObjectGroup::hasObject(const DocumentObject* obj, bool recursive) const +bool GroupExtension::hasObject(const DocumentObject* obj, bool recursive) const { const std::vector& grp = Group.getValues(); for (std::vector::const_iterator it = grp.begin(); it != grp.end(); ++it) { if (*it == obj) { return true; - } else if ( recursive && (*it)->isDerivedFrom (App::DocumentObjectGroup::getTypeId()) ) { - App::DocumentObjectGroup *subGroup = static_cast (*it); + } else if ( recursive && (*it)->hasExtension(GroupExtension::getClassTypeId()) ) { + App::GroupExtension *subGroup = static_cast ((*it)->getExtension(GroupExtension::getClassTypeId())); if (subGroup->hasObject (obj, recursive)) { return true; } @@ -120,14 +121,14 @@ bool DocumentObjectGroup::hasObject(const DocumentObject* obj, bool recursive) c return false; } -bool DocumentObjectGroup::isChildOf(const DocumentObjectGroup* group) const +bool GroupExtension::isChildOf(const GroupExtension* group) const { const std::vector& grp = group->Group.getValues(); for (std::vector::const_iterator it = grp.begin(); it != grp.end(); ++it) { - if (*it == this) + if (*it == getExtendedObject()) return true; - if ((*it)->getTypeId().isDerivedFrom(DocumentObjectGroup::getClassTypeId())) { - if (this->isChildOf(static_cast(*it))) + if ((*it)->hasExtension(GroupExtension::getClassTypeId())) { + if (this->isChildOf(static_cast((*it)->getExtension(GroupExtension::getClassTypeId())))) return true; } } @@ -135,12 +136,12 @@ bool DocumentObjectGroup::isChildOf(const DocumentObjectGroup* group) const return false; } -std::vector DocumentObjectGroup::getObjects() const +std::vector GroupExtension::getObjects() const { return Group.getValues(); } -std::vector DocumentObjectGroup::getObjectsOfType(const Base::Type& typeId) const +std::vector GroupExtension::getObjectsOfType(const Base::Type& typeId) const { std::vector type; const std::vector& grp = Group.getValues(); @@ -152,7 +153,7 @@ std::vector DocumentObjectGroup::getObjectsOfType(const Base::T return type; } -int DocumentObjectGroup::countObjectsOfType(const Base::Type& typeId) const +int GroupExtension::countObjectsOfType(const Base::Type& typeId) const { int type=0; const std::vector& grp = Group.getValues(); @@ -164,35 +165,42 @@ int DocumentObjectGroup::countObjectsOfType(const Base::Type& typeId) const return type; } -DocumentObjectGroup* DocumentObjectGroup::getGroupOfObject(const DocumentObject* obj) +DocumentObject* GroupExtension::getGroupOfObject(const DocumentObject* obj) { const Document* doc = obj->getDocument(); - std::vector grps = doc->getObjectsOfType(DocumentObjectGroup::getClassTypeId()); + std::vector grps = doc->getObjectsOfType(GroupExtension::getClassTypeId()); for (std::vector::const_iterator it = grps.begin(); it != grps.end(); ++it) { - DocumentObjectGroup* grp = (DocumentObjectGroup*)(*it); + GroupExtension* grp = (GroupExtension*)(*it); if (grp->hasObject(obj)) - return grp; + return *it; } return 0; } -PyObject *DocumentObjectGroup::getPyObject() -{ - if (PythonObject.is(Py::_None())){ - // ref counter is set to 1 - PythonObject = Py::Object(new DocumentObjectGroupPy(this),true); - } - return Py::new_reference_to(PythonObject); + +PROPERTY_SOURCE(App::DocumentObjectGroup, App::DocumentObject) + +DocumentObjectGroup::DocumentObjectGroup(void): DocumentObject(), GroupExtension() { + + setExtendedObject(this); } +DocumentObjectGroup::~DocumentObjectGroup() { + +} + + + // Python feature --------------------------------------------------------- namespace App { +PROPERTY_SOURCE_TEMPLATE(App::GroupExtensionPython, App::GroupExtension) + /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(App::DocumentObjectGroupPython, App::DocumentObjectGroup) template<> const char* App::DocumentObjectGroupPython::getViewProviderName(void) const { - return "Gui::ViewProviderDocumentObjectGroupPython"; + return "Gui::ViewProviderGroupExtensionPython"; } template<> PyObject* App::DocumentObjectGroupPython::getPyObject(void) { if (PythonObject.is(Py::_None())) { diff --git a/src/App/DocumentObjectGroup.h b/src/App/DocumentObjectGroup.h index b0a549a29fd1..2c7b7204afb9 100644 --- a/src/App/DocumentObjectGroup.h +++ b/src/App/DocumentObjectGroup.h @@ -27,21 +27,23 @@ #include "FeaturePython.h" #include "DocumentObject.h" #include "PropertyLinks.h" +#include "Extension.h" #include namespace App { -class DocumentObjectGroupPy; +class DocumentObjectGroup; +class GroupExtensionPy; -class AppExport DocumentObjectGroup : public DocumentObject +class AppExport GroupExtension : public Extension { - PROPERTY_HEADER(App::DocumentObjectGroup); + PROPERTY_HEADER(App::GroupExtension); public: /// Constructor - DocumentObjectGroup(void); - virtual ~DocumentObjectGroup(); + GroupExtension(void); + virtual ~GroupExtension(); /** @name Object handling */ //@{ @@ -72,7 +74,7 @@ class AppExport DocumentObjectGroup : public DocumentObject * Checks whether this group object is a child (or sub-child) * of the given group object. */ - bool isChildOf(const DocumentObjectGroup*) const; + bool isChildOf(const GroupExtension*) const; /** Returns a list of all objects this group does have. */ std::vector getObjects() const; @@ -85,15 +87,9 @@ class AppExport DocumentObjectGroup : public DocumentObject /** Returns the object group of the document which the given object \a obj is part of. * In case this object is not part of a group 0 is returned. */ - static DocumentObjectGroup* getGroupOfObject(const DocumentObject* obj); + static DocumentObject* getGroupOfObject(const DocumentObject* obj); //@} - /// returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { - return "Gui::ViewProviderDocumentObjectGroup"; - } - virtual PyObject *getPyObject(void); - /// Properties PropertyLinkList Group; @@ -101,6 +97,24 @@ class AppExport DocumentObjectGroup : public DocumentObject void removeObjectFromDocument(DocumentObject*); }; +//no virtual functions to override, simple derivative is enough +typedef App::ExtensionPython GroupExtensionPython; + +class DocumentObjectGroup : public DocumentObject, public GroupExtension { + + PROPERTY_HEADER(App::DocumentObjectGroup); + +public: + /// Constructor + DocumentObjectGroup(void); + virtual ~DocumentObjectGroup(); + + /// returns the type name of the ViewProvider + virtual const char* getViewProviderName(void) const { + return "Gui::ViewProviderDocumentObjectGroup"; + }; +}; + typedef App::FeaturePythonT DocumentObjectGroupPython; diff --git a/src/App/Extension.cpp b/src/App/Extension.cpp new file mode 100644 index 000000000000..7465d3e36fe1 --- /dev/null +++ b/src/App/Extension.cpp @@ -0,0 +1,111 @@ +/*************************************************************************** + * Copyright (c) Stefan Tröger (stefantroeger@gmx.net) 2016 * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#include "PreCompiled.h" + +#ifndef _PreComp_ +# include +# include +#endif + +#include "Extension.h" +#include "DocumentObject.h" +#include "Base/Exception.h" + +TYPESYSTEM_SOURCE(App::Extension, App::PropertyContainer); + +using namespace App; + +//************************************************************************** +// Construction/Destruction + +// here the implemataion! description should take place in the header file! +Extension::Extension() {} + +Extension::~Extension() +{ + +} + +void Extension::setExtendedObject(DocumentObject* obj) { + + if(m_extensionType.isBad()) + throw Base::Exception("Extension::setExtendedObject: Extension type not set"); + + m_base = obj; + obj->registerExtension( m_extensionType, this ); +} + + + +TYPESYSTEM_SOURCE(App::ExtensionContainer, App::PropertyContainer); + +ExtensionContainer::ExtensionContainer() { + +}; + +ExtensionContainer::~ExtensionContainer() { + +}; + +void ExtensionContainer::registerExtension(Base::Type extension, Extension* ext) { + + if(hasExtension(extension)) + throw Base::Exception("ExtensionContainer::registerExtension: Such a extension is already registered"); + + if(ext->getExtendedObject() != this) + throw Base::Exception("ExtensionContainer::registerExtension: Extension has not this as base object"); + + _extensions[extension] = ext; +} + +bool ExtensionContainer::hasExtension(Base::Type t) const { + + //check for the exact type + bool found = _extensions.find(t) != _extensions.end(); + if(!found) { + //and for types derived from it, as they can be cast to the extension + for(auto entry : _extensions) { + if(entry.first.isDerivedFrom(t)) + return true; + } + return false; + } + return true; +} + +Extension* ExtensionContainer::getExtension(Base::Type t) { + + auto result = _extensions.find(t); + if(result == _extensions.end()) { + //we need to check for derived types + for(auto entry : _extensions) { + if(entry.first.isDerivedFrom(t)) + return entry.second; + } + //if we arive hear we don't have anything matching + throw Base::Exception("ExtensionContainer::getExtension: No extension of given type available"); + } + + return result->second; +} diff --git a/src/App/Extension.h b/src/App/Extension.h new file mode 100644 index 000000000000..e2a4642b6d47 --- /dev/null +++ b/src/App/Extension.h @@ -0,0 +1,113 @@ +/*************************************************************************** + * Copyright (c) Stefan Tröger (stefantroeger@gmx.net) 2016 * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#ifndef APP_DOCUMENTOBJECTEXTENSION_H +#define APP_DOCUMENTOBJECTEXTENSION_H + +#include "PropertyContainer.h" +#include "PropertyPythonObject.h" +#include + +namespace App { + +/** + * @brief Base class for all extension that can be added to a DocumentObject + * + */ +class AppExport Extension : public virtual App::PropertyContainer +{ + + TYPESYSTEM_HEADER(); + +public: + /** + * A constructor. + * A more elaborate description of the constructor. + */ + Extension(); + + /** + * A destructor. + * A more elaborate description of the destructor. + */ + virtual ~Extension(); + + App::DocumentObject* getExtendedObject() {return m_base;}; + const App::DocumentObject* getExtendedObject() const {return m_base;}; + void setExtendedObject(App::DocumentObject* obj); + +protected: + Base::Type m_extensionType; + App::DocumentObject* m_base; +}; + +template +class ExtensionPython : public ExtensionT { + + PROPERTY_HEADER(App::ExtensionPython); + +public: + ExtensionPython() { + ADD_PROPERTY(Proxy,(Py::Object())); + } + + //we actually don't need to override any extension methods by default as dynamic properties + //should not be supportet. +protected: + PropertyPythonObject Proxy; +}; + +class AppExport ExtensionContainer : public virtual App::PropertyContainer +{ + + TYPESYSTEM_HEADER(); + +public: + /** + * A constructor. + * A more elaborate description of the constructor. + */ + ExtensionContainer(); + + /** + * A destructor. + * A more elaborate description of the destructor. + */ + virtual ~ExtensionContainer(); + + void registerExtension(Base::Type extension, App::Extension* ext); + bool hasExtension(Base::Type) const; + App::Extension* getExtension(Base::Type); + template + Extension* getExtensionByType() { + return dynamic_cast(getExtension(Extension::getClassTypeId())); + }; + +private: + //stored extensions + std::map _extensions; +}; + +} //App + +#endif // APP_DOCUMENTOBJECTEXTENSION_H diff --git a/src/App/GeoFeatureGroup.cpp b/src/App/GeoFeatureGroup.cpp index 4cbb6bb4e2f9..c1229be6ff1e 100644 --- a/src/App/GeoFeatureGroup.cpp +++ b/src/App/GeoFeatureGroup.cpp @@ -30,29 +30,31 @@ #include #include "GeoFeatureGroup.h" -#include "GeoFeatureGroupPy.h" -#include "FeaturePythonPyImp.h" +//#include "GeoFeatureGroupPy.h" +//#include "FeaturePythonPyImp.h" using namespace App; -PROPERTY_SOURCE(App::GeoFeatureGroup, App::DocumentObjectGroup) +PROPERTY_SOURCE(App::GeoFeatureGroupExtension, App::GroupExtension) //=========================================================================== // Feature //=========================================================================== -GeoFeatureGroup::GeoFeatureGroup(void) +GeoFeatureGroupExtension::GeoFeatureGroupExtension(void) { + m_extensionType = GeoFeatureGroupExtension::getClassTypeId(); + ADD_PROPERTY(Placement,(Base::Placement())); } -GeoFeatureGroup::~GeoFeatureGroup(void) +GeoFeatureGroupExtension::~GeoFeatureGroupExtension(void) { } -void GeoFeatureGroup::transformPlacement(const Base::Placement &transform) +void GeoFeatureGroupExtension::transformPlacement(const Base::Placement &transform) { // NOTE: Keep in sync with APP::GeoFeature Base::Placement plm = this->Placement.getValue(); @@ -60,10 +62,10 @@ void GeoFeatureGroup::transformPlacement(const Base::Placement &transform) this->Placement.setValue(plm); } -std::vector GeoFeatureGroup::getGeoSubObjects () const { +std::vector GeoFeatureGroupExtension::getGeoSubObjects () const { const auto & objs = Group.getValues(); - std::set processedGroups; + std::set processedGroups; std::set rvSet; std::set curSearchSet (objs.begin(), objs.end()); @@ -91,14 +93,14 @@ std::vector GeoFeatureGroup::getGeoSubObjects () const { return std::vector ( rvSet.begin(), rvSet.end() ); } -bool GeoFeatureGroup::geoHasObject (const DocumentObject* obj) const { +bool GeoFeatureGroupExtension::geoHasObject (const DocumentObject* obj) const { const auto & objs = Group.getValues(); if (!obj) { return false; } - std::set processedGroups; + std::set processedGroups; std::set curSearchSet (objs.begin(), objs.end()); processedGroups.insert ( this ); @@ -123,19 +125,19 @@ bool GeoFeatureGroup::geoHasObject (const DocumentObject* obj) const { return false; } -GeoFeatureGroup* GeoFeatureGroup::getGroupOfObject(const DocumentObject* obj, bool indirect) +DocumentObject* GeoFeatureGroupExtension::getGroupOfObject(const DocumentObject* obj, bool indirect) { const Document* doc = obj->getDocument(); - std::vector grps = doc->getObjectsOfType(GeoFeatureGroup::getClassTypeId()); + std::vector grps = doc->getObjectsOfType(GeoFeatureGroupExtension::getClassTypeId()); for (std::vector::const_iterator it = grps.begin(); it != grps.end(); ++it) { - GeoFeatureGroup* grp = (GeoFeatureGroup*)(*it); + GeoFeatureGroupExtension* grp = (GeoFeatureGroupExtension*)(*it); if ( indirect ) { if (grp->geoHasObject(obj)) { - return grp; + return dynamic_cast(grp); } } else { if (grp->hasObject(obj)) { - return grp; + return dynamic_cast(grp); } } } @@ -143,33 +145,8 @@ GeoFeatureGroup* GeoFeatureGroup::getGroupOfObject(const DocumentObject* obj, bo return 0; } -PyObject *GeoFeatureGroup::getPyObject() -{ - if (PythonObject.is(Py::_None())){ - // ref counter is set to 1 - PythonObject = Py::Object(new GeoFeatureGroupPy(this),true); - } - return Py::new_reference_to(PythonObject); -} - // Python feature --------------------------------------------------------- - -namespace App { -/// @cond DOXERR -PROPERTY_SOURCE_TEMPLATE(App::GeoFeatureGroupPython, App::GeoFeatureGroup) -template<> const char* App::GeoFeatureGroupPython::getViewProviderName(void) const { - return "Gui::ViewProviderGeoFeatureGroupPython"; -} -template<> PyObject* App::GeoFeatureGroupPython::getPyObject(void) { - if (PythonObject.is(Py::_None())) { - // ref counter is set to 1 - PythonObject = Py::Object(new FeaturePythonPyT(this),true); - } - return Py::new_reference_to(PythonObject); -} -/// @endcond - // explicit template instantiation -template class AppExport FeaturePythonT; -} +//template class AppExport DocumentObjectExtensionPython; + diff --git a/src/App/GeoFeatureGroup.h b/src/App/GeoFeatureGroup.h index e3aed4c60738..4003388a6c0e 100644 --- a/src/App/GeoFeatureGroup.h +++ b/src/App/GeoFeatureGroup.h @@ -36,9 +36,9 @@ namespace App /** * The base class for placeable group of DocumentObjects */ -class AppExport GeoFeatureGroup : public App::DocumentObjectGroup +class AppExport GeoFeatureGroupExtension : public App::GroupExtension { - PROPERTY_HEADER(App::GeoFeatureGroup); + PROPERTY_HEADER(App::GeoFeatureGroupExtension); public: PropertyPlacement Placement; @@ -51,8 +51,8 @@ class AppExport GeoFeatureGroup : public App::DocumentObjectGroup */ virtual void transformPlacement(const Base::Placement &transform); /// Constructor - GeoFeatureGroup(void); - virtual ~GeoFeatureGroup(); + GeoFeatureGroupExtension(void); + virtual ~GeoFeatureGroupExtension(); /// Returns all geometrically controlled objects: all objects of this group and it's non-geo subgroups std::vector getGeoSubObjects () const; @@ -67,23 +67,15 @@ class AppExport GeoFeatureGroup : public App::DocumentObjectGroup * @param indirect if true return if the group that so-called geoHas the object, @see geoHasObject() * default is true */ - static GeoFeatureGroup* getGroupOfObject(const DocumentObject* obj, bool indirect=true); + static DocumentObject* getGroupOfObject(const DocumentObject* obj, bool indirect=true); /// Returns true if the given DocumentObject is DocumentObjectGroup but not GeoFeatureGroup static bool isNonGeoGroup(const DocumentObject* obj) { - return obj->isDerivedFrom ( App::DocumentObjectGroup::getClassTypeId () ) && - !obj->isDerivedFrom ( App::GeoFeatureGroup::getClassTypeId () ); + return obj->hasExtension(GroupExtension::getClassTypeId()); } - - /// Returns the type name of the ViewProvider - virtual const char* getViewProviderName(void) const { - return "Gui::ViewProviderGeoFeatureGroup"; - } - - virtual PyObject *getPyObject(void); }; -typedef App::FeaturePythonT GeoFeatureGroupPython; +typedef App::ExtensionPython GeoFeatureGroupExtensionPython; } //namespace App diff --git a/src/App/ObjectIdentifier.cpp b/src/App/ObjectIdentifier.cpp index 4522d6de6c9a..9734d335c32c 100644 --- a/src/App/ObjectIdentifier.cpp +++ b/src/App/ObjectIdentifier.cpp @@ -687,7 +687,7 @@ void ObjectIdentifier::resolve(ResolveResults &results) const /* Yes -- then this must be a property, so we get the document object's name from the owner */ bool byIdentifier; - results.resolvedDocumentObjectName = String(static_cast(owner)->getNameInDocument(), false, true); + results.resolvedDocumentObjectName = String(dynamic_cast(owner)->getNameInDocument(), false, true); results.resolvedDocumentObject = getDocumentObject(results.resolvedDocument, results.resolvedDocumentObjectName, byIdentifier); results.propertyName = components[0].name.getString(); if (results.resolvedDocumentObject) @@ -717,12 +717,12 @@ void ObjectIdentifier::resolve(ResolveResults &results) const if (documentName.getString().size() > 0) { /* Yes; then document object must follow */ results.resolvedDocumentObjectName = String(components[0].name, false, false); - results.resolvedDocumentObject = results.resolvedDocument->getObject(static_cast(owner)->getNameInDocument()); + results.resolvedDocumentObject = results.resolvedDocument->getObject(dynamic_cast(owner)->getNameInDocument()); results.propertyIndex = 1; } else { /* No, assume component is a property, and get document object's name from owner */ - const DocumentObject * docObj = static_cast(owner); + const DocumentObject * docObj = dynamic_cast(owner); results.resolvedDocument = docObj->getDocument(); results.resolvedDocumentName = String(results.resolvedDocument->getName(), false, true); results.resolvedDocumentObjectName = String(docObj->getNameInDocument(), false, true); diff --git a/src/App/OriginGroup.cpp b/src/App/OriginGroup.cpp index 8270708e7d62..b7106b7a681c 100644 --- a/src/App/OriginGroup.cpp +++ b/src/App/OriginGroup.cpp @@ -35,53 +35,56 @@ using namespace App; -PROPERTY_SOURCE(App::OriginGroup, App::GeoFeatureGroup); +PROPERTY_SOURCE(App::OriginGroupExtension, App::GeoFeatureGroupExtension); -OriginGroup::OriginGroup () { +OriginGroupExtension::OriginGroupExtension () { + + m_extensionType = OriginGroupExtension::getClassTypeId(); + ADD_PROPERTY_TYPE ( Origin, (0), 0, App::Prop_Hidden, "Origin linked to the group" ); } -OriginGroup::~OriginGroup () +OriginGroupExtension::~OriginGroupExtension () { } -App::Origin *OriginGroup::getOrigin () const { +App::Origin *OriginGroupExtension::getOrigin () const { App::DocumentObject *originObj = Origin.getValue (); if ( !originObj ) { std::stringstream err; - err << "Can't find Origin for \"" << getNameInDocument () << "\""; + err << "Can't find Origin for \"" << getExtendedObject()->getNameInDocument () << "\""; throw Base::Exception ( err.str().c_str () ); } else if (! originObj->isDerivedFrom ( App::Origin::getClassTypeId() ) ) { std::stringstream err; err << "Bad object \"" << originObj->getNameInDocument () << "\"(" << originObj->getTypeId().getName() - << ") linked to the Origin of \"" << getNameInDocument () << "\""; + << ") linked to the Origin of \"" << getExtendedObject()->getNameInDocument () << "\""; throw Base::Exception ( err.str().c_str () ); } else { return static_cast ( originObj ); } } -App::OriginGroup *OriginGroup::getGroupOfObject (const DocumentObject* obj, bool indirect) { +App::DocumentObject *OriginGroupExtension::getGroupOfObject (const DocumentObject* obj, bool indirect) { const Document* doc = obj->getDocument(); - std::vector grps = doc->getObjectsOfType ( OriginGroup::getClassTypeId() ); + std::vector grps = doc->getObjectsWithExtension ( OriginGroupExtension::getClassTypeId() ); for (auto grpObj: grps) { - OriginGroup* grp = static_cast (grpObj); + OriginGroupExtension* grp = dynamic_cast (grpObj->getExtension(OriginGroupExtension::getClassTypeId())); if ( indirect ) { if ( grp->geoHasObject (obj) ) { - return grp; + return dynamic_cast(grp); } } else { if ( grp->hasObject (obj) ) { - return grp; + return dynamic_cast(grp); } } } return 0; } - -short OriginGroup::mustExecute() const { +/* +short OriginGroupExtension::mustExecute() const { if (Origin.isTouched ()) { return 1; } else { @@ -89,7 +92,7 @@ short OriginGroup::mustExecute() const { } } -App::DocumentObjectExecReturn *OriginGroup::execute() { +App::DocumentObjectExecReturn *OriginGroupExtension::execute() { try { // try to find all base axis and planes in the origin getOrigin (); } catch (const Base::Exception &ex) { @@ -100,7 +103,7 @@ App::DocumentObjectExecReturn *OriginGroup::execute() { return GeoFeatureGroup::execute (); } -void OriginGroup::setupObject () { +void OriginGroupExtension::setupObject () { App::Document *doc = getDocument (); std::string objName = std::string ( getNameInDocument()).append ( "Origin" ); @@ -113,7 +116,7 @@ void OriginGroup::setupObject () { GeoFeatureGroup::setupObject (); } -void OriginGroup::unsetupObject () { +void OriginGroupExtension::unsetupObject () { App::DocumentObject *origin = Origin.getValue (); if (origin && !origin->isDeleting ()) { origin->getDocument ()->remObject (origin->getNameInDocument()); @@ -121,3 +124,4 @@ void OriginGroup::unsetupObject () { GeoFeatureGroup::unsetupObject (); } +*/ \ No newline at end of file diff --git a/src/App/OriginGroup.h b/src/App/OriginGroup.h index 298715d30c09..982f36338065 100644 --- a/src/App/OriginGroup.h +++ b/src/App/OriginGroup.h @@ -32,12 +32,12 @@ class Origin; /** * Represents an abstact placeable group of objects with an associated Origin */ -class AppExport OriginGroup: public App::GeoFeatureGroup +class AppExport OriginGroupExtension : public App::GeoFeatureGroupExtension { - PROPERTY_HEADER(App::OriginGroup); + PROPERTY_HEADER(App::OriginGroupExtension); public: - OriginGroup (); - virtual ~OriginGroup (); + OriginGroupExtension (); + virtual ~OriginGroupExtension (); /// Returns the origin link or throws an exception App::Origin *getOrigin () const; @@ -54,21 +54,21 @@ class AppExport OriginGroup: public App::GeoFeatureGroup * @param indirect if true return if the group that so-called geoHas the object, @see geoHasObject() * default is true */ - static OriginGroup* getGroupOfObject (const DocumentObject* obj, bool indirect=true); + static DocumentObject* getGroupOfObject (const DocumentObject* obj, bool indirect=true); /// Returns true on changing OriginFeature set - virtual short mustExecute () const; + //virtual short mustExecute () const; /// Origin linked to the group PropertyLink Origin; protected: /// Checks integrity of the Origin - virtual App::DocumentObjectExecReturn *execute (); + //virtual App::DocumentObjectExecReturn *execute (); /// Creates the corresponding Origin object - virtual void setupObject (); + //virtual void setupObject (); /// Removes all planes and axis if they are still linked to the document - virtual void unsetupObject (); + //virtual void unsetupObject (); }; } /* App */ diff --git a/src/App/Part.cpp b/src/App/Part.cpp index bea977748107..3585b8af4144 100644 --- a/src/App/Part.cpp +++ b/src/App/Part.cpp @@ -35,7 +35,7 @@ using namespace App; -PROPERTY_SOURCE(App::Part, App::OriginGroup) +PROPERTY_SOURCE(App::Part, App::DocumentObject) //=========================================================================== @@ -60,6 +60,7 @@ Part::Part(void) // color and apperance ADD_PROPERTY(Color, (1.0, 1.0, 1.0, 1.0)); // set transparent -> not used + setExtendedObject(this); } Part::~Part(void) diff --git a/src/App/Part.h b/src/App/Part.h index 91ec088465a2..f59899ed737c 100644 --- a/src/App/Part.h +++ b/src/App/Part.h @@ -35,7 +35,7 @@ namespace App /** Base class of all geometric document objects. */ -class AppExport Part : public App::OriginGroup +class AppExport Part : public App::DocumentObject, public App::OriginGroupExtension { PROPERTY_HEADER(App::Part); diff --git a/src/App/PartPy.xml b/src/App/PartPy.xml index fd1e2c9579cc..8c5279848d74 100644 --- a/src/App/PartPy.xml +++ b/src/App/PartPy.xml @@ -1,13 +1,13 @@ diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 79aa219f7a8b..b44be4671bd8 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -130,7 +130,7 @@ void PropertyLink::Restore(Base::XMLReader &reader) assert(getContainer()->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId()) ); if (name != "") { - DocumentObject* parent = static_cast(getContainer()); + DocumentObject* parent = dynamic_cast(getContainer()); App::Document* document = parent->getDocument(); DocumentObject* object = document ? document->getObject(name.c_str()) : 0; if (!object) { @@ -288,7 +288,7 @@ void PropertyLinkList::Restore(Base::XMLReader &reader) // referenced objects in XML which do not exist anymore in the new // document. Thus, we should silently ingore this. // Property not in an object! - DocumentObject* father = static_cast(getContainer()); + DocumentObject* father = dynamic_cast(getContainer()); App::Document* document = father->getDocument(); DocumentObject* child = document ? document->getObject(name.c_str()) : 0; if (child) @@ -479,7 +479,7 @@ void PropertyLinkSub::Restore(Base::XMLReader &reader) DocumentObject *pcObject; if (!name.empty()) { - App::Document* document = static_cast(getContainer())->getDocument(); + App::Document* document = dynamic_cast(getContainer())->getDocument(); pcObject = document ? document->getObject(name.c_str()) : 0; if (!pcObject) { if (reader.isVerbose()) { @@ -820,7 +820,7 @@ void PropertyLinkSubList::Restore(Base::XMLReader &reader) // referenced objects in XML which do not exist anymore in the new // document. Thus, we should silently ignore this. // Property not in an object! - DocumentObject* father = static_cast(getContainer()); + DocumentObject* father = dynamic_cast(getContainer()); App::Document* document = father->getDocument(); DocumentObject* child = document ? document->getObject(name.c_str()) : 0; if (child) diff --git a/src/App/TransactionalObject.cpp b/src/App/TransactionalObject.cpp index be12edfc79df..0fc2e3a91687 100644 --- a/src/App/TransactionalObject.cpp +++ b/src/App/TransactionalObject.cpp @@ -34,7 +34,7 @@ using namespace App; -PROPERTY_SOURCE_ABSTRACT(App::TransactionalObject, App::PropertyContainer) +PROPERTY_SOURCE_ABSTRACT(App::TransactionalObject, App::ExtensionContainer) TransactionalObject::TransactionalObject(void) { diff --git a/src/App/TransactionalObject.h b/src/App/TransactionalObject.h index a8878e2dd306..47589b7fcb17 100644 --- a/src/App/TransactionalObject.h +++ b/src/App/TransactionalObject.h @@ -24,7 +24,7 @@ #ifndef APP_TRANSACTIONALOBJECT_H #define APP_TRANSACTIONALOBJECT_H -#include +#include namespace App { @@ -34,7 +34,7 @@ class TransactionObject; /** Base class of transactional objects */ -class AppExport TransactionalObject : public App::PropertyContainer +class AppExport TransactionalObject : public App::ExtensionContainer { PROPERTY_HEADER(App::TransactionalObject); diff --git a/src/Base/BaseClass.h b/src/Base/BaseClass.h index b23ec97b5a2c..2e76229104e0 100644 --- a/src/Base/BaseClass.h +++ b/src/Base/BaseClass.h @@ -112,7 +112,7 @@ class BaseExport BaseClass template T * freecad_dynamic_cast(Base::BaseClass * t) { if (t && t->isDerivedFrom(T::getClassTypeId())) - return static_cast(t); + return dynamic_cast(t); else return 0; } @@ -126,7 +126,7 @@ template T * freecad_dynamic_cast(Base::BaseClass * t) template const T * freecad_dynamic_cast(const Base::BaseClass * t) { if (t && t->isDerivedFrom(T::getClassTypeId())) - return static_cast(t); + return dynamic_cast(t); else return 0; } diff --git a/src/Gui/Icons/ClassBrowser/.directory b/src/Gui/Icons/ClassBrowser/.directory new file mode 100644 index 000000000000..323740fe0bfa --- /dev/null +++ b/src/Gui/Icons/ClassBrowser/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2016,5,27,8,10,53 +Version=3 diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp index 39787371f14a..088b43d16c4a 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.cpp +++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp @@ -216,7 +216,7 @@ void ViewProviderDocumentObjectGroup::drop(const std::vector::const_iterator it = objList.begin();it!=objList.end();++it) { // get document object const App::DocumentObject* obj = *it; - const App::DocumentObjectGroup* par = App::DocumentObjectGroup::getGroupOfObject(obj); + const App::DocumentObject* par = App::DocumentObjectGroup::getGroupOfObject(obj); if (par) { // allow an object to be in one group only QString cmd; diff --git a/src/Gui/ViewProviderGeoFeatureGroup.cpp b/src/Gui/ViewProviderGeoFeatureGroup.cpp index 47b6fef04d24..ce45add96f26 100644 --- a/src/Gui/ViewProviderGeoFeatureGroup.cpp +++ b/src/Gui/ViewProviderGeoFeatureGroup.cpp @@ -51,7 +51,7 @@ ViewProviderGeoFeatureGroup::~ViewProviderGeoFeatureGroup() } std::vector ViewProviderGeoFeatureGroup::claimChildren3D(void) const { - return static_cast(getObject())->getGeoSubObjects (); + return dynamic_cast(getObject()->getExtension(App::GeoFeatureGroupExtension::getClassTypeId()))->getGeoSubObjects (); } void ViewProviderGeoFeatureGroup::attach(App::DocumentObject* pcObject) @@ -81,7 +81,7 @@ std::vector ViewProviderGeoFeatureGroup::getDisplayModes(void) cons void ViewProviderGeoFeatureGroup::updateData(const App::Property* prop) { - App::GeoFeatureGroup *obj = static_cast ( getObject() ); + App::GeoFeatureGroupExtension *obj = dynamic_cast ( getObject()->getExtension(App::GeoFeatureGroupExtension::getClassTypeId()) ); if (prop == &obj->Placement) { setTransformation ( obj->Placement.getValue().toMatrix() ); } else { diff --git a/src/Gui/ViewProviderOriginGroup.cpp b/src/Gui/ViewProviderOriginGroup.cpp index cd24b299c503..a2b1ec1fe77c 100644 --- a/src/Gui/ViewProviderOriginGroup.cpp +++ b/src/Gui/ViewProviderOriginGroup.cpp @@ -58,7 +58,7 @@ ViewProviderOriginGroup::~ViewProviderOriginGroup () { std::vector ViewProviderOriginGroup::constructChildren ( const std::vector &children ) const { - App::OriginGroup *group = static_cast ( getObject() ); + auto group = dynamic_cast ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) ); App::DocumentObject *originObj = group->Origin.getValue(); // Origin must be first @@ -98,7 +98,8 @@ void ViewProviderOriginGroup::attach(App::DocumentObject *pcObject) { } void ViewProviderOriginGroup::updateData ( const App::Property* prop ) { - App::OriginGroup *group = static_cast ( getObject() ); + + auto group = dynamic_cast ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) ); if ( group && prop == &group->Group ) { updateOriginSize(); } @@ -107,7 +108,7 @@ void ViewProviderOriginGroup::updateData ( const App::Property* prop ) { } void ViewProviderOriginGroup::slotChangedObjectApp ( const App::DocumentObject& obj) { - App::OriginGroup *group = static_cast ( getObject() ); + auto group = dynamic_cast ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) ); if ( group && group->hasObject (&obj, /*recusive=*/ true ) ) { updateOriginSize (); } @@ -118,7 +119,7 @@ void ViewProviderOriginGroup::slotChangedObjectGui ( const Gui::ViewProviderDocu !vp.isDerivedFrom ( Gui::ViewProviderOriginFeature::getClassTypeId () ) ) { // Ignore origins to avoid infinite recursion (not likely in a well-formed focument, // but may happen in documents designed in old versions of assembly branch ) - App::OriginGroup *group = static_cast ( getObject() ); + auto group = dynamic_cast ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) ); App::DocumentObject *obj = vp.getObject (); if ( group && obj && group->hasObject (obj, /*recusive=*/ true ) ) { @@ -128,7 +129,7 @@ void ViewProviderOriginGroup::slotChangedObjectGui ( const Gui::ViewProviderDocu } void ViewProviderOriginGroup::updateOriginSize () { - App::OriginGroup* group = static_cast ( getObject() ); + auto group = dynamic_cast ( getObject()->getExtension(App::OriginGroupExtension::getClassTypeId()) ); // obtain an Origin and it's ViewProvider App::Origin* origin = 0; diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp index 769355028c40..348a2b4928e8 100644 --- a/src/Gui/ViewProviderPart.cpp +++ b/src/Gui/ViewProviderPart.cpp @@ -97,7 +97,7 @@ bool ViewProviderPart::doubleClicked(void) bool ViewProviderPart::canDropObject(App::DocumentObject* obj) const { //it is not allowed to have any part or assembly object within a part, hence we exclude origin groups - if(obj->isDerivedFrom(App::OriginGroup::getClassTypeId())) + if(obj->hasExtension(App::OriginGroupExtension::getClassTypeId())) return false; return Gui::ViewProvider::canDropObject(obj); diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index bba4718c7b3e..0e04c0892ce5 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -289,7 +289,7 @@ QString PropertyItem::pythonIdentifier(const App::Property* prop) const return QString::fromLatin1("FreeCAD.getDocument(\"%1\").%2").arg(docName).arg(propName); } if (parent->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(parent); + App::DocumentObject* obj = dynamic_cast(parent); App::Document* doc = obj->getDocument(); QString docName = QString::fromLatin1(App::GetApplication().getDocumentName(doc)); QString objName = QString::fromLatin1(obj->getNameInDocument()); @@ -3375,7 +3375,7 @@ QVariant PropertyLinkItem::value(const App::Property* prop) const // no object assigned // the document name if (c->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(c); + App::DocumentObject* obj = dynamic_cast(c); list << QString::fromLatin1(obj->getDocument()->getName()); } else { @@ -3389,7 +3389,7 @@ QVariant PropertyLinkItem::value(const App::Property* prop) const // the name of this object if (c->getTypeId().isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(c); + App::DocumentObject* obj = dynamic_cast(c); list << QString::fromLatin1(obj->getNameInDocument()); } else { diff --git a/src/Mod/Fem/App/PropertyPostDataObject.cpp b/src/Mod/Fem/App/PropertyPostDataObject.cpp index 73f21bcd5565..7e27d6aafa2d 100644 --- a/src/Mod/Fem/App/PropertyPostDataObject.cpp +++ b/src/Mod/Fem/App/PropertyPostDataObject.cpp @@ -264,7 +264,7 @@ void PropertyPostDataObject::SaveDocFile (Base::Writer &writer) const // stream... App::PropertyContainer* father = this->getContainer(); if (father && father->isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(father); + App::DocumentObject* obj = dynamic_cast(father); Base::Console().Error("Dataset of '%s' cannot be written to vtk file '%s'\n", obj->Label.getValue(),fi.filePath().c_str()); } @@ -332,7 +332,7 @@ void PropertyPostDataObject::RestoreDocFile(Base::Reader &reader) // stream... App::PropertyContainer* father = this->getContainer(); if (father && father->isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(father); + App::DocumentObject* obj = dynamic_cast(father); Base::Console().Error("Dataset file '%s' with data of '%s' seems to be empty\n", fi.filePath().c_str(),obj->Label.getValue()); } diff --git a/src/Mod/Fem/App/PropertyPostDataObject.cpp.orig b/src/Mod/Fem/App/PropertyPostDataObject.cpp.orig new file mode 100644 index 000000000000..ac7f2570633b --- /dev/null +++ b/src/Mod/Fem/App/PropertyPostDataObject.cpp.orig @@ -0,0 +1,376 @@ +/*************************************************************************** + * Copyright (c) 2015 Stefan Tröger * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#include "PreCompiled.h" +#include "PropertyPostDataObject.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifndef _PreComp_ + +#endif + +using namespace Fem; + +TYPESYSTEM_SOURCE(Fem::PropertyPostDataObject , App::Property); + +PropertyPostDataObject::PropertyPostDataObject() +{ +} + +PropertyPostDataObject::~PropertyPostDataObject() +{ +} + +void PropertyPostDataObject::setValue(const vtkSmartPointer& ds) +{ + aboutToSetValue(); + + if(ds) { + createDataObjectByExternalType(ds); + m_dataObject->DeepCopy(ds); + } + else + m_dataObject = NULL; + + hasSetValue(); +} + +const vtkSmartPointer& PropertyPostDataObject::getValue(void)const +{ + return m_dataObject; +} + +bool PropertyPostDataObject::isComposite() { + + return m_dataObject && !m_dataObject->IsA("vtkDataSet"); +} + +bool PropertyPostDataObject::isDataSet() { + + return m_dataObject && m_dataObject->IsA("vtkDataSet"); +} + +int PropertyPostDataObject::getDataType() { + + if(!m_dataObject) + return -1; + + return m_dataObject->GetDataObjectType(); +} + + + +PyObject *PropertyPostDataObject::getPyObject(void) +{ + //TODO: fetch the vtk python object from the data set and return it + return new PyObject(); +} + +void PropertyPostDataObject::setPyObject(PyObject *value) +{ +} + +App::Property *PropertyPostDataObject::Copy(void) const +{ + PropertyPostDataObject *prop = new PropertyPostDataObject(); + if (m_dataObject) { + + prop->createDataObjectByExternalType(m_dataObject); + prop->m_dataObject->DeepCopy(m_dataObject); + } + + return prop; +} + +void PropertyPostDataObject::createDataObjectByExternalType(vtkSmartPointer< vtkDataObject > ex) { + + switch( ex->GetDataObjectType() ) { + + case VTK_POLY_DATA: + m_dataObject = vtkSmartPointer::New(); + break; + case VTK_STRUCTURED_GRID: + m_dataObject = vtkSmartPointer::New(); + break; + case VTK_RECTILINEAR_GRID: + m_dataObject = vtkSmartPointer::New(); + break; + case VTK_UNSTRUCTURED_GRID: + m_dataObject = vtkSmartPointer::New(); + break; + case VTK_UNIFORM_GRID: + m_dataObject = vtkSmartPointer::New(); + break; + case VTK_COMPOSITE_DATA_SET: + m_dataObject = vtkCompositeDataSet::New(); + break; + case VTK_MULTIBLOCK_DATA_SET: + m_dataObject = vtkSmartPointer::New(); + break; + case VTK_MULTIPIECE_DATA_SET: + m_dataObject = vtkSmartPointer::New(); + break; + default: + break; + }; +} + + +void PropertyPostDataObject::Paste(const App::Property &from) +{ + aboutToSetValue(); + m_dataObject = dynamic_cast(from).m_dataObject; + hasSetValue(); +} + +unsigned int PropertyPostDataObject::getMemSize (void) const +{ + return m_dataObject->GetActualMemorySize(); +} + +void PropertyPostDataObject::getPaths(std::vector &paths) const +{ +// paths.push_back(App::ObjectIdentifier(getContainer()) << App::ObjectIdentifier::Component::SimpleComponent(getName()) +// << App::ObjectIdentifier::Component::SimpleComponent(App::ObjectIdentifier::String("ShapeType"))); +// paths.push_back(App::ObjectIdentifier(getContainer()) << App::ObjectIdentifier::Component::SimpleComponent(getName()) +// << App::ObjectIdentifier::Component::SimpleComponent(App::ObjectIdentifier::String("Orientation"))); +// paths.push_back(App::ObjectIdentifier(getContainer()) << App::ObjectIdentifier::Component::SimpleComponent(getName()) +// << App::ObjectIdentifier::Component::SimpleComponent(App::ObjectIdentifier::String("Length"))); +// paths.push_back(App::ObjectIdentifier(getContainer()) << App::ObjectIdentifier::Component::SimpleComponent(getName()) +// << App::ObjectIdentifier::Component::SimpleComponent(App::ObjectIdentifier::String("Area"))); +// paths.push_back(App::ObjectIdentifier(getContainer()) << App::ObjectIdentifier::Component::SimpleComponent(getName()) +// << App::ObjectIdentifier::Component::SimpleComponent(App::ObjectIdentifier::String("Volume"))); +} + +void PropertyPostDataObject::Save (Base::Writer &writer) const +{ + std::string extension; + if(!m_dataObject) + return; + + switch( m_dataObject->GetDataObjectType() ) { + + case VTK_POLY_DATA: + extension = "vtp"; + break; + case VTK_STRUCTURED_GRID: + extension = "vts"; + break; + case VTK_RECTILINEAR_GRID: + extension = "vtr"; + break; + case VTK_UNSTRUCTURED_GRID: + extension = "vtu"; + break; + case VTK_UNIFORM_GRID: + extension = "vti"; //image data + break; + //TODO:multi-datasets use multiple files, this needs to be implemented specially +// case VTK_COMPOSITE_DATA_SET: +// prop->m_dataObject = vtkCompositeDataSet::New(); +// break; +// case VTK_MULTIBLOCK_DATA_SET: +// prop->m_dataObject = vtkMultiBlockDataSet::New(); +// break; +// case VTK_MULTIPIECE_DATA_SET: +// prop->m_dataObject = vtkMultiPieceDataSet::New(); +// break; + default: + break; + }; + + if(!writer.isForceXML()) { + std::string file = "Data." + extension; + writer.Stream() << writer.ind() << "" << std::endl; + } +} + +void PropertyPostDataObject::Restore(Base::XMLReader &reader) +{ + reader.readElement("Data"); + if(!reader.hasAttribute("file")) + return; + + std::string file (reader.getAttribute("file") ); + + if (!file.empty()) { + // initate a file read + reader.addFile(file.c_str(),this); + } +} + +void PropertyPostDataObject::SaveDocFile (Base::Writer &writer) const +{ + // If the shape is empty we simply store nothing. The file size will be 0 which + // can be checked when reading in the data. + if (!m_dataObject) + return; + + // create a temporary file and copy the content to the zip stream + // once the tmp. filename is known use always the same because otherwise + // we may run into some problems on the Linux platform + static Base::FileInfo fi(App::Application::getTempFileName()); + + vtkSmartPointer xmlWriter = vtkSmartPointer::New(); + xmlWriter->SetInputDataObject(m_dataObject); + xmlWriter->SetFileName(fi.filePath().c_str()); + xmlWriter->SetDataModeToBinary(); + + if ( xmlWriter->Write() != 1 ) { + // Note: Do NOT throw an exception here because if the tmp. file could + // not be created we should not abort. + // We only print an error message but continue writing the next files to the + // stream... + App::PropertyContainer* father = this->getContainer(); + if (father && father->isDerivedFrom(App::DocumentObject::getClassTypeId())) { +<<<<<<< 51e23d854e59ab0a23a9ea9b19e74e5f02753d82 + App::DocumentObject* obj = static_cast(father); + Base::Console().Error("Dataset of '%s' cannot be written to vtk file '%s'\n", +======= + App::DocumentObject* obj = dynamic_cast(father); + Base::Console().Error("Dataset of '%s' cannot be written to vtk file '%s'\n", +>>>>>>> Introduce extensions and port App groups + obj->Label.getValue(),fi.filePath().c_str()); + } + else { + Base::Console().Error("Cannot save vtk file '%s'\n", fi.filePath().c_str()); + } + + std::stringstream ss; + ss << "Cannot save vtk file '" << fi.filePath() << "'"; + writer.addError(ss.str()); + } + + Base::ifstream file(fi, std::ios::in | std::ios::binary); + if (file){ + unsigned long ulSize = 0; + std::streambuf* buf = file.rdbuf(); + if (buf) { + unsigned long ulCurr; + ulCurr = buf->pubseekoff(0, std::ios::cur, std::ios::in); + ulSize = buf->pubseekoff(0, std::ios::end, std::ios::in); + buf->pubseekoff(ulCurr, std::ios::beg, std::ios::in); + } + + // read in the ASCII file and write back to the stream + std::strstreambuf sbuf(ulSize); + file >> &sbuf; + writer.Stream() << &sbuf; + } + + file.close(); + // remove temp file + fi.deleteFile(); +} + +void PropertyPostDataObject::RestoreDocFile(Base::Reader &reader) +{ + Base::FileInfo xml(reader.getFileName()); + // create a temporary file and copy the content from the zip stream + Base::FileInfo fi(App::Application::getTempFileName()); + + // read in the ASCII file and write back to the file stream + Base::ofstream file(fi, std::ios::out | std::ios::binary); + unsigned long ulSize = 0; + if (reader) { + std::streambuf* buf = file.rdbuf(); + reader >> buf; + file.flush(); + ulSize = buf->pubseekoff(0, std::ios::cur, std::ios::in); + } + file.close(); + + // Read the data from the temp file + if (ulSize > 0) { + std::string extension = xml.extension(); + + //TODO: read in of composite data structures need to be coded, including replace of "GetOutputAsDataSet()" + vtkSmartPointer xmlReader; + if(extension == "vtp") + xmlReader = vtkSmartPointer::New(); + else if (extension == "vts") + xmlReader = vtkSmartPointer::New(); + else if (extension == "vtr") + xmlReader = vtkSmartPointer::New(); + else if (extension == "vtu") + xmlReader = vtkSmartPointer::New(); + else if (extension == "vti") + xmlReader = vtkSmartPointer::New(); + + xmlReader->SetFileName(fi.filePath().c_str()); + xmlReader->Update(); + + if (!xmlReader->GetOutputAsDataSet()) { + // Note: Do NOT throw an exception here because if the tmp. created file could + // not be read it's NOT an indication for an invalid input stream 'reader'. + // We only print an error message but continue reading the next files from the + // stream... + App::PropertyContainer* father = this->getContainer(); + if (father && father->isDerivedFrom(App::DocumentObject::getClassTypeId())) { +<<<<<<< 51e23d854e59ab0a23a9ea9b19e74e5f02753d82 + App::DocumentObject* obj = static_cast(father); + Base::Console().Error("Dataset file '%s' with data of '%s' seems to be empty\n", +======= + App::DocumentObject* obj = dynamic_cast(father); + Base::Console().Error("Dataset file '%s' with data of '%s' seems to be empty\n", +>>>>>>> Introduce extensions and port App groups + fi.filePath().c_str(),obj->Label.getValue()); + } + else { + Base::Console().Warning("Loaded Dataset file '%s' seems to be empty\n", fi.filePath().c_str()); + } + } + else { + aboutToSetValue(); + createDataObjectByExternalType(xmlReader->GetOutputAsDataSet()); + m_dataObject->DeepCopy(xmlReader->GetOutputAsDataSet()); + hasSetValue(); + } + } + + // delete the temp file + fi.deleteFile(); +} diff --git a/src/Mod/Fem/Init.py.orig b/src/Mod/Fem/Init.py.orig new file mode 100644 index 000000000000..384d6c980107 --- /dev/null +++ b/src/Mod/Fem/Init.py.orig @@ -0,0 +1,79 @@ +<<<<<<< ba52dbfac69983692e8edbeca2eff74154a312b6 +# FreeCAD init script of the Fem module +# (c) 2001 Juergen Riegel + +#*************************************************************************** +#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * +#* * +#* This file is part of the FreeCAD CAx development system. * +#* * +#* This program is free software; you can redistribute it and/or modify * +#* it under the terms of the GNU Lesser General Public License (LGPL) * +#* as published by the Free Software Foundation; either version 2 of * +#* the License, or (at your option) any later version. * +#* for detail see the LICENCE text file. * +#* * +#* FreeCAD 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 Library General Public * +#* License along with FreeCAD; if not, write to the Free Software * +#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +#* USA * +#* * +#* Juergen Riegel 2002 * +#***************************************************************************/ + + +import FreeCAD + + +FreeCAD.addExportType("TetGen file (*.poly)", "convert2TetGen") +FreeCAD.addImportType("FEM formats (*.unv *.med *.dat *.bdf)", "Fem") +FreeCAD.addExportType("FEM formats (*.unv *.med *.dat *.inp)", "Fem") +FreeCAD.addImportType("CalculiX result (*.frd)", "ccxFrdReader") +FreeCAD.addImportType("Abaqus file (*.inp)", "FemGui") +FreeCAD.addImportType("Z88 mesh file (*.txt)", "importZ88Mesh") +FreeCAD.addExportType("Z88 mesh file (*.txt)", "importZ88Mesh") +FreeCAD.addImportType("Z88 displacement result file (*.txt)", "z88DispReader") +======= +# FreeCAD init script of the Fem module +# (c) 2001 Juergen Riegel + +#*************************************************************************** +#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * +#* * +#* This file is part of the FreeCAD CAx development system. * +#* * +#* This program is free software; you can redistribute it and/or modify * +#* it under the terms of the GNU Lesser General Public License (LGPL) * +#* as published by the Free Software Foundation; either version 2 of * +#* the License, or (at your option) any later version. * +#* for detail see the LICENCE text file. * +#* * +#* FreeCAD 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 Library General Public * +#* License along with FreeCAD; if not, write to the Free Software * +#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +#* USA * +#* * +#* Juergen Riegel 2002 * +#***************************************************************************/ + + +import FreeCAD + + +FreeCAD.addExportType("TetGen file (*.poly)", "convert2TetGen") +FreeCAD.addImportType("FEM formats (*.unv *.med *.dat *.bdf)", "Fem") +FreeCAD.addImportType("FEM results (*.vtk)","Fem") +FreeCAD.addExportType("FEM formats (*.unv *.med *.dat *.inp)", "Fem") +FreeCAD.addImportType("CalculiX result (*.frd)", "ccxFrdReader") +FreeCAD.addImportType("Abaqus file (*.inp)", "FemGui") +>>>>>>> Move post processing to fem objects diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index f858cfb0a89d..43e058d116a5 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -597,7 +597,7 @@ void CmdMeshVertexCurvature::activated(int) fName = getUniqueObjectName(fName.c_str()); openCommand("Mesh VertexCurvature"); - App::DocumentObjectGroup* grp = App::DocumentObjectGroup::getGroupOfObject( *it ); + App::DocumentObject* grp = App::DocumentObjectGroup::getGroupOfObject( *it ); if (grp) doCommand(Doc,"App.activeDocument().getObject(\"%s\").newObject(\"Mesh::Curvature\",\"%s\")",grp->getNameInDocument(), fName.c_str()); else diff --git a/src/Mod/Part/App/PartFeaturePy.xml b/src/Mod/Part/App/PartFeaturePy.xml index ead312bc41b4..5be039f396fe 100644 --- a/src/Mod/Part/App/PartFeaturePy.xml +++ b/src/Mod/Part/App/PartFeaturePy.xml @@ -13,5 +13,10 @@ This is the father of all shape object classes + + + test + + - + diff --git a/src/Mod/Part/App/PartFeaturePyImp.cpp b/src/Mod/Part/App/PartFeaturePyImp.cpp index d184d6bd0acf..1a04c5d599aa 100644 --- a/src/Mod/Part/App/PartFeaturePyImp.cpp +++ b/src/Mod/Part/App/PartFeaturePyImp.cpp @@ -47,4 +47,8 @@ int PartFeaturePy::setCustomAttributes(const char* , PyObject *) return 0; } - +PyObject* PartFeaturePy::test(PyObject *args) +{ + PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented"); + return 0; +} \ No newline at end of file diff --git a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp index 433d822e690b..3b4b775b8a4b 100644 --- a/src/Mod/Part/App/PropertyTopoShape.cpp +++ b/src/Mod/Part/App/PropertyTopoShape.cpp @@ -297,7 +297,7 @@ void PropertyPartShape::SaveDocFile (Base::Writer &writer) const // stream... App::PropertyContainer* father = this->getContainer(); if (father && father->isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(father); + App::DocumentObject* obj = dynamic_cast(father); Base::Console().Error("Shape of '%s' cannot be written to BRep file '%s'\n", obj->Label.getValue(),fi.filePath().c_str()); } @@ -376,7 +376,7 @@ void PropertyPartShape::RestoreDocFile(Base::Reader &reader) // stream... App::PropertyContainer* father = this->getContainer(); if (father && father->isDerivedFrom(App::DocumentObject::getClassTypeId())) { - App::DocumentObject* obj = static_cast(father); + App::DocumentObject* obj = dynamic_cast(father); Base::Console().Error("BRep file '%s' with shape of '%s' seems to be empty\n", fi.filePath().c_str(),obj->Label.getValue()); } diff --git a/src/Mod/PartDesign/App/FeatureGroove.cpp.orig b/src/Mod/PartDesign/App/FeatureGroove.cpp.orig new file mode 100644 index 000000000000..3313ce5d6e7b --- /dev/null +++ b/src/Mod/PartDesign/App/FeatureGroove.cpp.orig @@ -0,0 +1,208 @@ +/****************************************************************************** + * Copyright (c)2012 Jan Rheinlaender * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ******************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif + +#include +#include +#include +#include + +#include "FeatureGroove.h" + + +using namespace PartDesign; + +namespace PartDesign { + + +PROPERTY_SOURCE(PartDesign::Groove, PartDesign::ProfileBased) + +Groove::Groove() +{ + addSubType = FeatureAddSub::Subtractive; + + ADD_PROPERTY_TYPE(Base,(Base::Vector3d(0.0f,0.0f,0.0f)),"Groove", App::Prop_ReadOnly, "Base"); + ADD_PROPERTY_TYPE(Axis,(Base::Vector3d(0.0f,1.0f,0.0f)),"Groove", App::Prop_ReadOnly, "Axis"); + ADD_PROPERTY_TYPE(Angle,(360.0),"Groove", App::Prop_None, "Angle"); + ADD_PROPERTY_TYPE(ReferenceAxis,(0),"Groove",(App::PropertyType)(App::Prop_None),"Reference axis of Groove"); +} + +short Groove::mustExecute() const +{ + if (Placement.isTouched() || + ReferenceAxis.isTouched() || + Axis.isTouched() || + Base.isTouched() || + Angle.isTouched()) + return 1; + return ProfileBased::mustExecute(); +} + +App::DocumentObjectExecReturn *Groove::execute(void) +{ + // Validate parameters + double angle = Angle.getValue(); + if (angle < Precision::Confusion()) + return new App::DocumentObjectExecReturn("Angle of groove too small"); + if (angle > 360.0) + return new App::DocumentObjectExecReturn("Angle of groove too large"); + + angle = Base::toRadians(angle); + // Reverse angle if selected + if (Reversed.getValue() && !Midplane.getValue()) + angle *= (-1.0); + + TopoDS_Shape sketchshape; + try { + sketchshape = getVerifiedFace(); + } catch (const Base::Exception& e) { + return new App::DocumentObjectExecReturn(e.what()); + } + + // if the Base property has a valid shape, fuse the prism into it + TopoDS_Shape base; + try { + base = getBaseShape(); + } catch (const Base::Exception&) { + return new App::DocumentObjectExecReturn("No sketch support and no base shape: Please tell me where to remove the material of the groove!"); + } + + updateAxis(); + + // get revolve axis + Base::Vector3d b = Base.getValue(); + gp_Pnt pnt(b.x,b.y,b.z); + Base::Vector3d v = Axis.getValue(); + gp_Dir dir(v.x,v.y,v.z); + + try { + if (sketchshape.IsNull()) + return new App::DocumentObjectExecReturn("Creating a face from sketch failed"); + + // Rotate the face by half the angle to get Groove symmetric to sketch plane + if (Midplane.getValue()) { + gp_Trsf mov; + mov.SetRotation(gp_Ax1(pnt, dir), Base::toRadians(Angle.getValue()) * (-1.0) / 2.0); + TopLoc_Location loc(mov); + sketchshape.Move(loc); + } + + this->positionByPrevious(); + TopLoc_Location invObjLoc = this->getLocation().Inverted(); + pnt.Transform(invObjLoc.Transformation()); + dir.Transform(invObjLoc.Transformation()); + base.Move(invObjLoc); + sketchshape.Move(invObjLoc); + + // Check distance between sketchshape and axis - to avoid failures and crashes + TopExp_Explorer xp; + xp.Init(sketchshape, TopAbs_FACE); + for (;xp.More(); xp.Next()) { +<<<<<<< 94c547439cc0d5e6dca5e724c97f861f5b1f530e + + if (checkLineCrossesFace(gp_Lin(pnt, dir), TopoDS::Face(xp.Current()))) + return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch"); + } + +======= + if (checkLineCrossesFace(gp_Lin(pnt, dir), TopoDS::Face(xp.Current()))) + return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch"); + } + +>>>>>>> Travis: Add SMESH7 dependencies for OSX + // revolve the face to a solid + BRepPrimAPI_MakeRevol RevolMaker(sketchshape, gp_Ax1(pnt, dir), angle); + + if (RevolMaker.IsDone()) { + TopoDS_Shape result = RevolMaker.Shape(); + // set the subtractive shape property for later usage in e.g. pattern + result = refineShapeIfActive(result); + this->AddSubShape.setValue(result); + + // cut out groove to get one result object + BRepAlgoAPI_Cut mkCut(base, result); + // Let's check if the fusion has been successful + if (!mkCut.IsDone()) + throw Base::Exception("Cut out of base feature failed"); + + // we have to get the solids (fuse sometimes creates compounds) + TopoDS_Shape solRes = this->getSolid(mkCut.Shape()); + if (solRes.IsNull()) + return new App::DocumentObjectExecReturn("Resulting shape is not a solid"); + + solRes = refineShapeIfActive(solRes); + this->Shape.setValue(getSolid(solRes)); + } + else + return new App::DocumentObjectExecReturn("Could not revolve the sketch!"); + + return App::DocumentObject::StdReturn; + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + if (std::string(e->GetMessageString()) == "TopoDS::Face") + return new App::DocumentObjectExecReturn("Could not create face from sketch.\n" + "Intersecting sketch entities in a sketch are not allowed."); + else + return new App::DocumentObjectExecReturn(e->GetMessageString()); + } + catch (Base::Exception& e) { + return new App::DocumentObjectExecReturn(e.what()); + } +} + +bool Groove::suggestReversed(void) +{ + updateAxis(); + return ProfileBased::getReversedAngle(Base.getValue(), Axis.getValue()) > 0.0; +} + +void Groove::updateAxis(void) +{ + App::DocumentObject *pcReferenceAxis = ReferenceAxis.getValue(); + const std::vector &subReferenceAxis = ReferenceAxis.getSubValues(); + Base::Vector3d base; + Base::Vector3d dir; + getAxis(pcReferenceAxis, subReferenceAxis, base, dir); + + if (dir.Length() > Precision::Confusion()) { + Base.setValue(base.x,base.y,base.z); + Axis.setValue(dir.x,dir.y,dir.z); + } +} + +} diff --git a/src/Mod/PartDesign/App/FeatureRevolution.cpp.orig b/src/Mod/PartDesign/App/FeatureRevolution.cpp.orig new file mode 100644 index 000000000000..31f580f60191 --- /dev/null +++ b/src/Mod/PartDesign/App/FeatureRevolution.cpp.orig @@ -0,0 +1,202 @@ +/*************************************************************************** + * Copyright (c) 2010 Juergen Riegel * + * * + * This file is part of the FreeCAD CAx development system. * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Library General Public * + * License as published by the Free Software Foundation; either * + * version 2 of the License, or (at your option) any later version. * + * * + * This library 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 Library General Public License for more details. * + * * + * You should have received a copy of the GNU Library General Public * + * License along with this library; see the file COPYING.LIB. If not, * + * write to the Free Software Foundation, Inc., 59 Temple Place, * + * Suite 330, Boston, MA 02111-1307, USA * + * * + ***************************************************************************/ + + +#include "PreCompiled.h" +#ifndef _PreComp_ +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif + +#include +#include +#include +#include + +#include "FeatureRevolution.h" + + +using namespace PartDesign; + +namespace PartDesign { + + +PROPERTY_SOURCE(PartDesign::Revolution, PartDesign::ProfileBased) + +Revolution::Revolution() +{ + addSubType = FeatureAddSub::Additive; + + ADD_PROPERTY_TYPE(Base,(Base::Vector3d(0.0,0.0,0.0)),"Revolution", App::Prop_ReadOnly, "Base"); + ADD_PROPERTY_TYPE(Axis,(Base::Vector3d(0.0,1.0,0.0)),"Revolution", App::Prop_ReadOnly, "Axis"); + ADD_PROPERTY_TYPE(Angle,(360.0),"Revolution", App::Prop_None, "Angle"); + ADD_PROPERTY_TYPE(ReferenceAxis,(0),"Revolution",(App::Prop_None),"Reference axis of revolution"); +} + +short Revolution::mustExecute() const +{ + if (Placement.isTouched() || + ReferenceAxis.isTouched() || + Axis.isTouched() || + Base.isTouched() || + Angle.isTouched()) + return 1; + return ProfileBased::mustExecute(); +} + +App::DocumentObjectExecReturn *Revolution::execute(void) +{ + // Validate parameters + double angle = Angle.getValue(); + if (angle < Precision::Confusion()) + return new App::DocumentObjectExecReturn("Angle of revolution too small"); + if (angle > 360.0) + return new App::DocumentObjectExecReturn("Angle of revolution too large"); + + angle = Base::toRadians(angle); + // Reverse angle if selected + if (Reversed.getValue() && !Midplane.getValue()) + angle *= (-1.0); + + TopoDS_Shape sketchshape; + try { + sketchshape = getVerifiedFace(); + } catch (const Base::Exception& e) { + return new App::DocumentObjectExecReturn(e.what()); + } + + // if the Base property has a valid shape, fuse the AddShape into it + TopoDS_Shape base; + try { + base = getBaseShape(); + } catch (const Base::Exception&) { + // fall back to support (for legacy features) + base = TopoDS_Shape(); + } + + // update Axis from ReferenceAxis + updateAxis(); + + // get revolve axis + Base::Vector3d b = Base.getValue(); + gp_Pnt pnt(b.x,b.y,b.z); + Base::Vector3d v = Axis.getValue(); + gp_Dir dir(v.x,v.y,v.z); + + try { + if (sketchshape.IsNull()) + return new App::DocumentObjectExecReturn("Creating a face from sketch failed"); + + // Rotate the face by half the angle to get Revolution symmetric to sketch plane + if (Midplane.getValue()) { + gp_Trsf mov; + mov.SetRotation(gp_Ax1(pnt, dir), Base::toRadians(Angle.getValue()) * (-1.0) / 2.0); + TopLoc_Location loc(mov); + sketchshape.Move(loc); + } + + this->positionByPrevious(); + TopLoc_Location invObjLoc = this->getLocation().Inverted(); + pnt.Transform(invObjLoc.Transformation()); + dir.Transform(invObjLoc.Transformation()); + base.Move(invObjLoc); + sketchshape.Move(invObjLoc); + + // Check distance between sketchshape and axis - to avoid failures and crashes + TopExp_Explorer xp; + xp.Init(sketchshape, TopAbs_FACE); + for (;xp.More(); xp.Next()) { + if (checkLineCrossesFace(gp_Lin(pnt, dir), TopoDS::Face(xp.Current()))) +<<<<<<< 94c547439cc0d5e6dca5e724c97f861f5b1f530e + return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch"); +======= + return new App::DocumentObjectExecReturn("Revolve axis intersects the sketch"); +>>>>>>> Travis: Add SMESH7 dependencies for OSX + } + + // revolve the face to a solid + BRepPrimAPI_MakeRevol RevolMaker(sketchshape, gp_Ax1(pnt, dir), angle); + + if (RevolMaker.IsDone()) { + TopoDS_Shape result = RevolMaker.Shape(); + result = refineShapeIfActive(result); + // set the additive shape property for later usage in e.g. pattern + this->AddSubShape.setValue(result); + + if (!base.IsNull()) { + // Let's call algorithm computing a fuse operation: + BRepAlgoAPI_Fuse mkFuse(base, result); + // Let's check if the fusion has been successful + if (!mkFuse.IsDone()) + throw Base::Exception("Fusion with base feature failed"); + result = mkFuse.Shape(); + result = refineShapeIfActive(result); + } + + this->Shape.setValue(getSolid(result)); + } + else + return new App::DocumentObjectExecReturn("Could not revolve the sketch!"); + + return App::DocumentObject::StdReturn; + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + if (std::string(e->GetMessageString()) == "TopoDS::Face") + return new App::DocumentObjectExecReturn("Could not create face from sketch.\n" + "Intersecting sketch entities in a sketch are not allowed."); + else + return new App::DocumentObjectExecReturn(e->GetMessageString()); + } + catch (Base::Exception& e) { + return new App::DocumentObjectExecReturn(e.what()); + } +} + +bool Revolution::suggestReversed(void) +{ + updateAxis(); + return ProfileBased::getReversedAngle(Base.getValue(), Axis.getValue()) < 0.0; +} + +void Revolution::updateAxis(void) +{ + App::DocumentObject *pcReferenceAxis = ReferenceAxis.getValue(); + const std::vector &subReferenceAxis = ReferenceAxis.getSubValues(); + Base::Vector3d base; + Base::Vector3d dir; + getAxis(pcReferenceAxis, subReferenceAxis, base, dir); + + Base.setValue(base.x,base.y,base.z); + Axis.setValue(dir.x,dir.y,dir.z); +} + +} diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 56d4b1e646cb..801b20165d11 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -439,7 +439,8 @@ void CmdPartDesignNewSketch::activated(int iMsg) // Get a valid plane from the user unsigned validPlanes = 0; - App::GeoFeatureGroup* geoGroup = App::GeoFeatureGroup::getGroupOfObject ( pcActiveBody ); + auto group = App::GeoFeatureGroupExtension::getGroupOfObject ( pcActiveBody ); + auto geoGroup = dynamic_cast(group->getExtension(App::GeoFeatureGroupExtension::getClassTypeId())); std::vector planes; std::vector status; @@ -474,14 +475,14 @@ void CmdPartDesignNewSketch::activated(int iMsg) PartDesign::Body *planeBody = PartDesign::Body::findBodyOf (plane); if ( planeBody ) { if ( ( geoGroup && geoGroup->hasObject ( planeBody, true ) ) || - !App::GeoFeatureGroup::getGroupOfObject (planeBody) ) { + !App::GeoFeatureGroupExtension::getGroupOfObject (planeBody) ) { status.push_back ( PartDesignGui::TaskFeaturePick::otherBody ); } else { status.push_back ( PartDesignGui::TaskFeaturePick::otherPart ); } } else { if ( ( geoGroup && geoGroup->hasObject ( plane, true ) ) || - !App::GeoFeatureGroup::getGroupOfObject ( plane ) ) { + !App::GeoFeatureGroupExtension::getGroupOfObject ( plane ) ) { status.push_back ( PartDesignGui::TaskFeaturePick::otherPart ); } else if (pcActiveBody) { status.push_back ( PartDesignGui::TaskFeaturePick::notInBody ); diff --git a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp index 03131054ff52..5a67cde458b0 100644 --- a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp +++ b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp @@ -60,7 +60,7 @@ bool ReferenceSelection::allow(App::Document* pDoc, App::DocumentObject* pObj, c { // TODO review this function (2015-09-04, Fat-Zer) PartDesign::Body *body; - App::GeoFeatureGroup *geoGroup; + App::DocumentObject* originGroupObject = nullptr; if ( support ) { body = PartDesign::Body::findBodyOf (support); @@ -69,12 +69,16 @@ bool ReferenceSelection::allow(App::Document* pDoc, App::DocumentObject* pObj, c } if ( body ) { // Search for Part of the body - geoGroup = App::GeoFeatureGroup::getGroupOfObject ( body ) ; + originGroupObject = App::OriginGroupExtension::getGroupOfObject ( body ) ; } else if ( support ) { // if no body search part for support - geoGroup = App::GeoFeatureGroup::getGroupOfObject ( support ) ; + originGroupObject = App::OriginGroupExtension::getGroupOfObject ( support ) ; } else { // fallback to active part - geoGroup = PartDesignGui::getActivePart ( ); + originGroupObject = PartDesignGui::getActivePart ( ); } + + App::OriginGroupExtension* originGroup = nullptr; + if(originGroupObject) + originGroup = originGroupObject->getExtensionByType(); // Don't allow selection in other document if ( support && pDoc != support->getDocument() ) { @@ -96,8 +100,8 @@ bool ReferenceSelection::allow(App::Document* pDoc, App::DocumentObject* pObj, c if (body->getOrigin ()->hasObject (pObj) ) { return true; } - } else if (geoGroup && geoGroup->isDerivedFrom ( App::OriginGroup::getClassTypeId () ) ) { - if ( static_cast(geoGroup)->getOrigin ()->hasObject (pObj) ) { + } else if (originGroup ) { + if ( originGroup->getOrigin ()->hasObject (pObj) ) { return true; } } diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 14dbc33ae3e7..ad285b0be87d 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -238,8 +238,8 @@ bool isPartDesignAwareObjecta (App::DocumentObject *obj, bool respectGroups = fa PartDesign::Body::isAllowed ( obj ) || obj->isDerivedFrom ( PartDesign::Body::getClassTypeId () ) || ( respectGroups && ( - obj->isDerivedFrom (App::GeoFeatureGroup::getClassTypeId () ) || - obj->isDerivedFrom (App::DocumentObjectGroup::getClassTypeId () ) + obj->hasExtension (App::GeoFeatureGroupExtension::getClassTypeId () ) || + obj->hasExtension (App::GroupExtension::getClassTypeId () ) ) ) ); } diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp index 29681fb5424f..bb14d9652a35 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.cpp @@ -327,10 +327,10 @@ SbBox3f ViewProviderDatum::getRelevantBoundBox () const { objs = body->getFullModel (); } else { // Probe if we belongs to some group - App::DocumentObjectGroup* group = App::DocumentObjectGroup::getGroupOfObject ( this->getObject () ); + App::DocumentObject* group = App::DocumentObjectGroup::getGroupOfObject ( this->getObject () ); if(group) { - objs = group->getObjects (); + objs = dynamic_cast(group->getExtension(App::GroupExtension::getClassTypeId()))->getObjects (); } else { // Fallback to whole document objs = this->getObject ()->getDocument ()->getObjects ();